Skip to content

Commit

Permalink
Remove the flang >= 11 pinning on windows, pin same as conda-forge
Browse files Browse the repository at this point in the history
Aks for netlib devel headers explicitly
  • Loading branch information
bnavigator committed Oct 19, 2023
1 parent 9485d94 commit 38c2f56
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/set-conda-test-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

combinations = {'ubuntu': blas_implementations,
'macos': blas_implementations,
'windows': ['unset', 'Intel10_64lp'],
'windows': ['unset', 'Intel10_64lp', 'OpenBLAS'],
}

conda_jobs = []
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slycot-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- 'ubuntu'
- 'macos'
python:
- '3.8'
- '3.10'
- '3.11'
bla_vendor: [ 'unset' ]
include:
Expand Down
1 change: 1 addition & 0 deletions conda-recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
set FC=%BUILD_PREFIX%\Library\bin\flang.exe
set BLAS_ROOT=%PREFIX%
set LAPACK_ROOT=%PREFIX%

Expand Down
12 changes: 7 additions & 5 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ requirements:
- {{ compiler('c') }}
- cmake >=3.14
- make # [linux]
- flang >=11 # [win]
# Always build against NETLIB ('Generic') LAPACK/Blas
- blas-devel * *netlib
# https://github.com/conda-forge/blas-feedstock/issues/106, conda-forge pins it themselves
- flang >=5.0.0,<6.0.0.a0 # [win]

host:
# Always build against NETLIB ('Generic') LAPACK/Blas
# https://conda-forge.org/docs/maintainer/knowledge_base.html#blas
# deviating from above link: we have to specifiy netlib variant, because
# the mkl variant selected by default for older pythons on windows
# does not provide the generic headers
# deviating from above link: we have to pin ourselves, because we do not have the conda-forge build setups
- libblas * *netlib
- libcblas * *netlib
- liblapack * *netlib
Expand All @@ -36,7 +37,8 @@ requirements:
run:
- python {{ PY_VER }}
- {{ pin_compatible('numpy') }}
- libflang # [win]
# see above
- libflang >=5.0.0,<6.0.0.a0 # [win]

test:
requires:
Expand Down

0 comments on commit 38c2f56

Please sign in to comment.