Skip to content

Commit aea7cbf

Browse files
committed
use llvm-openmp on Windows
1 parent 504e68e commit aea7cbf

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

.github/workflows/conda-package-cf.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,6 @@ jobs:
357357
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
358358
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
359359
360-
# add intel-openmp as an explicit dependency
361-
# to avoid it being missed when package version is specified exactly
362360
- name: Install mkl_umath
363361
shell: cmd /C CALL {0}
364362
run: |
@@ -371,9 +369,7 @@ jobs:
371369
SET PACKAGE_VERSION=%%F
372370
)
373371
SET "TEST_DEPENDENCIES=pytest pytest-cov"
374-
SET "WORKAROUND_DEPENDENCIES=intel-openmp"
375-
SET "DEPENDENCIES=%TEST_DEPENDENCIES% %WORKAROUND_DEPENDENCIES%"
376-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
372+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
377373
378374
- name: Report content of test environment
379375
shell: cmd /C CALL {0}

conda-recipe-cf/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ requirements:
3333
- numpy # [not win]
3434
- numpy <2.4 # [win]
3535
# TODO: remove win numpy pin when numpy 2.5 is released, see https://github.com/numpy/numpy/issues/31337
36-
- llvm-openmp # [linux]
36+
- llvm-openmp
3737
run:
3838
- python
3939
- python-gil # [py>=314]

0 commit comments

Comments
 (0)