Chiebot-Mirror
/
xmake-repo
mirror of https://github.com/xmake-io/xmake-repo.git
8
0
Fork 1
Code Issues Projects Releases Wiki Activity

update mkl (#1333)

Browse Source 
* update mkl

* improve fetch
pull/1334/head
Hoildkv 2 years ago committed by GitHub
parent 4350a4ca9e
commit 160f457064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      packages/m/mkl/fetch.lua
  2. 58
      packages/m/mkl/xmake.lua

32
packages/m/mkl/fetch.lua
Unescape View File

@ -3,6 +3,7 @@ import("lib.detect.find_library")
function _find_package(package, opt)
local rdir = (package:is_arch("x64", "x86_64") and "intel64" or "ia32")
local suffix = (package:config("interface") == 32 and "lp64" or "ilp64")
local paths = {
"$(env MKL_ROOT)",
"$(env ONEAPI_ROOT)\\mkl\\latest"
@ -10,31 +11,48 @@ function _find_package(package, opt)
-- find library
local result = {links = {}, linkdirs = {}, includedirs = {}}
if package:config("interface") == 64 then
result.defines = {"MKL_ILP64"}
end
local linkinfo = find_library("mkl_core", paths, {suffixes = {"lib", path.join("lib", rdir), path.join("lib", rdir, "gcc*")}})
if not linkinfo then
return
end
table.insert(result.linkdirs, linkinfo.linkdir)
if rdir == "intel64" then
table.insert(result.links, "mkl_lapack95_ilp64")
table.insert(result.links, "mkl_blas95_" .. suffix)
table.insert(result.links, "mkl_lapack95_" .. suffix)
else
table.insert(result.links, "mkl_blas95")
table.insert(result.links, "mkl_lapack95")
end
local group = {}
if rdir == "intel64" then
table.insert(result.links, "mkl_intel_ilp64")
table.insert(group, "mkl_intel_" .. suffix)
elseif package:is_plat("windows") then
table.insert(result.links, "mkl_intel_c")
table.insert(group, "mkl_intel_c")
else
table.insert(result.links, "mkl_intel")
table.insert(group, "mkl_intel")
end
local threading = package:config("threading")
if threading == "tbb" then
table.join2(result.links, {"mkl_tbb_thread", "mkl_core"})
table.join2(group, {"mkl_tbb_thread", "mkl_core"})
elseif threading == "seq" then
table.join2(result.links, {"mkl_sequential", "mkl_core"})
table.join2(group, {"mkl_sequential", "mkl_core"})
elseif threading == "openmp" then
table.join2(result.links, {"mkl_intel_thread", "mkl_core"})
table.join2(group, {"mkl_intel_thread", "mkl_core"})
end
if package:has_tool("cc", "gcc", "gxx") then
result.ldflags = "-Wl,--start-group "
for _, lib in ipairs(group) do
result.ldflags = result.ldflags .. "-l" .. lib .. " "
end
result.ldflags = result.ldflags .. "-Wl,--end-group"
else
table.join2(result.links, group)
end
-- find include

58
packages/m/mkl/xmake.lua
Unescape View File

@ -13,6 +13,8 @@ package("mkl")
add_resources("2021.2.0+296", "headers", "https://anaconda.org/intel/mkl-include/2021.2.0/download/win-64/mkl-include-2021.2.0-intel_296.tar.bz2", "ba222ea4ceb9e09976f23a3df39176148b4469b297275f3d05c1ad411b3d54c3")
add_versions("2021.3.0+524", "842628a8621f2ca19d7f1809e50420e311edf20b9bea18404dd1c20af798f5e6")
add_resources("2021.3.0+524", "headers", "https://anaconda.org/intel/mkl-include/2021.3.0/download/win-64/mkl-include-2021.3.0-intel_524.tar.bz2", "8ca8f77d0c57a434541d62a9c61781aa37225f5e669de01b8cc98488b3f9e82f")
add_versions("2022.1.0+192", "fd9a529c0caa27ee3068e8d845f07e536970b0cbf713118d1f3daa32fb2b9e8c")
add_resources("2022.1.0+192", "headers", "https://anaconda.org/intel/mkl-include/2022.1.0/download/win-64/mkl-include-2022.1.0-intel_192.tar.bz2", "b6452e8c4891fcfab452bc23c6adc9c61ab6635fa494bb2b29725473c1013abc")
elseif is_arch("x86") then
add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version)
local mv = version:split("%+")
@ -22,6 +24,8 @@ package("mkl")
add_resources("2021.2.0+296", "headers", "https://anaconda.org/intel/mkl-include/2021.2.0/download/win-32/mkl-include-2021.2.0-intel_296.tar.bz2", "8ed173edff75783426de1bbc1d122266047fc84d4cfc5a9b810b1f2792f02c37")
add_versions("2021.3.0+524", "799a42ab4422d1532be65e40ed4ac5e81692b796ae3de37a7489389f9e10f112")
add_resources("2021.3.0+524", "headers", "https://anaconda.org/intel/mkl-include/2021.3.0/download/win-32/mkl-include-2021.3.0-intel_524.tar.bz2", "9ff8e58dc98da8ec2fe3b15eac2abfef4eb3335d90feeb498f84126371ccea8c")
add_versions("2022.0.3+171", "b34d5e5d0dd779b117666c9fc89d008431f6239ad60fc08a52a6b874fdf24517")
add_resources("2022.0.3+171", "headers", "https://anaconda.org/intel/mkl-include/2022.0.3/download/win-32/mkl-include-2022.0.3-intel_171.tar.bz2", "f696cd98b2f33b2c21bf7b70f57e894a763dad1831c721a348614cfeb17a4541")
end
elseif is_plat("macosx") and is_arch("x86_64") then
add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version)
@ -32,6 +36,8 @@ package("mkl")
add_resources("2021.2.0+269", "headers", "https://anaconda.org/intel/mkl-include/2021.2.0/download/osx-64/mkl-include-2021.2.0-intel_269.tar.bz2", "5215d62cadeb3f8021230163dc35ad38259e3688aa0f39d7da69ebe54ab45624")
add_versions("2021.3.0+517", "85a636642ee4f76fba50d16c45099cd22082eb1f8b835a4a0b455ec4796ebf8f")
add_resources("2021.3.0+517", "headers", "https://anaconda.org/intel/mkl-include/2021.3.0/download/osx-64/mkl-include-2021.3.0-intel_517.tar.bz2", "db9896e667b31908b398d515108433d8df95e6429ebfb9d493a463f25886019c")
add_versions("2022.1.0+208", "06e5dcd7b8f11f9736d4e4d7d5a9972333ee8822cf2263ecccf4cb0e3cc95530")
add_resources("2022.1.0+208", "headers", "https://anaconda.org/intel/mkl-include/2022.1.0/download/osx-64/mkl-include-2022.1.0-intel_208.tar.bz2", "569ea516148726b2698f17982aba2d9ec1bfb321f0180be938eddbc696addbc5")
elseif is_plat("linux") then
if is_arch("x86_64") then
add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version)
@ -42,6 +48,8 @@ package("mkl")
add_resources("2021.2.0+296", "headers", "https://anaconda.org/intel/mkl-include/2021.2.0/download/linux-64/mkl-include-2021.2.0-intel_296.tar.bz2", "13721fead8a3eddee15b914fd3ae9cf2095966af79bbc2f086462eda9fff4d62")
add_versions("2021.3.0+520", "c1e21988bbf05b455077a512cb719ef59ec6e06a6807cfefb892945ec19de5d0")
add_resources("2021.3.0+520", "headers", "https://anaconda.org/intel/mkl-include/2021.3.0/download/linux-64/mkl-include-2021.3.0-intel_520.tar.bz2", "b0df7fb4c2071fdec87b567913715a2e47dca05e8c3ac4e5bcf072d7804085af")
add_versions("2022.1.0+223", "9dfb2940447cc8cf7ca3e647e2b62be714e89cbca162998cbf4e05deb69b6bd2")
add_resources("2022.1.0+223", "headers", "https://anaconda.org/intel/mkl-include/2022.1.0/download/linux-64/mkl-include-2022.1.0-intel_223.tar.bz2", "704e658a9b25a200f8035f3d0a8f2e094736496a2169f87609f1cfed2e2eb0a9")
elseif is_arch("x86") then
add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version)
local mv = version:split("%+")
@ -51,10 +59,13 @@ package("mkl")
add_resources("2021.2.0+296", "headers", "https://anaconda.org/intel/mkl-include/2021.2.0/download/linux-32/mkl-include-2021.2.0-intel_296.tar.bz2", "7fcbc945377b486b40d29b170d0b6c39bbc5b430ac7284dae2046bbf610f643d")
add_versions("2021.3.0+520", "4df801f5806d1934c5f3887e8f2153fb0c929be9545627cf99ce9e72c907653b")
add_resources("2021.3.0+520", "headers", "https://anaconda.org/intel/mkl-include/2021.3.0/download/linux-32/mkl-include-2021.3.0-intel_520.tar.bz2", "dce1f2a08499f34ed4883b807546754c1547a9cc2424b7b75b9233641cf044c1")
add_versions("2022.0.2+136", "157c09248cb5e5cbcb28ef8db53d529ab2f049e9269b2a2bc90601c0c420080e")
add_resources("2022.0.2+136", "headers", "https://anaconda.org/intel/mkl-include/2022.0.2/download/linux-32/mkl-include-2022.0.2-intel_136.tar.bz2", "16882aeddbd33a2dc9210e61c59db6ad0d7d9efdd40ad1544b369b0830683371")
end
end
add_configs("threading", {description = "Choose threading modal for mkl.", default = "tbb", type = "string", values = {"tbb", "openmp", "seq"}})
add_configs("interface", {description = "Choose index integer size for the interface.", default = 32, values = {32, 64}})
on_fetch("fetch")
@ -62,24 +73,41 @@ package("mkl")
add_syslinks("pthread", "dl")
end
on_load("windows", "macosx", "linux", function (package)
package:add("links", package:is_arch("x64", "x86_64") and "mkl_lapack95_ilp64" or "mkl_lapack95")
package:add("links", package:is_arch("x64", "x86_64") and "mkl_blas95_ilp64" or "mkl_blas95")
if package:is_plat("windows") then
package:add("links", package:is_arch("x64", "x86_64") and "mkl_intel_ilp64" or "mkl_intel_c")
else
package:add("links", package:is_arch("x64", "x86_64") and "mkl_intel_ilp64" or "mkl_intel")
local suffix = (package:config("interface") == 32 and "lp64" or "ilp64")
if package:config("interface") == 64 then
package:add("defines", "MKL_ILP64")
end
package:add("links", package:is_arch("x64", "x86_64") and "mkl_blas95_" .. suffix or "mkl_blas95")
package:add("links", package:is_arch("x64", "x86_64") and "mkl_lapack95_" .. suffix or "mkl_lapack95")
local threading = package:config("threading")
if threading == "tbb" then
package:add("links", "mkl_tbb_thread")
package:add("deps", "tbb")
elseif threading == "seq" then
package:add("links", "mkl_sequential")
elseif threading == "openmp" then
package:add("links", "mkl_intel_thread")
if package:has_tool("cc", "gcc", "gxx") then
local flags = {"-Wl,--start-group"}
table.insert(flags, package:is_arch("x64", "x86_64") and "-lmkl_intel_" .. suffix or "-lmkl_intel")
local threading = package:config("threading")
if threading == "tbb" then
table.insert(flags, "-lmkl_tbb_thread")
package:add("deps", "tbb")
elseif threading == "seq" then
table.insert(flags, "-lmkl_sequential")
elseif threading == "openmp" then
table.insert(flags, "-lmkl_intel_thread")
end
table.insert(flags, "-lmkl_core")
table.insert(flags, "-Wl,--end-group")
package:add("ldflags", table.concat(flags, " "))
else
package:add("links", package:is_arch("x64", "x86_64") and "mkl_intel_" .. suffix or "mkl_intel_c")
local threading = package:config("threading")
if threading == "tbb" then
package:add("links", "mkl_tbb_thread")
package:add("deps", "tbb")
elseif threading == "seq" then
package:add("links", "mkl_sequential")
elseif threading == "openmp" then
package:add("links", "mkl_intel_thread")
end
package:add("links", "mkl_core")
end
package:add("links", "mkl_core")
end)
on_install("windows", "macosx", "linux", function (package)

Write Preview
Loading…
Cancel
Save