Merge pull request #278 from KhiopsML/dev

Finalize release 10.2.3.0

Author: popescu-v

.github/workflows/api-docs.yml

@@ -8,6 +8,9 @@ on:
         required: true
         type: boolean
         default: false
+      image-tag:
+        default: 10.2.3.0
+        description: Development Docker Image Tag
   pull_request:
     paths:
       - doc/**.rst
@@ -32,7 +35,11 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:latest
+      # 'latest' default image tag cannot be set as an environment variable,
+      # because the `env` context is only accessible at the step level;
+      # hence, it is hard-coded
+      image: |-
+        ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.2.3.0' }}
       # Use the 'runner' user (1001) from github so checkout actions work properly
       # https://github.com/actions/runner/issues/2033#issuecomment-1598547465
       options: --user 1001

.github/workflows/conda.yml

@@ -4,12 +4,12 @@ env:
   DEFAULT_SAMPLES_VERSION: 10.2.0
   # Note: The default Khiops version must never be an alpha release as they are
   #       ephemeral. To test alpha versions run the workflow manually.
-  DEFAULT_KHIOPS_CORE_VERSION: 10.2.2
+  DEFAULT_KHIOPS_CORE_VERSION: 10.2.3
 on:
   workflow_dispatch:
     inputs:
       khiops-core-version:
-        default: 10.2.2
+        default: 10.2.3
         description: khiops-core version for testing
       khiops-samples-version:
         default: 10.2.0
@@ -39,19 +39,18 @@ jobs:
           # Checkout the full repository to have the tags so versioneer works properly
           # See issue https://github.com/actions/checkout/issues/701
           fetch-depth: 0
-      - name: Install Miniconda
+      - name: Install Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniconda-version: latest
+          miniforge-version: latest
           python-version: '3.12'
       - name: Install Dependency Requirements for Building Conda Packages
         run: conda install -y conda-build
       - name: Build the Conda Package
         # Note: The "khiops-dev" conda channel is needed to retrieve the "khiops-core" package.
         #       The "test" part of the conda recipe needs this package.
         run: |
-          conda build --channel conda-forge --channel khiops-dev \
-            --output-folder ./khiops-conda ./packaging/conda
+          conda build --channel khiops-dev --output-folder ./khiops-conda ./packaging/conda
       - name: Upload Conda Package Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -78,10 +77,10 @@ jobs:
     runs-on: ${{ matrix.env.os }}
     container: ${{ fromJSON(matrix.env.json-image) }}
     steps:
-      - name: Install Miniconda
+      - name: Install Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniconda-version: latest  # needed for macOS 13
+          miniforge-version: latest  # needed for macOS 13
           python-version: ${{ matrix.python-version }}
       - name: Download Conda Package Artifact
         uses: actions/download-artifact@v4
@@ -92,16 +91,9 @@ jobs:
         run: |
           KHIOPS_CORE_VERSION="${{ inputs.khiops-core-version || env.DEFAULT_KHIOPS_CORE_VERSION }}"
           echo "KHIOPS_CORE_VERSION=$KHIOPS_CORE_VERSION" >> "$GITHUB_ENV"
-      - name: Install the Khiops Conda package (Windows)
-        if: runner.os == 'Windows'
+      - name: Install the Khiops Conda package
         run: |
           conda install --channel khiops-dev khiops-core=$KHIOPS_CORE_VERSION
-          conda install --override-channels --channel conda-forge --channel ./khiops-conda/ khiops
-      # In Linux/macOS we need the conda-forge channel to install their pinned versions
-      - name: Install the Khiops Conda package (Linux/macOS)
-        if: runner.os != 'Windows'
-        run: |
-          conda install --channel conda-forge --channel khiops-dev khiops-core=$KHIOPS_CORE_VERSION
           conda install --channel ./khiops-conda/ khiops
       - name: Test Khiops Installation Status
         run: kh-status
@@ -135,10 +127,10 @@ jobs:
           # See the upload-artifact step in the build job for the explanation of this pattern
           name: khiops-conda
           path: ./khiops-conda
-      - name: Install Miniconda
+      - name: Install Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniconda-version: latest
+          miniforge-version: latest
           python-version: '3.12'
       - name: Install Requirement Packages
         run: conda install -y anaconda-client conda-index

.github/workflows/dev-docker.yml

@@ -1,7 +1,8 @@
 ---
 name: Dev Docker
 env:
-  DEFAULT_KHIOPS_REVISION: 10.2.2
+  DEFAULT_KHIOPS_REVISION: 10.2.3
+  DEFAULT_IMAGE_INCREMENT: 0
   DEFAULT_SERVER_REVISION: main
   DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12
 on:
@@ -11,20 +12,28 @@ on:
     inputs:
       khiops-revision:
         type: string
-        default: main
+        default: 10.2.3
         description: Khiops Revision
-      server-revision:
-        type: string
-        default: main
-        description: Khiops Server Revision
+      image-increment:
+        type: number
+        default: 0
+        description: Image Tag Increment
       push:
         type: boolean
-        default: true
+        default: false
         description: Push to GH Registry
+      set-latest:
+        type: boolean
+        default: false
+        description: Set as 'latest'
       python-versions:
         type: string
         default: 3.8 3.9 3.10 3.11 3.12
-        description: Python versions supported by khiops-python
+        description: Python versions to support
+      server-revision:
+        type: string
+        default: main
+        description: Khiops Server Revision
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -39,12 +48,13 @@ jobs:
       packages: write  # to write in the Github package registry
     steps:
       - name: Set input parameters as env or output
-        id: set-parameters
         run: |
           set -x
           echo "KHIOPS_REVISION=${{ inputs.khiops-revision || env.DEFAULT_KHIOPS_REVISION }}" >> "$GITHUB_ENV"
+          echo "IMAGE_INCREMENT=${{ inputs.image-increment || env.DEFAULT_IMAGE_INCREMENT }}" >> "$GITHUB_ENV"
           echo "KHIOPSDEV_OS_CODENAME=$(echo '${{ matrix.khiopsdev-os }}' | tr -d '0-9.')" >> "$GITHUB_ENV"
           echo "SERVER_REVISION=${{ inputs.server-revision || env.DEFAULT_SERVER_REVISION }}" >> "$GITHUB_ENV"
+          echo "IMAGE_URL=ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.khiopsdev-os }}" >> "$GITHUB_ENV"
       - name: Checkout khiops-python sources
         uses: actions/checkout@v4
       - name: Set up Docker Buildx
@@ -56,6 +66,18 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up the Docker Image Tags
+        run: |
+          set -x
+          # Set latest only if requested and on "dev" or "main" branch
+          if [[ "${{ inputs.set-latest }}" == "true" &&
+                ("$GITHUB_REF_NAME" == "dev" || "$GITHUB_REF_NAME" == "main") ]]
+          then
+            DOCKER_IMAGE_TAGS="$IMAGE_URL:latest,$IMAGE_URL:$KHIOPS_REVISION.$IMAGE_INCREMENT"
+          else
+            DOCKER_IMAGE_TAGS="$IMAGE_URL:$KHIOPS_REVISION.$IMAGE_INCREMENT"
+          fi
+          echo "DOCKER_IMAGE_TAGS=$DOCKER_IMAGE_TAGS" >> "$GITHUB_ENV"
       - name: Build image and push it to GitHub Container Registry
         uses: docker/build-push-action@v5
         with:
@@ -66,24 +88,8 @@ jobs:
             "KHIOPSDEV_OS=${{ matrix.khiopsdev-os }}"
             "SERVER_REVISION=${{ env.SERVER_REVISION }}"
             "PYTHON_VERSIONS=${{ inputs.python-versions || env.DEFAULT_PYTHON_VERSIONS }}"
-          tags: ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.khiopsdev-os }}:latest
+          tags: ${{ env.DOCKER_IMAGE_TAGS }}
           # Push only on manual request
           push: ${{ inputs.push || false }}
       - name: Display the image digest
         run: echo ${{ steps.docker-build.outputs.digest }}
-  test:
-    # Test only when manually pushed an requested
-    if: ${{ inputs.push || false }}
-    needs: build-push
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        khiopsdev-os: [ubuntu22.04, rocky8, rocky9]
-    container:
-      image: ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.khiopsdev-os }}:latest
-    steps:
-      - name: Check Khiops executables
-        run: |-
-          khiops -v
-          khiops_coclustering -v

.github/workflows/pip.yml

@@ -8,6 +8,9 @@ on:
       samples-revision:
         default: main
         description: khiops-samples repo revision
+      image-tag:
+        default: 10.2.3.0
+        description: Development Docker Image Tag
   pull_request:
   push:
     tags: ['*']
@@ -49,7 +52,11 @@ jobs:
       matrix:
         container: [ubuntu22.04, rocky9]
     container:
-      image: ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:latest
+      # 'latest' default image tag cannot be set as an environment variable,
+      # because the `env` context is only accessible at the step level;
+      # hence, it is hard-coded
+      image: |-
+        ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.2.3.0' }}
     steps:
       - name: Set parameters as env
         run: |
@@ -77,7 +84,6 @@ jobs:
           rmaps_base_oversubscribe: true
           # Oversubscribe for MPI > 4.x
           OMPI_MCA_rmaps_base_oversubscribe: true
-          PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe
         run: |-
           # Make sure MPI support is not loaded through env modules
           # Note: As the Docker container's shell is non-interactive, environment
@@ -93,11 +99,8 @@ jobs:
           kh-samples sklearn -i khiops_classifier -e
 
           # Test that the line containing "MPI command" also contains
-          # an executable name under a /bin directory
-          # Note: this executable name can be different, depending on the MPI
-          # backend and OS; for instance, "orterun" for OpenMPI on Ubuntu Linux, but
-          # "mpiexec" for OpenMPI on Rocky Linux
-          kh-status | grep "MPI command" | grep -Ewq "(/.+?)/bin/.+"
+          # an executable named "mpiexec"
+          kh-status | grep "MPI command" | grep -wq "mpiexec"
   release:
     if: github.ref_type == 'tag'
     needs: [build, test]