Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update scotch and mumps #4611

Closed
wants to merge 6 commits into from
Closed

update scotch and mumps #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bace27f
update scotch and mumps
xq114 Jul 10, 2024
0c2b686
update cminpack
xq114 Jul 10, 2024
d1127f1
restrict use of openblas
xq114 Jul 10, 2024
6170ebf
return false
xq114 Jul 10, 2024
2604186
remove explicit dep to gfortran
xq114 Jul 13, 2024
11bbf6d
make gfortran return table
xq114 Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/c/cminpack/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ package("cminpack")

add_versions("v1.3.9", "aa37bac5b5caaa4f5805ea5c4240e3834c993672f6dab0b17190ee645e251c9f")

add_configs("blas", {description = "Compile cminpack using cblas library if possible", default = false, type = "boolean"})
local support_openblas = is_plat("linux", "macosx") or (is_plat("windows") and is_arch("x86", "x64"))
add_configs("blas", {description = "BLAS library to compile with.", default = (support_openblas and "openblas" or nil), type = "string", values = {"openblas", "mkl"}})

if is_plat("linux") then
add_syslinks("m")
Expand All @@ -19,7 +20,7 @@ package("cminpack")

on_load(function (package)
if package:config("blas") then
package:add("deps", "openblas")
package:add("deps", package:config("blas"))
end
end)

Expand Down
2 changes: 1 addition & 1 deletion packages/g/gfortran/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package("gfortran")
if not fortran then return end

if package:is_binary() then
return true
return {}
else
local installdir = path.directory(path.directory(fortran.program))
local target
Expand Down
11 changes: 5 additions & 6 deletions packages/m/mumps/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package("mumps")

set_homepage("http://mumps.enseeiht.fr/")
set_homepage("https://mumps-solver.org/index.php")
set_description("MUMPS: MUltifrontal Massively Parallel sparse direct Solver")

add_urls("http://mumps.enseeiht.fr/MUMPS_$(version).tar.gz")
add_urls("https://mumps-solver.org/MUMPS_$(version).tar.gz")
add_versions("5.4.1", "93034a1a9fe0876307136dcde7e98e9086e199de76f1c47da822e7d4de987fa8")
add_versions("5.7.2", "1362d377ce7422fc886c55212b4a4d2c381918b5ca4478f682a22d0627a8fbf8")

add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})

Expand All @@ -13,12 +14,10 @@ package("mumps")
add_syslinks("pthread")
end
add_links("smumps", "dmumps", "cmumps", "zmumps", "mumps_common", "pord", "mpiseq")

on_install("linux", function (package)
import("lib.detect.find_tool")
local fortranc = find_tool("gfortran")
if not fortranc then
raise("gfortran not found!")
end
local fortranc = assert(find_tool("gfortran"), "gfortran not found!")

os.cp("Make.inc/Makefile.inc.generic.SEQ", "Makefile.inc")
io.replace("Makefile.inc", "ORDERINGSF = -Dpord", "ORDERINGSF = -Dscotch -Dpord", {plain = true})
Expand Down
7 changes: 7 additions & 0 deletions packages/s/scotch/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@ package("scotch")
add_urls("https://gitlab.inria.fr/scotch/scotch/-/archive/$(version)/scotch-$(version).zip",
"https://gitlab.inria.fr/scotch/scotch.git")
add_versions("v6.1.1", "21d001c390ec63ac60f987b9921f33cc1967b41cf07567e22cbf3253cda8962a")
add_versions("v7.0.4", "d613d00b15a95fbe24c04d862b01cb743b24a0c5e5f4e6002b885b6baf2f42bf")

add_deps("zlib")
if is_plat("linux") then
add_syslinks("pthread")
end
add_links("esmumps", "scotch", "scotcherr", "scotcherrexit", "scotchmetis")
on_load(function (package)
if package:version():ge("7.0.0") then
package:add("deps", "bison")
end
end)

on_install("macosx|x86_64", "linux", function (package)
os.cd("src")
if package:is_plat("macosx") then
Expand Down
Loading