wip

sergiud · sergiud · commit 20a426574fdd · 2025-06-21T04:34:38.000+02:00
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
+    if: false
     name: ${{matrix.os}}-GCC-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.components}}-${{matrix.gpu}}-${{matrix.metis}}
     runs-on: ${{matrix.os}}
     defaults:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
+    if: false
     name: ${{matrix.os}}-AppleClang-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.components}}-${{matrix.metis}}
     runs-on: ${{matrix.os}}
     defaults:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -4,8 +4,9 @@ on: [push, pull_request]
 
 jobs:
   build-mingw:
-    name: ${{matrix.sys}}-${{matrix.env}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.components}}-${{matrix.metis}}
-    runs-on: windows-latest
+    if: false
+    name: mingw64-${{matrix.env}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.components}}-${{matrix.metis}}
+    runs-on: ${{matrix.os}}
     defaults:
       run:
         shell: msys2 {0}
@@ -15,23 +16,32 @@ jobs:
       fail-fast: true
       matrix:
         build_type: [Release, Debug]
-        sys: [mingw64]
         lib: [shared, static]
+        arch:
+          - arm64
+          - x64
         components: [minimal, lgpl, gpl]
         metis: [no-metis, metis]
         exclude:
           # METIS is only usable if CHOLMOD is compiled
           - components: minimal
             metis: metis
         include:
-          - sys: mingw64
+          - arch: x64
+            os: windows-2022
             env: x86_64
+            sys: mingw64
+          - arch: arm64
+            os: windows-11-arm
+            env: clang-aarch64
+            sys: clangarm64
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Setup Dependencies
+    - name: Setup Dependencies (x86_64)
       uses: msys2/setup-msys2@v2
+      if: ${{matrix.sys == 'mingw64'}}
       with:
         msystem: ${{matrix.sys}}
         install: >-
@@ -47,6 +57,25 @@ jobs:
           unzip
           wget
 
+    - name: Setup Dependencies (clang-aarch64)
+      uses: msys2/setup-msys2@v2
+      if: ${{matrix.sys == 'clangarm64'}}
+      with:
+        msystem: ${{matrix.sys}}
+        install: >-
+          mingw-w64-${{matrix.env}}-ccache
+          mingw-w64-${{matrix.env}}-clang
+          mingw-w64-${{matrix.env}}-cmake
+          mingw-w64-${{matrix.env}}-flang
+          mingw-w64-${{matrix.env}}-intel-tbb
+          mingw-w64-${{matrix.env}}-lapack
+          mingw-w64-${{matrix.env}}-ninja
+          mingw-w64-${{matrix.env}}-openblas
+          mingw-w64-${{matrix.env}}-openmp
+          unzip
+          wget
+
+
     - name: Setup METIS Dependencies
       if: ${{matrix.metis == 'metis'}}
       run: >-
@@ -94,7 +123,7 @@ jobs:
               --target install
 
   build-msvc:
-    name: ${{matrix.msvc}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.components}}-${{matrix.metis}}
+    name: ${{matrix.msvc}}-${{matrix.arch}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.components}}-${{matrix.metis}}
     runs-on: ${{matrix.os}}
     env:
       CCACHE_DIR: ${{github.workspace}}/ccache
@@ -106,8 +135,10 @@ jobs:
       fail-fast: true
       matrix:
         build_type: [Release, Debug]
-        msvc: [VS-16-2019, VS-17-2022]
-        sys: [mingw64]
+        msvc: [VS-17-2022]
+        arch:
+          - arm64
+          - x64
         lib: [shared, static]
         components: [minimal, lgpl, gpl]
         metis: [no-metis, metis]
@@ -116,17 +147,19 @@ jobs:
           - components: minimal
             metis: metis
         include:
-          - sys: mingw64
-            env: x86_64
-            system: Win64
-          - msvc: VS-16-2019
-            generator: "Visual Studio 16 2019"
-            os: windows-2019
-            marker: vc16
           - msvc: VS-17-2022
             generator: "Visual Studio 17 2022"
-            os: windows-2022
             marker: vc17
+          - arch: x64
+            env: x86_64
+            os: windows-2022
+            sys: mingw64
+            system: Win64
+          - arch: arm64
+            env: clang-aarch64
+            os: windows-11-arm
+            sys: clangarm64
+            system: arm64
 
     steps:
     - uses: actions/checkout@v4
@@ -137,7 +170,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: metis/
-        key: ${{matrix.msvc}}-metis-5.1.0-${{matrix.build_type}}-shared
+        key: ${{matrix.msvc}}-${{matrix.arch}}-metis-5.1.0-${{matrix.build_type}}-shared
 
     - name: Download METIS
       if: matrix.metis == 'metis' && steps.cache-metis.outputs.cache-hit != 'true'
@@ -160,7 +193,7 @@ jobs:
         Pop-Location
 
         cmake -S metis-5.1.0 -B build-metis `
-              -A x64 `
+              -A ${{matrix.arch}} `
               -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/metis `
               -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON `
               -DMETIS_INSTALL:BOOL=ON `
@@ -170,9 +203,9 @@ jobs:
               --config ${{matrix.build_type}} `
               --target install
 
-
-    - name: Setup MSYS2
+    - name: Setup MSYS2 (x86_64)
       uses: msys2/setup-msys2@v2
+      if: ${{matrix.sys == 'mingw64'}}
       with:
         msystem: ${{matrix.sys}}
         path-type: inherit
@@ -182,14 +215,26 @@ jobs:
           mingw-w64-${{matrix.env}}-gcc-fortran
           mingw-w64-${{matrix.env}}-ninja
 
+    - name: Setup MSYS2 (aarch64)
+      uses: msys2/setup-msys2@v2
+      if: ${{matrix.sys == 'clangarm64'}}
+      with:
+        msystem: ${{matrix.sys}}
+        path-type: inherit
+        install: >-
+          wget
+          mingw-w64-${{matrix.env}}-ccache
+          mingw-w64-${{matrix.env}}-flang
+          mingw-w64-${{matrix.env}}-ninja
+
     - name: Cache LAPACK
       id: cache-lapack
       uses: actions/cache@v4
       with:
         path: |
           ${{env.CCACHE_DIR}}
           ${{github.workspace}}/install
-        key: ${{matrix.msvc}}-lapack-3.12.0-${{matrix.build_type}}
+        key: ${{matrix.msvc}}-${{matrix.arch}}-lapack-3.12.0-${{matrix.build_type}}
 
     - name: Download LAPACK
       if: steps.cache-lapack.outputs.cache-hit != 'true'
@@ -198,10 +243,28 @@ jobs:
         wget https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.12.0.tar.gz
         tar xvf v3.12.0.tar.gz
 
-    - name: Build LAPACK
-      if: steps.cache-lapack.outputs.cache-hit != 'true'
+    - name: Build LAPACK (x86_64)
+      if: matrix.arch == 'x64' && steps.cache-lapack.outputs.cache-hit != 'true'
+      shell: msys2 {0}
+      run: |
+        cmake -S lapack-3.12.0 -B build_lapack_${{matrix.build_type}}/ \
+              -DBUILD_SHARED_LIBS=ON \
+              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
+              -DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=$(which ccache) \
+              -DCMAKE_Fortran_COMPILER_LAUNCHER:FILEPATH=$(which ccache) \
+              -DCMAKE_GNUtoMS=ON \
+              -DCMAKE_INSTALL_PREFIX=./install \
+              -G Ninja
+
+        cmake --build build_lapack_${{matrix.build_type}}/ \
+              --config ${{matrix.build_type}} \
+              --target install
+
+    - name: Build LAPACK (aarch64)
+      if: matrix.arch == 'arm64' && steps.cache-lapack.outputs.cache-hit != 'true'
       shell: msys2 {0}
       run: |
+        cat ./cmake/Flang.cmake >> lapack-3.12.0/CMakeLists.txt
         cmake -S lapack-3.12.0 -B build_lapack_${{matrix.build_type}}/ \
               -DBUILD_SHARED_LIBS=ON \
               -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
@@ -229,7 +292,7 @@ jobs:
     - name: Configure
       run: |
         cmake -S . -B build_${{matrix.build_type}}/ `
-              -A x64 `
+              -A ${{matrix.arch}} `
               -DBLAS_blas_LIBRARY=${{github.workspace}}/install/lib/libblas.lib `
               -DBUILD_SHARED_LIBS=${{matrix.lib == 'shared'}} `
               -DCMAKE_Fortran_COMPILER= `
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # CMake support layer for SuiteSparse
 #
-# Copyright 2023 Sergiu Deitsch <sergiu.deitsch@gmail.com>
+# Copyright 2025 Sergiu Deitsch <sergiu.deitsch@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/cmake/Flang.cmake b/cmake/Flang.cmake
@@ -0,0 +1,106 @@
+macro(windows_compiler_clang_abi lang)
+  if(CMAKE_NO_GNUtoMS)
+    set(CMAKE_GNUtoMS 0)
+  else()
+    option(CMAKE_GNUtoMS "Convert GNU import libraries to MS format (requires Visual Studio)" OFF)
+  endif()
+
+  if(CMAKE_GNUtoMS AND NOT CMAKE_GNUtoMS_LIB)
+    # Find MS development environment setup script for this architecture.
+    # We need to use the MS Librarian tool (lib.exe).
+    # Find the most recent version available.
+
+    # Query the VS Installer tool for locations of VS 2017 and above.
+    set(_vs_installer_paths "")
+    foreach(vs RANGE 17 15 -1) # change the first number to the largest supported version
+      cmake_host_system_information(RESULT _vs_dir QUERY VS_${vs}_DIR)
+      if(_vs_dir)
+        list(APPEND _vs_installer_paths "${_vs_dir}/VC/Auxiliary/Build")
+      endif()
+    endforeach()
+
+    if("${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
+      find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars32.bat
+        DOC "Visual Studio vcvars32.bat"
+        PATHS
+        ${_vs_installer_paths}
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VC;ProductDir]/bin"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\6.0\\Setup\\Microsoft Visual C++;ProductDir]/bin"
+        )
+      set(CMAKE_GNUtoMS_ARCH x86)
+    elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
+      if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64)
+        find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars64.bat vcvarsamd64.bat
+          DOC "Visual Studio vcvarsamd64.bat"
+          PATHS
+          ${_vs_installer_paths}
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\VC;ProductDir]/bin/amd64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/amd64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/amd64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/amd64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin/amd64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/bin/amd64"
+          )
+        set(CMAKE_GNUtoMS_ARCH amd64)
+      elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL ARM64)
+        find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvarsamd64_arm.bat
+          DOC "Visual Studio vcvarsamd64_arm.bat"
+          PATHS
+          ${_vs_installer_paths}
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\VC;ProductDir]/bin/arm64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/arm64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/arm64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/arm64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin/arm64"
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/bin/arm64"
+          )
+        set(CMAKE_GNUtoMS_ARCH arm64)
+      endif()
+    endif()
+    unset(_vs_installer_paths)
+    set_property(CACHE CMAKE_GNUtoMS_VCVARS PROPERTY ADVANCED 1)
+    if(CMAKE_GNUtoMS_VCVARS)
+      # Create helper script to run lib.exe from MS environment.
+      string(REPLACE "/" "\\" CMAKE_GNUtoMS_BAT "${CMAKE_GNUtoMS_VCVARS}")
+      set(CMAKE_GNUtoMS_LIB ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeGNUtoMS_lib.bat)
+      configure_file(${CMAKE_ROOT}/Modules/Platform/GNUtoMS_lib.bat.in ${CMAKE_GNUtoMS_LIB})
+    else()
+      message(WARNING "Disabling CMAKE_GNUtoMS option because CMAKE_GNUtoMS_VCVARS is not set.")
+      set(CMAKE_GNUtoMS 0)
+    endif()
+  endif()
+
+  if(CMAKE_GNUtoMS)
+    # Teach CMake how to create a MS import library at link time.
+    set(CMAKE_${lang}_GNUtoMS_RULE " -Wl,--output-def,<TARGET_NAME>.def"
+      "<CMAKE_COMMAND> -Dlib=\"${CMAKE_GNUtoMS_LIB}\" -Ddef=<TARGET_NAME>.def -Ddll=<TARGET> -Dimp=<TARGET_IMPLIB> -P \"${CMAKE_ROOT}/Modules/Platform/GNUtoMS_lib.cmake\""
+      )
+  endif()
+endmacro()
+
+if (WIN32)
+  if (CMAKE_C_COMPILER_LOADED)
+    if (CMAKE_C_COMPILER_ID STREQUAL "Clang")
+      windows_compiler_clang_abi (C)
+    endif (CMAKE_C_COMPILER_ID STREQUAL "Clang")
+  endif (CMAKE_C_COMPILER_LOADED)
+
+  if (CMAKE_CXX_COMPILER_LOADED)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+      windows_compiler_clang_abi (CXX)
+    endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  endif (CMAKE_CXX_COMPILER_LOADED)
+
+  if (CMAKE_Fortran_COMPILER_LOADED)
+    if (CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
+      windows_compiler_clang_abi (Fortran)
+    endif (CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
+  endif (CMAKE_Fortran_COMPILER_LOADED)
+endif (WIN32)
+

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# CMake support layer for SuiteSparse`
`3`	`3`	`#`
`4`		`-# Copyright 2023 Sergiu Deitsch <sergiu.deitsch@gmail.com>`
	`4`	`+# Copyright 2025 Sergiu Deitsch <sergiu.deitsch@gmail.com>`
`5`	`5`	`#`
`6`	`6`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`7`	`7`	`# you may not use this file except in compliance with the License.`