From 715d9fbed11227b841f6f796b4997b9241477ab9 Mon Sep 17 00:00:00 2001
From: David Loiseaux <david.loiseaux@inria.fr>
Date: Mon, 25 Nov 2024 20:08:47 +0100
Subject: [PATCH] wf: conda compiler for macos

---
 .github/workflows/python_PR.yml | 19 +++++++++++--------
 _tempita_grid_gen.py            | 12 ++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/python_PR.yml b/.github/workflows/python_PR.yml
index 635bce0..ada2f78 100644
--- a/.github/workflows/python_PR.yml
+++ b/.github/workflows/python_PR.yml
@@ -45,12 +45,13 @@ jobs:
         micromamba install boost-cpp 'gudhi>=3.10' 'numpy>=2' pot 'cython>=3' pytest scikit-learn matplotlib boost joblib tqdm scipy tbb tbb-devel -c conda-forge
         pip install pykeops filtration-domination --upgrade
 
-        if [[ ${{ matrix.os }} =~ "ubuntu-".* ]]; then
-          micromamba install cxx-compiler=1.6 -c conda-forge
-        fi
-        if [[ ${{ matrix.os }} =~ "windows-".* ]]; then
-          micromamba install cxx-compiler=1.6 -c conda-forge
-        fi
+        micromamba install c-compiler=1.6 cxx-compiler=1.6 -c conda-forge
+        # if [[ ${{ matrix.os }} =~ "ubuntu-".* ]]; then
+        #   micromamba install cxx-compiler=1.6 -c conda-forge
+        # fi
+        # if [[ ${{ matrix.os }} =~ "windows-".* ]]; then
+        #   micromamba install cxx-compiler=1.6 -c conda-forge
+        # fi
 
     - name: Build package
       shell: bash -el {0}
@@ -69,6 +70,7 @@ jobs:
         if [[ ${{ matrix.os }} =~ "windows-".* ]]; then
           set LIBPATH=%LIBPATH%;C:\Miniconda\envs\build_test_env\Library\lib
         fi
+
         python setup.py build_ext -j4 --inplace bdist_wheel
 
     - name: Fix wheels on Linux and Macos
@@ -77,7 +79,7 @@ jobs:
         micromamba activate build
         if [[ ${{ matrix.os }} =~ "ubuntu-".* ]]; then
           cd dist
-          pip install auditwheel --upgrade
+          micromamba install auditwheel -c conda-forge
           for wheel_file in multipers*linux*.whl; do
             auditwheel show $wheel_file
             auditwheel repair $wheel_file --plat manylinux_2_34_x86_64
@@ -88,7 +90,7 @@ jobs:
         fi
         if [[ ${{ matrix.os }} == "macos-13" ]]; then
           cd dist
-          pip install delocate --upgrade
+          micromamba install delocate -c conda-forge
           for wheel_file in multipers*macosx*x86*.whl; do
             delocate-listdeps $wheel_file
             delocate-wheel --require-archs x86_64 -w wheelhouse -v $wheel_file
@@ -109,6 +111,7 @@ jobs:
           mv wheelhouse/*.whl . # retrieves repaired wheels
           cd ..
         fi
+
     - name: Install and Test
       shell: bash -el {0}
       run: |
diff --git a/_tempita_grid_gen.py b/_tempita_grid_gen.py
index f1e220e..7e3b8cf 100644
--- a/_tempita_grid_gen.py
+++ b/_tempita_grid_gen.py
@@ -10,9 +10,9 @@
     for stuff in (
         "INTRUSIVE_SET",
         # "SET",
-        "HEAP",
+        # "HEAP",
         # "UNORDERED_SET",
-        "NAIVE_VECTOR",
+        # "NAIVE_VECTOR",
         # "VECTOR",
         # "INTRUSIVE_LIST",
         # "LIST",
@@ -22,10 +22,10 @@
 
 ## Value types : CTYPE, PYTHON_TYPE, short
 value_types = [
-    ("int32_t", "np.int32", "i32"),  # necessary
-    ("int64_t", "np.int64", "i64"),
-    ("float", "np.float32", "f32"),  # necessary for mma (TODO: fixme)
-    ("double", "np.float64", "f64"),  # necessary
+    ("int32_t", "np.int32",   "i32"),  # necessary
+    ("int64_t", "np.int64",   "i64"),
+    ("float",   "np.float32", "f32"),  # necessary for mma (TODO: fixme)
+    ("double",  "np.float64", "f64"),  # necessary
 ]
 
 ## True, False necessary