浏览代码

Superlu: update to v7.0.1 (#7649)

* update superlu to v7.0.1

* fix: openblas config on mac

* fix: macos ci find gfortran

* opti(macos ci): reduce redundancy

* update xmake.lua

* opti(macos ci): follow @choyy 's solution
Willaaaaaaa 1 月之前
父节点
当前提交
dba74c4cd4
共有 3 个文件被更改,包括 31 次插入9 次删除
  1. 3 4
      .github/workflows/macos_arm64.yml
  2. 3 4
      .github/workflows/macos_x86_64.yml
  3. 25 1
      packages/s/superlu/xmake.lua

+ 3 - 4
.github/workflows/macos_arm64.yml

@@ -30,8 +30,7 @@ jobs:
         run: |
           wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem
           export CURL_CA_BUNDLE=/tmp/cacert.pem
-          sudo ln /opt/homebrew/bin/gfortran-14 /opt/homebrew/bin/gfortran
-          export PATH="$PATH:/opt/homebrew/Cellar/gcc/14.2.0/libexec/gcc/aarch64-apple-darwin23/14/"
-          export LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/Cellar/gcc/14.2.0/lib/gcc/14/"
-          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/homebrew/Cellar/gcc/14.2.0/lib/gcc/14/"
+          sudo ln -s /opt/homebrew/bin/gfortran-14 /opt/homebrew/bin/gfortran
+          export LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib/gcc/14/"
+          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/homebrew/lib/gcc/14/"
           xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }}

+ 3 - 4
.github/workflows/macos_x86_64.yml

@@ -30,8 +30,7 @@ jobs:
         run: |
           wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem
           export CURL_CA_BUNDLE=/tmp/cacert.pem
-          sudo ln /usr/local/bin/gfortran-14 /usr/local/bin/gfortran
-          export PATH="$PATH:/usr/local/Cellar/gcc/14.2.0/libexec/gcc/x86_64-apple-darwin21/14/"
-          export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/Cellar/gcc/14.2.0/lib/gcc/14/"
-          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/Cellar/gcc/14.2.0/lib/gcc/14/"
+          sudo ln -s /usr/local/bin/gfortran-14 /usr/local/bin/gfortran
+          export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/lib/gcc/14/"
+          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib/gcc/14/"
           xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }}

+ 25 - 1
packages/s/superlu/xmake.lua

@@ -9,6 +9,7 @@ package("superlu")
     add_versions("v5.2.2", "470334a72ba637578e34057f46948495e601a5988a602604f5576367e606a28c")
     add_versions("v5.3.0", "3e464afa77335de200aeb739074a11e96d9bef6d0b519950cfa6684c4be1f350")
     add_versions("v7.0.0", "d7b91d4e0bb52644ca74c1a4dd466a694ddf1244a7bbf93cb453e8ca1f6527eb")
+    add_versions("v7.0.1", "86dcca1e086f8b8079990d07f00eb707fc9ef412cf3b2ce808b37956f0de2cb8")
 
     add_configs("blas", {description = "Choose BLAS library to use.", default = "openblas", type = "string", values = {"mkl", "openblas"}})
 
@@ -19,7 +20,30 @@ package("superlu")
     on_install("windows|!arm64", "linux", "macosx", function (package)
         os.cd("SRC")
         if package:version():ge("7.0.0") then
-            io.replace("superlu_config.h", "#define HAVE_METIS TRUE", "", {plain = true})
+            io.writefile("superlu_config.h", [[
+                #ifndef SUPERLU_CONFIG_H
+                #define SUPERLU_CONFIG_H
+
+                /* Enable metis */
+                /* #undef HAVE_METIS */
+
+                /* Enable colamd */
+                /* #undef HAVE_COLAMD */
+
+                /* enable 64bit index mode */
+                /* #undef XSDK_INDEX_SIZE */
+
+                /* Integer type for indexing sparse matrix meta structure */
+                #if defined(XSDK_INDEX_SIZE) && (XSDK_INDEX_SIZE == 64)
+                #include <stdint.h>
+                #define _LONGINT 1
+                typedef int64_t int_t;
+                #else
+                typedef int int_t; /* default */
+                #endif
+
+                #endif /* SUPERLU_CONFIG_H */
+            ]])
         end
         io.writefile("xmake.lua", format([[
             add_rules("mode.debug", "mode.release")