Sfoglia il codice sorgente

scotch: enable some platform (#5291)

* scotch: enable some platform

* limit plat

* fix gfortran

* fix again

* add log on macos

* update macos ci

---------

Co-authored-by: xq114 <[email protected]>
star9029 1 anno fa
parent
commit
bd72a3b8bc

+ 2 - 1
.github/workflows/macos_arm64.yml

@@ -31,5 +31,6 @@ jobs:
           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.1.0_2/libexec/gcc/aarch64-apple-darwin23/14/"
+          find /opt/homebrew/Cellar/gcc/ -name f951
+          export PATH="$PATH:/opt/homebrew/Cellar/gcc/14.2.0/libexec/gcc/aarch64-apple-darwin23/14/"
           xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }}

+ 2 - 1
.github/workflows/macos_x86_64.yml

@@ -31,5 +31,6 @@ jobs:
           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.1.0_2/libexec/gcc/x86_64-apple-darwin21/14/"
+          find /usr/local/Cellar/gcc/ -name f951
+          export PATH="$PATH:/usr/local/Cellar/gcc/14.2.0/libexec/gcc/x86_64-apple-darwin21/14/"
           xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }}

+ 98 - 0
packages/s/scotch/patches/7.0.5/cmake.patch

@@ -0,0 +1,98 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ce3c5ba..b05667f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@
+ ############################################################
+ 
+ cmake_minimum_required(VERSION 3.10)
+-project(SCOTCH LANGUAGES C Fortran)
++project(SCOTCH LANGUAGES C)
+ 
+ # Add module directory
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+diff --git a/src/esmumps/CMakeLists.txt b/src/esmumps/CMakeLists.txt
+index 7d2fb92..fa2ca12 100644
+--- a/src/esmumps/CMakeLists.txt
++++ b/src/esmumps/CMakeLists.txt
+@@ -135,6 +135,7 @@ install(TARGETS esmumps
+   EXPORT esmumpsTargets
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ # Dummy PTEsMUMPS library file
+@@ -169,4 +170,5 @@ install(TARGETS ptesmumps
+   EXPORT ptesmumpsTargets
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+diff --git a/src/libscotch/CMakeLists.txt b/src/libscotch/CMakeLists.txt
+index f314d3a..e539ab9 100644
+--- a/src/libscotch/CMakeLists.txt
++++ b/src/libscotch/CMakeLists.txt
+@@ -359,7 +359,7 @@ set(SCOTCH_C_SOURCES
+   library_context_graph_f.c
+   library_context_f.c
+   #library_errcom.c
+-  #library_error.c
++  library_error.c
+   #library_error_exit.c
+   library_f.h
+   library_geom.c
+@@ -833,6 +833,7 @@ foreach(_target ${TARGETS_LIST})
+     EXPORT ${_target}Targets
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+   if (BUILD_PTSCOTCH)
+@@ -847,6 +848,7 @@ foreach(_target ${TARGETS_LIST})
+       EXPORT pt${_target}Targets
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+       PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+   endif()
+diff --git a/src/libscotchmetis/CMakeLists.txt b/src/libscotchmetis/CMakeLists.txt
+index e08fe6a..ac8b089 100644
+--- a/src/libscotchmetis/CMakeLists.txt
++++ b/src/libscotchmetis/CMakeLists.txt
+@@ -127,13 +127,15 @@ foreach(version 3 5)
+       EXPORT scotchmetisTargets
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+       PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+   else()
+     install(TARGETS scotchmetisv${version}
+       COMPONENT libscotch
+       EXPORT scotchmetisTargets
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+   endif()
+ endforeach(version 3 5)
+ 
+@@ -204,13 +206,15 @@ if(BUILD_PTSCOTCH)
+         EXPORT ptscotchparmetisTargets
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+     else()
+       install(TARGETS ptscotchparmetisv${version}
+         COMPONENT libptscotch
+         EXPORT ptscotchparmetisTargets
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+     endif()
+   endforeach(version 3)
+ endif(BUILD_PTSCOTCH)

+ 33 - 8
packages/s/scotch/xmake.lua

@@ -1,26 +1,43 @@
 package("scotch")
-
     set_homepage("https://www.labri.fr/perso/pelegrin/scotch/")
     set_description("Scotch: a software package for graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering")
 
     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.5", "fd52e97844115dce069220bacbfb45fccdf83d425614b02b67b44cedf9d72640")
 
+    if is_plat("windows", "mingw", "msys", "bsd") then
+        add_patches("7.0.5", "patches/7.0.5/cmake.patch", "5104181d78dcf31779ab70cae61bb80fa2f6f836ce5d73628ef9b2d074fb8d8c")
+    end
+
     add_configs("zlib", {description = "Use ZLIB compression format.", default = true, type = "boolean"})
     add_configs("lzma", {description = "Use LZMA compression format.", default = false, type = "boolean"})
     add_configs("bz2", {description = "Use BZ2 compression format.", default = false, type = "boolean"})
 
-    if is_plat("linux") then
+    if is_plat("linux", "bsd") then
         add_syslinks("pthread")
     end
+
     add_links("ptesmumps", "esmumps", "scotch", "scotcherr", "scotcherrexit", "scotchmetis", "scotchmetisv5", "scotchmetisv3")
+
+    if on_check then
+        on_check(function (package)
+            if package:is_cross() then
+                raise("package(scotch) unsupported cross-compilation")
+            end
+        end)
+    end
+
     on_load(function (package)
-        if package:version():ge("7.0.0") then
+        if package:gitref() or package:version():ge("7.0.0") then
             package:add("deps", "cmake")
             package:add("deps", "flex", "bison")
-            package:add("deps", "gfortran", {kind = "binary"})
+            if package:is_plat("linux", "macosx") then
+                package:add("deps", "gfortran", {kind = "binary"})
+            end
+
             if package:config("zlib") then
                 package:add("deps", "zlib")
             end
@@ -34,17 +51,25 @@ package("scotch")
             package:add("deps", "zlib")
         end
     end)
-
-    on_install("macosx", "linux", function (package)
-        if package:version():ge("7.0.0") then
+    -- mingw require to fix xrepo flex package
+    on_install("windows|x64", "windows|arm64", "linux", "macosx", "bsd", function (package)
+        if package:gitref() or package:version():ge("7.0.0") then
             local configs = {"-DENABLE_TESTS=OFF", "-DBUILD_PTSCOTCH=OFF"}
             table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
             table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
             table.insert(configs, "-DUSE_ZLIB=" .. (package:config("zlib") and "ON" or "OFF"))
             table.insert(configs, "-DUSE_LZMA=" .. (package:config("lzma") and "ON" or "OFF"))
             table.insert(configs, "-DUSE_BZ2=" .. (package:config("bz2") and "ON" or "OFF"))
+            if package:is_plat("windows") then
+                os.mkdir(path.join(package:buildir(), "src/scotch/pdb"))
+                os.mkdir(path.join(package:buildir(), "src/esmumps/pdb"))
+                os.mkdir(path.join(package:buildir(), "src/libscotch/pdb"))
+                os.mkdir(path.join(package:buildir(), "src/libscotchmetis/pdb"))
+                if package:config("shared") then
+                    table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON")
+                end
+            end
             import("package.tools.cmake").install(package, configs)
-
         elseif package:is_plat("macosx", "linux") then
             import("package.tools.make")