Skip to content

Commit 65ff690

Browse files
bnavigatorbnavigator
committed
merge recipes into one. Enable windows
1 parent 4fb9070 commit 65ff690

File tree

10 files changed

+29
-195
lines changed

10 files changed

+29
-195
lines changed

‎.github/workflows/test.yml‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,31 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
#os: ["ubuntu-latest", "windows-latest", "macos-latest"]
16-
os: [ 'ubuntu-latest', 'macos-latest' ]
15+
os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
1716
python: [ '3.8', '3.9' ]
1817
distribution: [ 'pip', 'conda' ]
1918
bla_vendor: [ 'Generic', 'OpenBLAS' ]
19+
exclude:
20+
- os: 'windows-latest'
21+
distribution: 'pip'
2022
include:
21-
- os: ubuntu-latest
23+
- os: 'ubuntu-latest'
2224
python: '3.6'
23-
distribution: conda
25+
distribution: 'conda'
2426
bla_vendor: 'Generic'
25-
- os: ubuntu-latest
27+
- os: "ubuntu-latest"
2628
python: '3.7'
27-
distribution: conda
29+
distribution: 'conda'
2830
bla_vendor: 'Generic'
29-
- os: "macos-latest"
31+
- os: "ubuntu-latest"
32+
python: '3.9'
33+
distribution: 'conda'
34+
bla_vendor: 'Intel10_64lp'
35+
- os: 'macos-latest'
3036
python: '3.9'
3137
distribution: conda
3238
bla_vendor: "Apple"
33-
- os: "macos-latest"
39+
- os: 'macos-latest'
3440
python: '3.9'
3541
distribution: pip
3642
bla_vendor: "Apple"
@@ -101,21 +107,10 @@ jobs:
101107
if: matrix.distribution == 'conda'
102108
run: |
103109
set -xe
104-
case ${{ matrix.bla_vendor }} in
105-
Generic) conda_recipe=conda-recipe-generic ;;
106-
OpenBLAS) conda_recipe=conda-recipe-openblas ;;
107-
Intel10_64lp) conda_recipe=conda-recipe-mkl ;;
108-
Apple)
109-
conda_recipe=conda-recipe-apple
110-
;;
111-
*)
112-
echo "bla_vendor option ${{ matrix.bla_vendor }} not supported"
113-
exit 1 ;;
114-
esac
115110
conda info -a
116111
conda list
117112
numpyversion=$(python -c 'import numpy; print(numpy.version.version)')
118-
conda-build --python "${{ matrix.python }}" --numpy $numpyversion $conda_recipe
113+
conda-build --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
119114
slycot_pkg=$(find $CONDA_PREFIX -name 'slycot*.tar.bz2')
120115
conda install --use-local $slycot_pkg
121116
- name: PIP build and install

‎conda-recipe-apple/meta.yaml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎conda-recipe-generic/build.sh‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎conda-recipe-mkl/build.sh‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎conda-recipe-mkl/meta.yaml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎conda-recipe-openblas/build.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎conda-recipe-openblas/meta.yaml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

conda-recipe-generic/bld.bat renamed to conda-recipe/bld.bat

File renamed without changes.

conda-recipe-apple/build.sh renamed to conda-recipe/build.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cd $RECIPE_DIR/..
2-
31
# ensure we are not building with old cmake files
42
rm -rf _skbuild
53
rm -rf _cmake_test_compile
@@ -8,9 +6,8 @@ export LDFLAGS="$LDFLAGS -v"
86
if [[ "$target_platform" == osx-64 ]]; then
97
export LDFLAGS="${LDFLAGS} -isysroot ${CONDA_BUILD_SYSROOT}"
108
export CFLAGS="${CFLAGS} -isysroot ${CONDA_BUILD_SYSROOT}"
9+
export CMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT}
1110
fi
1211

1312
$PYTHON setup.py build_ext install -- \
14-
-DNumPy_INCLUDE_DIR=${SP_DIR}/numpy/core/include \
15-
-DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT} \
16-
-DBLA_VENDOR=Apple
13+
-DNumPy_INCLUDE_DIR=${SP_DIR}/numpy/core/include

conda-recipe-generic/meta.yaml renamed to conda-recipe/meta.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,30 @@ source:
77

88
build:
99
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
10-
string: py{{ environ.get('PY_VER').replace('.', '') }}{{ environ.get('GIT_DESCRIBE_HASH', '') }}_obl_{{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
10+
string: py{{ environ.get('PY_VER').replace('.', '') }}{{ environ.get('GIT_DESCRIBE_HASH', '') }}_{{ environ.get('BLA_VENDOR', "Generic") }}_{{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
1111

1212
requirements:
13-
# this recipe is intended to be in sync with the conda-forge feedstock at
14-
# https://github.com/conda-forge/slycot-feedstock
1513
build:
1614
- {{ compiler('fortran') }}
1715
- {{ compiler('c') }}
16+
- cmake
17+
- flang # [win]
18+
1819
host:
19-
- libblas
20-
- libcblas
21-
- liblapack
20+
- libblas # [ {{ environ.get('BLA_VENDOR', 'Generic'}} == 'Generic' ]
21+
- libcblas # [ {{ environ.get('BLA_VENDOR', 'Generic'}} == 'Generic' ]
22+
- liblapack # [ {{ environ.get('BLA_VENDOR', 'Generic'}} == 'Generic' ]
23+
- libopenblas # [ {{ BLA_VENDOR }} == 'OpenBLAS' ]
24+
- openblas # [ {{ BLA_VENDOR }} == 'OpenBLAS' ]
25+
- mkl # [ {{ BLA_VENDOR }} == 'Intel10_64lp' ]
2226
- python
2327
- numpy
24-
# conda-forge::scikit-build>=0.10.0 includes MACOSX_DEPLOYMENT_TARGET
25-
# patches from https://github.com/scikit-build/scikit-build/pull/441
2628
- scikit-build >=0.10.0
2729
run:
2830
- python {{ PY_VER }}
2931
- {{ pin_compatible('numpy') }}
32+
- libopenblas # [ {{ BLA_VENDOR }} == 'OpenBLAS' ]
33+
- mkl # [ {{ BLA_VENDOR }} == 'Intel10_64lp' ]
3034

3135
test:
3236
requires:

0 commit comments

Comments
 (0)