Rebuild for mkl 2026

.ci_support/migrations/mkl2026.yaml

@@ -0,0 +1,12 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for mkl 2026
+  kind: version
+  migration_number: 1
+migrator_ts: 1778116656.760406
+mkl:
+- '2026'  # [not osx]
+- '2023'  # [osx]
+mkl_devel:
+- '2026'  # [not osx]
+- '2023'  # [osx]

.github/workflows/conda-build.yml

@@ -28,18 +28,27 @@ jobs:
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            tools_install_dir: ~/miniforge3
+            build_workspace_dir: build_artifacts
+            docker_run_args: 
           - CONFIG: linux_64_is_intelfalserunner_variantgnuwith_mpifalse
             STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            tools_install_dir: ~/miniforge3
+            build_workspace_dir: build_artifacts
+            docker_run_args: 
           - CONFIG: linux_64_is_inteltruerunner_variantintelwith_mpifalse
             STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            tools_install_dir: ~/miniforge3
+            build_workspace_dir: build_artifacts
+            docker_run_args: 
     steps:
 
     - name: Checkout code
@@ -49,11 +58,13 @@ jobs:
       id: build-linux
       if: matrix.os == 'ubuntu'
       env:
+        MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
+        CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
         CONFIG: ${{ matrix.CONFIG }}
         UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
         DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
         CI: github_actions
-        CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
+        CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}"
         BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
         FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
         STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
@@ -73,13 +84,17 @@ jobs:
         else
           export IS_PR_BUILD="False"
         fi
+        export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
+        export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
         echo "::endgroup::"
         ./.scripts/run_docker_build.sh
 
     - name: Build on macOS
       id: build-macos
       if: matrix.os == 'macos'
       env:
+        MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
+        CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
         CONFIG: ${{ matrix.CONFIG }}
         UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
         CI: github_actions
@@ -98,6 +113,8 @@ jobs:
         else
           export IS_PR_BUILD="False"
         fi
+        export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
+        export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
         ./.scripts/run_osx_build.sh
 
     - name: Build on windows
@@ -110,10 +127,8 @@ jobs:
         set "sha=%GITHUB_SHA%"
         call ".scripts\run_win_build.bat"
       env:
-        # default value; make it explicit, as it needs to match with artefact
-        # generation below. Not configurable for now, can be revisited later
-        CONDA_BLD_PATH: C:\bld
-        MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
+        MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
+        CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
         PYTHONUNBUFFERED: 1
         CONFIG: ${{ matrix.CONFIG }}
         CI: github_actions

recipe/recipe.yaml

@@ -1,10 +1,8 @@
-
 schema_version: 1
 
 context:
   name: runner
   version: "2.0.0_20260512"
-  intel_version: "2026.0.0"
 
 package:
   name: "runner"
@@ -17,7 +15,7 @@ source:
   sha256: c362553ae2aaaac7acea89ae2d3cf5a210fc0992943a9b39ad43d27208e420df
 
 build:
-  number: 0
+  number: 1
   string: "${{ runner_variant }}_h${{ hash }}_${{ build_number }}"
   skip: not (linux or osx) or (is_intel and osx)
 
@@ -28,8 +26,8 @@ requirements:
     - m4
     - if: is_intel
       then:
-        - ifx_linux-64 ==${{ intel_version }}
-        - dpcpp_linux-64 ==${{ intel_version }}
+        - ifx_linux-64
+        - dpcpp_linux-64
       else:
         - ${{ compiler('c') }}
         - ${{ stdlib('c') }}
@@ -38,19 +36,19 @@ requirements:
   host:
     - if: is_intel
       then:
-        - mkl ==${{ intel_version }}
-        - mkl-include ==${{ intel_version }}
-        - mkl-devel ==${{ intel_version }}
-        - mkl-static ==${{ intel_version }}
-        - intel-cmplr-lib-rt ==${{ intel_version }}
+        - mkl
+        - mkl-include
+        - mkl-devel
+        - mkl-static
+        - intel-cmplr-lib-rt
       else:
         - libblas
         - liblapack
         - fftw
     # OpenMP libraries for GNU differ between Linux and OSX.
     - if: not is_intel and linux
       then:
-      - libgomp
+        - libgomp
     - if: not is_intel and osx
       then:
         - llvm-openmp
@@ -65,17 +63,17 @@ requirements:
   run:
     - if: is_intel
       then:
-        - mkl ==${{ intel_version }}
-        - intel-fortran-rt ==${{ intel_version }}
-        - intel-cmplr-lib-rt ==${{ intel_version }}
+        - mkl
+        - intel-fortran-rt
+        - intel-cmplr-lib-rt
       else:
         - libblas
         - liblapack
         - fftw
     # OpenMP libraries for GNU differ between Linux and OSX.
     - if: not is_intel and linux
       then:
-      - libgomp
+        - libgomp
     - if: not is_intel and osx
       then:
         - llvm-openmp
@@ -89,17 +87,17 @@ requirements:
 
 tests:
   - script:
-    - if: with_mpi
-      then:
-        - RuNNer_mpi.x --version
-      else:
-        - RuNNer.x --version
-    - if: is_intel and not with_mpi
-      then:
-        - ldd $(which RuNNer.x) | grep -i mkl
-    - if: is_intel and with_mpi
-      then:
-        - ldd $(which RuNNer_mpi.x) | grep -i mkl
+      - if: with_mpi
+        then:
+          - RuNNer_mpi.x --version
+        else:
+          - RuNNer.x --version
+      - if: is_intel and not with_mpi
+        then:
+          - ldd $(which RuNNer.x) | grep -i mkl
+      - if: is_intel and with_mpi
+        then:
+          - ldd $(which RuNNer_mpi.x) | grep -i mkl
 
 about:
   homepage: https://www.theochem2.ruhr-uni-bochum.de/tc/software/runner.html.en