Skip to content

Commit 98d2c4b

Browse files
committed
update recipe to use numpy-base and relax mkl-devel condition
1 parent 999e7ce commit 98d2c4b

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/workflows/conda-package.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,13 @@ jobs:
140140
- name: Install mkl_fft
141141
run: |
142142
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
143-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest "scipy>=1.10" $CHANNELS
143+
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest $CHANNELS
144+
if [[ "${{ matrix.python }}" != 3.9* ]]; then
145+
# Intel channel only has scipy=1.10 for Python 3.9, which needs mkl<2025
146+
# while scipy needs to install numpy and mkl_random and mkl_random-1.2.11 requires mkl>=2025
147+
# so avoid installing scipy for Python 3.9 which means third_party/scipy tests will not run
148+
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
149+
fi
144150
# Test installed packages
145151
conda list -n ${{ env.TEST_ENV_NAME }}
146152
@@ -307,8 +313,11 @@ jobs:
307313
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
308314
SET PACKAGE_VERSION=%%F
309315
)
310-
SET "TEST_DEPENDENCIES=pytest scipy"
316+
SET "TEST_DEPENDENCIES=pytest"
311317
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
318+
if ("${{ matrix.python }}" -ne "3.9") {
319+
conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
320+
}
312321
313322
- name: Report content of test environment
314323
shell: cmd /C CALL {0}

conda-recipe/meta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ requirements:
2020
- python
2121
- setuptools >=77
2222
- mkl-devel
23-
- mkl-devel 2024.2.* # [py==39]
2423
- cython
2524
- numpy-base
2625
run:
2726
- python
2827
- mkl-service
29-
- {{ pin_compatible('numpy') }}
28+
- {{ pin_compatible('numpy-base') }}
3029

3130
test:
3231
commands:

0 commit comments

Comments
 (0)