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

bnavigator · bnavigator · commit 36192b3fc7cf · 2023-10-19T14:53:27.000+02:00
diff --git a/.github/conda-env/build-env.yml b/.github/conda-env/build-env.yml
@@ -1,4 +1,4 @@
 name: build-env
 dependencies:
-  - boa
+  - conda-build
   - numpy !=1.23.0
diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py
@@ -14,7 +14,7 @@
 
 combinations = {'ubuntu': blas_implementations,
                 'macos': blas_implementations,
-                'windows': ['unset', 'Intel10_64lp'],
+                'windows': ['unset', 'Intel10_64lp', 'OpenBLAS'],
                }
 
 conda_jobs = []
diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml
@@ -57,8 +57,8 @@ jobs:
               - 'ubuntu'
               - 'macos'
             python:
-              - '3.8'
-              - '3.11'
+              - '3.10'
+              - '3.12'
             bla_vendor: [ 'unset' ]
             include:
               - os: 'ubuntu'
@@ -168,7 +168,7 @@ jobs:
         run: |
           set -e
           numpyversion=$(python -c 'import numpy; print(numpy.version.version)')
-          conda mambabuild --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
+          conda build --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
           # preserve directory structure for custom conda channel
           find "${CONDA_PREFIX}/conda-bld" -maxdepth 2 -name 'slycot*.tar.bz2' | while read -r conda_pkg; do
             conda_platform=$(basename $(dirname "${conda_pkg}"))
diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
@@ -1,3 +1,4 @@
+set FC=%BUILD_PREFIX%\Library\bin\flang.exe
 set BLAS_ROOT=%PREFIX%
 set LAPACK_ROOT=%PREFIX%
 
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -15,14 +15,13 @@ requirements:
     - {{ compiler('c') }}
     - cmake >=3.14
     - make  # [linux]
-    - flang >=11  # [win]
+    # 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
@@ -36,7 +35,8 @@ requirements:
   run:
     - python {{ PY_VER }}
     - {{ pin_compatible('numpy') }}
-    - libflang  # [win]
+    # see above
+    - libflang >=5.0.0,<6.0.0.a0  # [win]
 
 test:
   requires:

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`combinations = {'ubuntu': blas_implementations,`
`16`	`16`	`'macos': blas_implementations,`
`17`		`- 'windows': ['unset', 'Intel10_64lp'],`
	`17`	`+ 'windows': ['unset', 'Intel10_64lp', 'OpenBLAS'],`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`conda_jobs = []`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+set FC=%BUILD_PREFIX%\Library\bin\flang.exe`
`1`	`2`	`set BLAS_ROOT=%PREFIX%`
`2`	`3`	`set LAPACK_ROOT=%PREFIX%`
`3`	`4`