Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the flang >= 11 pinning on windows, pin same as conda-forge #220

Closed
wants to merge 1 commit into from
Closed

Remove the flang >= 11 pinning on windows, pin same as conda-forge #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/set-conda-test-matrix.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading