WIP new build

KhiopsML · Dec 12, 2023 · 26abc55 · 26abc55
1 parent 82e7aea
commit 26abc55
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 28 deletions.
diff --git a/.github/workflows/build-conda-package.yml b/.github/workflows/build-conda-package.yml
@@ -46,21 +46,28 @@ jobs:
           fetch-depth: 0
       - name: Install Miniconda
         if: success() || failure()
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: khiops-python-env
       - name: Install Dependency Requirements for Building Conda Packages
-        run: conda install conda-build conda-verify ninja
+        run: conda install conda-build conda-verify
       # We need MacOS SDK 10.10 to build on Big Sur
       - name: Install Mac OS SDK 10.10
         if: runner.os == 'macOS'
         run: |
           wget https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.10.sdk.tar.xz
           sudo tar -zxvf MacOSX10.10.sdk.tar.xz -C /opt
-      - name: Build Khiops Conda Package
+      - name: Build Khiops Conda Package (Windows)
+        if: runner.os == 'Windows'
         run: |
           mkdir build
           conda build --output-folder build packaging/conda
+      # In Linux/macOS we need the conda-forge channel to install mpi 3.4.3
+      - name: Build Khiops Conda Package (Linux/macOS)
+        if: runner.os != 'Windows'
+        run: |
+          mkdir build
+          conda build --channel conda-forge --output-folder build packaging/conda
       - name: Upload Khiops Conda Package
         uses: actions/upload-artifact@v3
         with:
@@ -108,23 +115,23 @@ jobs:
           path: khiops-conda-package
       - name: Install Miniconda
         if: success() || failure()
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           miniconda-version: latest  # needed for Mac OS 13
           python-version: ${{ matrix.python-version }}
           activate-environment: khiops-python-env
-      - name: Install conda-build and Setup Khiops Conda Channel
+      - name: Install conda-build and setup a local conda channel
         run: |
           conda install conda-build
           conda index ./khiops-conda-package/.
-      - name: Install the Khiops Conda package
-        run: conda install -c ./khiops-conda-package/ khiops
-      - name: Test Khiops Installation Status (Windows)
+      - name: Install the Khiops Conda pagkage (Windows)
         if: runner.os == 'Windows'
-        shell: cmd /C CALL {0}
-        run: C:\Miniconda3\envs\khiops-python-env\Scripts\kh-status.exe
-      - name: Test Khiops Installation Status (Linux/macOS)
+        run: conda install -c ./khiops-conda-package/ khiops
+      # In Linux/macOS we need the conda-forge channel to install mpi 3.4.3
+      - name: Install the Khiops Conda package (Linux/macOS)
         if: runner.os != 'Windows'
+        run: conda install -c conda-forge -c ./khiops-conda-package/ khiops
+      - name: Test Khiops Installation Status
         run: kh-status
       - name: Test Conda Package Installation on Samples
         run: |
@@ -162,7 +169,7 @@ jobs:
           docker image rm $OSX_ARM_64_IMAGE
       - name: Install Miniconda
         if: success() || failure()
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: khiops-python-env
       - name: Create Conda Channel

diff --git a/packaging/conda/meta.yaml b/packaging/conda/meta.yaml
@@ -35,31 +35,31 @@ build:
 #   the bug https://github.com/pmodels/mpich/issues/6619
 requirements:
   build:
-    - cmake
-    - mpich                # [linux or osx and x86]
-    - mpich-mpicc          # [linux or osx and x86]
-    - mpich-mpicxx         # [linux or osx and x86]
-    - mpich <=3.4.3        # [osx and arm64]
-    - mpich-mpicc <=3.4.3  # [osx and arm64]
-    - mpich-mpicxx <=3.4.3 # [osx and arm64]
+    - mpich <=4.0.3        # [linux]
+    - mpich-mpicc <=4.0.3  # [linux]
+    - mpich-mpicxx <=4.0.3 # [linux]
+    - mpich <=3.4.3        # [osx]
+    - mpich-mpicc <=3.4.3  # [osx]
+    - mpich-mpicxx <=3.4.3 # [osx]
     - msmpi                # [win]
-    - ninja                # [win]
+    - cmake
+    - ninja
     - python
     - setuptools
     - {{ compiler('cxx') }}
   host:
-    - mpich                # [linux or osx and x86]
-    - mpich-mpicc          # [linux or osx and x86]
-    - mpich-mpicxx         # [linux or osx and x86]
-    - mpich <=3.4.3        # [osx and arm64]
-    - mpich-mpicc <=3.4.3  # [osx and arm64]
-    - mpich-mpicxx <=3.4.3 # [osx and arm64]
+    - mpich <=4.0.3        # [linux]
+    - mpich-mpicc <=4.0.3  # [linux]
+    - mpich-mpicxx <=4.0.3 # [linux]
+    - mpich <=3.4.3        # [osx]
+    - mpich-mpicc <=3.4.3  # [osx]
+    - mpich-mpicxx <=3.4.3 # [osx]
     - msmpi                # [win]
     - python
   run:
-    - mpich           # [linux or osx and x64]
+    - mpich <=4.0.3   # [linux]
+    - mpich <=3.4.3   # [osx]
     - msmpi           # [win]
-    - mpich <=3.4.3   # [osx and arm64]
     - pandas >=0.25.3
     - python
     - scikit-learn >=0.22.2