adding gcc on MacOS and using latest ducc0

flatironinstitute · Jul 31, 2024 · c787711 · c787711
1 parent d390319
commit c787711
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/generate_cmake_matrix.py b/.github/workflows/generate_cmake_matrix.py
@@ -27,15 +27,9 @@
     }),
     ("macos-13", {
         "build_type": ["Release", "Debug"],
-        "toolchain": ["llvm"],
+        "toolchain": ["llvm", "gcc-14"],
         "arch_flags": ["-march=native", "-march=x86-64", "native"],
         "ducc_fft": ["On", "Off"]
-    }),
-    ("macos-13", {
-        "build_type": ["Release", "Debug"],
-        "toolchain": ["gcc-14"],
-        "arch_flags": ["-march=native", "-march=x86-64", "native"],
-        "ducc_fft": ["Off"]
     })
 ]
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,7 +150,8 @@ if(FINUFFT_USE_CPU)
   set(FFTW_VERSION 3.3.10)
   set(XTL_VERSION 0.7.7)
   set(XSIMD_VERSION 13.0.0)
-  set(DUCC0_VERSION ducc0_0_34_0)
+  # using latest ducc0 version for now as it fixes MacOS GCC build
+  set(DUCC0_VERSION b0beb85e03982344a31ebb119758d7aa3ef5d362)
   set(FINUFFT_FFTW_LIBRARIES)
   include(cmake/setupCPM.cmake)
   include(cmake/setupXSIMD.cmake)