From d60084e28ac214f52c687ae616ae632b6d0c6fac Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 28 Mar 2020 13:40:13 +0100 Subject: [PATCH 1/7] blas variants for windows --- recipe/bld.bat | 15 ++++++++++++++- recipe/meta.yaml | 10 ++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 91f0c1f..dcbdb0f 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,14 +1,27 @@ set CVXOPT_MSVC=1 +:: the cvxopt builder for suitesparse looks for static ".lib" libraries (not ".dll"!) set "CVXOPT_BLAS_LIB_DIR=%LIBRARY_PREFIX%\lib" if "%blas_impl%" == "mkl" ( set CVXOPT_BLAS_LIB=mkl_rt set CVXOPT_LAPACK_LIB=mkl_rt ) if "%blas_impl%" == "openblas" ( + :: see "openblas" output for windows here: + :: https://github.com/conda-forge/openblas-feedstock/blob/master/recipe/meta.yaml set CVXOPT_BLAS_LIB=openblas - set CVXOPT_LAPACK_LIB=openblas + :: see "blas" output for windows here: + :: https://github.com/conda-forge/lapack-feedstock/blob/master/recipe/meta.yaml + :: will be split on ';', see https://github.com/cvxopt/cvxopt/blob/master/setup.py + set CVXOPT_LAPACK_LIB=lapack +) +if "%blas_impl%" == "blis" ( + :: see output for windows here: + :: https://github.com/conda-forge/blis-feedstock/blob/master/recipe/meta.yaml + set CVXOPT_BLAS_LIB=blis + :: same as above for openblas + set CVXOPT_LAPACK_LIB=lapack ) set CVXOPT_BUILD_GSL=1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 97c8a55..9d4126d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,8 +16,7 @@ source: build: skip: true # [py<35] - skip: true # [win and blas_impl != 'mkl'] - number: 203 + number: 204 requirements: build: @@ -29,12 +28,15 @@ requirements: - setuptools - gsl - fftw - - blas - - mkl-devel {{ mkl }} # [win and blas_impl == "mkl"] - dsdp - glpk # suitesparse is linked against on windows, and compiled-in on windows, because yeah, windows. - suitesparse # [not win] + # headers needed to compile suitesparse ("blas-devel" should do the same as the + # following - without blas_impl-selectors - but apparently this does not work) + - mkl-devel {{ mkl }} # [win and blas_impl == "mkl"] + - openblas # [win and blas_impl == "openblas"] + - blis # [win and blas_impl == "blis"] run: - python From edb9e3594eda17b46c022e8aeeeb0068b8ac5a7a Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Sat, 28 Mar 2020 12:44:53 +0000 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 3.19.1, conda-smithy 3.6.15, and conda-forge-pinning 2020.03.24 --- .azure-pipelines/azure-pipelines-win.yml | 24 +++++++++++ ...in_blas_implblispython3.6.____cpython.yaml | 38 +++++++++++++++++ ...in_blas_implblispython3.7.____cpython.yaml | 38 +++++++++++++++++ ...in_blas_implblispython3.8.____cpython.yaml | 38 +++++++++++++++++ ...win_blas_implmklpython3.6.____cpython.yaml | 4 ++ ...win_blas_implmklpython3.7.____cpython.yaml | 4 ++ ...win_blas_implmklpython3.8.____cpython.yaml | 4 ++ ...las_implopenblaspython3.6.____cpython.yaml | 38 +++++++++++++++++ ...las_implopenblaspython3.7.____cpython.yaml | 38 +++++++++++++++++ ...las_implopenblaspython3.8.____cpython.yaml | 38 +++++++++++++++++ README.md | 42 +++++++++++++++++++ 11 files changed, 306 insertions(+) create mode 100644 .ci_support/win_blas_implblispython3.6.____cpython.yaml create mode 100644 .ci_support/win_blas_implblispython3.7.____cpython.yaml create mode 100644 .ci_support/win_blas_implblispython3.8.____cpython.yaml create mode 100644 .ci_support/win_blas_implopenblaspython3.6.____cpython.yaml create mode 100644 .ci_support/win_blas_implopenblaspython3.7.____cpython.yaml create mode 100644 .ci_support/win_blas_implopenblaspython3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a1492e4..405ce5a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -10,6 +10,18 @@ jobs: strategy: maxParallel: 4 matrix: + win_blas_implblispython3.6.____cpython: + CONFIG: win_blas_implblispython3.6.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implblispython3.7.____cpython: + CONFIG: win_blas_implblispython3.7.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implblispython3.8.____cpython: + CONFIG: win_blas_implblispython3.8.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True win_blas_implmklpython3.6.____cpython: CONFIG: win_blas_implmklpython3.6.____cpython CONDA_BLD_PATH: D:\\bld\\ @@ -22,6 +34,18 @@ jobs: CONFIG: win_blas_implmklpython3.8.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True + win_blas_implopenblaspython3.6.____cpython: + CONFIG: win_blas_implopenblaspython3.6.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implopenblaspython3.7.____cpython: + CONFIG: win_blas_implopenblaspython3.7.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True + win_blas_implopenblaspython3.8.____cpython: + CONFIG: win_blas_implopenblaspython3.8.____cpython + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? - script: | diff --git a/.ci_support/win_blas_implblispython3.6.____cpython.yaml b/.ci_support/win_blas_implblispython3.6.____cpython.yaml new file mode 100644 index 0000000..78ba2eb --- /dev/null +++ b/.ci_support/win_blas_implblispython3.6.____cpython.yaml @@ -0,0 +1,38 @@ +blas_impl: +- blis +c_compiler: +- vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +fftw: +- '3' +glpk: +- '4.65' +gsl: +- '2.6' +libblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +mkl: +- '2019' +openblas: +- 0.3.6 +pin_run_as_build: + fftw: + max_pin: x + glpk: + max_pin: x.x + mkl: + max_pin: x + openblas: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +suitesparse: +- '5.6' diff --git a/.ci_support/win_blas_implblispython3.7.____cpython.yaml b/.ci_support/win_blas_implblispython3.7.____cpython.yaml new file mode 100644 index 0000000..0f8b8bb --- /dev/null +++ b/.ci_support/win_blas_implblispython3.7.____cpython.yaml @@ -0,0 +1,38 @@ +blas_impl: +- blis +c_compiler: +- vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +fftw: +- '3' +glpk: +- '4.65' +gsl: +- '2.6' +libblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +mkl: +- '2019' +openblas: +- 0.3.6 +pin_run_as_build: + fftw: + max_pin: x + glpk: + max_pin: x.x + mkl: + max_pin: x + openblas: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_cpython +suitesparse: +- '5.6' diff --git a/.ci_support/win_blas_implblispython3.8.____cpython.yaml b/.ci_support/win_blas_implblispython3.8.____cpython.yaml new file mode 100644 index 0000000..a32746e --- /dev/null +++ b/.ci_support/win_blas_implblispython3.8.____cpython.yaml @@ -0,0 +1,38 @@ +blas_impl: +- blis +c_compiler: +- vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +fftw: +- '3' +glpk: +- '4.65' +gsl: +- '2.6' +libblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +mkl: +- '2019' +openblas: +- 0.3.6 +pin_run_as_build: + fftw: + max_pin: x + glpk: + max_pin: x.x + mkl: + max_pin: x + openblas: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +suitesparse: +- '5.6' diff --git a/.ci_support/win_blas_implmklpython3.6.____cpython.yaml b/.ci_support/win_blas_implmklpython3.6.____cpython.yaml index 0b0bb62..fc77725 100644 --- a/.ci_support/win_blas_implmklpython3.6.____cpython.yaml +++ b/.ci_support/win_blas_implmklpython3.6.____cpython.yaml @@ -18,6 +18,8 @@ liblapack: - 3.8.0 *netlib mkl: - '2019' +openblas: +- 0.3.6 pin_run_as_build: fftw: max_pin: x @@ -25,6 +27,8 @@ pin_run_as_build: max_pin: x.x mkl: max_pin: x + openblas: + max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/win_blas_implmklpython3.7.____cpython.yaml b/.ci_support/win_blas_implmklpython3.7.____cpython.yaml index fe5f942..a99c763 100644 --- a/.ci_support/win_blas_implmklpython3.7.____cpython.yaml +++ b/.ci_support/win_blas_implmklpython3.7.____cpython.yaml @@ -18,6 +18,8 @@ liblapack: - 3.8.0 *netlib mkl: - '2019' +openblas: +- 0.3.6 pin_run_as_build: fftw: max_pin: x @@ -25,6 +27,8 @@ pin_run_as_build: max_pin: x.x mkl: max_pin: x + openblas: + max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/win_blas_implmklpython3.8.____cpython.yaml b/.ci_support/win_blas_implmklpython3.8.____cpython.yaml index c79b46a..09b4faf 100644 --- a/.ci_support/win_blas_implmklpython3.8.____cpython.yaml +++ b/.ci_support/win_blas_implmklpython3.8.____cpython.yaml @@ -18,6 +18,8 @@ liblapack: - 3.8.0 *netlib mkl: - '2019' +openblas: +- 0.3.6 pin_run_as_build: fftw: max_pin: x @@ -25,6 +27,8 @@ pin_run_as_build: max_pin: x.x mkl: max_pin: x + openblas: + max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml new file mode 100644 index 0000000..11194bb --- /dev/null +++ b/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml @@ -0,0 +1,38 @@ +blas_impl: +- openblas +c_compiler: +- vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +fftw: +- '3' +glpk: +- '4.65' +gsl: +- '2.6' +libblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +mkl: +- '2019' +openblas: +- 0.3.6 +pin_run_as_build: + fftw: + max_pin: x + glpk: + max_pin: x.x + mkl: + max_pin: x + openblas: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +suitesparse: +- '5.6' diff --git a/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml new file mode 100644 index 0000000..5c88c61 --- /dev/null +++ b/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml @@ -0,0 +1,38 @@ +blas_impl: +- openblas +c_compiler: +- vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +fftw: +- '3' +glpk: +- '4.65' +gsl: +- '2.6' +libblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +mkl: +- '2019' +openblas: +- 0.3.6 +pin_run_as_build: + fftw: + max_pin: x + glpk: + max_pin: x.x + mkl: + max_pin: x + openblas: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_cpython +suitesparse: +- '5.6' diff --git a/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml new file mode 100644 index 0000000..b87050e --- /dev/null +++ b/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml @@ -0,0 +1,38 @@ +blas_impl: +- openblas +c_compiler: +- vs2015 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +fftw: +- '3' +glpk: +- '4.65' +gsl: +- '2.6' +libblas: +- 3.8 *netlib +liblapack: +- 3.8.0 *netlib +mkl: +- '2019' +openblas: +- 0.3.6 +pin_run_as_build: + fftw: + max_pin: x + glpk: + max_pin: x.x + mkl: + max_pin: x + openblas: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +suitesparse: +- '5.6' diff --git a/README.md b/README.md index de026d3..1640647 100644 --- a/README.md +++ b/README.md @@ -210,6 +210,27 @@ Current build status variant + + win_blas_implblispython3.6.____cpython + + + variant + + + + win_blas_implblispython3.7.____cpython + + + variant + + + + win_blas_implblispython3.8.____cpython + + + variant + + win_blas_implmklpython3.6.____cpython @@ -231,6 +252,27 @@ Current build status variant + + win_blas_implopenblaspython3.6.____cpython + + + variant + + + + win_blas_implopenblaspython3.7.____cpython + + + variant + + + + win_blas_implopenblaspython3.8.____cpython + + + variant + + From cb21e66c8da4d42adcd4f1e85476227709081a13 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 28 Mar 2020 12:11:39 -0500 Subject: [PATCH 3/7] Use netlib --- recipe/meta.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d4126d..4a50664 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,12 +32,6 @@ requirements: - glpk # suitesparse is linked against on windows, and compiled-in on windows, because yeah, windows. - suitesparse # [not win] - # headers needed to compile suitesparse ("blas-devel" should do the same as the - # following - without blas_impl-selectors - but apparently this does not work) - - mkl-devel {{ mkl }} # [win and blas_impl == "mkl"] - - openblas # [win and blas_impl == "openblas"] - - blis # [win and blas_impl == "blis"] - run: - python - gsl From f7c1b6fde7d92d1b07163815b5c6d14fcf186ff3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 28 Mar 2020 12:12:19 -0500 Subject: [PATCH 4/7] Remove blas_impl --- recipe/bld.bat | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index dcbdb0f..138b0ba 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,26 +3,9 @@ set CVXOPT_MSVC=1 :: the cvxopt builder for suitesparse looks for static ".lib" libraries (not ".dll"!) set "CVXOPT_BLAS_LIB_DIR=%LIBRARY_PREFIX%\lib" -if "%blas_impl%" == "mkl" ( - set CVXOPT_BLAS_LIB=mkl_rt - set CVXOPT_LAPACK_LIB=mkl_rt -) -if "%blas_impl%" == "openblas" ( - :: see "openblas" output for windows here: - :: https://github.com/conda-forge/openblas-feedstock/blob/master/recipe/meta.yaml - set CVXOPT_BLAS_LIB=openblas - :: see "blas" output for windows here: - :: https://github.com/conda-forge/lapack-feedstock/blob/master/recipe/meta.yaml - :: will be split on ';', see https://github.com/cvxopt/cvxopt/blob/master/setup.py - set CVXOPT_LAPACK_LIB=lapack -) -if "%blas_impl%" == "blis" ( - :: see output for windows here: - :: https://github.com/conda-forge/blis-feedstock/blob/master/recipe/meta.yaml - set CVXOPT_BLAS_LIB=blis - :: same as above for openblas - set CVXOPT_LAPACK_LIB=lapack -) + +set CVXOPT_BLAS_LIB=blis +set CVXOPT_LAPACK_LIB=lapack set CVXOPT_BUILD_GSL=1 set "CVXOPT_GSL_LIB_DIR=%LIBRARY_PREFIX%\lib" From 79b4521f868cfef04f2a693ce2e52599d0cb1b10 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Sat, 28 Mar 2020 17:16:09 +0000 Subject: [PATCH 5/7] MNT: Re-rendered with conda-build 3.19.1, conda-smithy 3.6.15, and conda-forge-pinning 2020.03.28 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +--- .azure-pipelines/azure-pipelines-osx.yml | 30 +--- .azure-pipelines/azure-pipelines-win.yml | 36 +--- .../linux_aarch64_python3.6.____cpython.yaml | 2 - .../linux_aarch64_python3.7.____cpython.yaml | 2 - .../linux_aarch64_python3.8.____cpython.yaml | 2 - ...las_implopenblaspython3.6.____cpython.yaml | 34 ---- ...las_implopenblaspython3.7.____cpython.yaml | 34 ---- ...las_implopenblaspython3.8.____cpython.yaml | 34 ---- .../linux_ppc64le_python3.6.____cpython.yaml | 2 - .../linux_ppc64le_python3.7.____cpython.yaml | 2 - .../linux_ppc64le_python3.8.____cpython.yaml | 2 - ....yaml => linux_python3.6.____cpython.yaml} | 2 - ....yaml => linux_python3.7.____cpython.yaml} | 2 - ....yaml => linux_python3.8.____cpython.yaml} | 2 - ...sx_blas_implblispython3.6.____cpython.yaml | 38 ---- ...sx_blas_implblispython3.7.____cpython.yaml | 38 ---- ...sx_blas_implblispython3.8.____cpython.yaml | 38 ---- ...las_implopenblaspython3.6.____cpython.yaml | 38 ---- ...las_implopenblaspython3.7.____cpython.yaml | 38 ---- ...las_implopenblaspython3.8.____cpython.yaml | 38 ---- ...on.yaml => osx_python3.6.____cpython.yaml} | 2 - ...on.yaml => osx_python3.7.____cpython.yaml} | 2 - ...on.yaml => osx_python3.8.____cpython.yaml} | 2 - ...in_blas_implblispython3.6.____cpython.yaml | 38 ---- ...in_blas_implblispython3.7.____cpython.yaml | 38 ---- ...in_blas_implblispython3.8.____cpython.yaml | 38 ---- ...win_blas_implmklpython3.6.____cpython.yaml | 38 ---- ...win_blas_implmklpython3.7.____cpython.yaml | 38 ---- ...win_blas_implmklpython3.8.____cpython.yaml | 38 ---- ...las_implopenblaspython3.6.____cpython.yaml | 38 ---- ...las_implopenblaspython3.7.____cpython.yaml | 38 ---- ...las_implopenblaspython3.8.____cpython.yaml | 38 ---- ...on.yaml => win_python3.6.____cpython.yaml} | 8 +- ...on.yaml => win_python3.7.____cpython.yaml} | 8 +- ...on.yaml => win_python3.8.____cpython.yaml} | 8 +- README.md | 162 ++---------------- 37 files changed, 39 insertions(+), 945 deletions(-) delete mode 100644 .ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml delete mode 100644 .ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml delete mode 100644 .ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml rename .ci_support/{linux_blas_implmklpython3.6.____cpython.yaml => linux_python3.6.____cpython.yaml} (96%) rename .ci_support/{linux_blas_implmklpython3.7.____cpython.yaml => linux_python3.7.____cpython.yaml} (96%) rename .ci_support/{linux_blas_implmklpython3.8.____cpython.yaml => linux_python3.8.____cpython.yaml} (96%) delete mode 100644 .ci_support/osx_blas_implblispython3.6.____cpython.yaml delete mode 100644 .ci_support/osx_blas_implblispython3.7.____cpython.yaml delete mode 100644 .ci_support/osx_blas_implblispython3.8.____cpython.yaml delete mode 100644 .ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml delete mode 100644 .ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml delete mode 100644 .ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml rename .ci_support/{osx_blas_implmklpython3.6.____cpython.yaml => osx_python3.6.____cpython.yaml} (96%) rename .ci_support/{osx_blas_implmklpython3.7.____cpython.yaml => osx_python3.7.____cpython.yaml} (96%) rename .ci_support/{osx_blas_implmklpython3.8.____cpython.yaml => osx_python3.8.____cpython.yaml} (96%) delete mode 100644 .ci_support/win_blas_implblispython3.6.____cpython.yaml delete mode 100644 .ci_support/win_blas_implblispython3.7.____cpython.yaml delete mode 100644 .ci_support/win_blas_implblispython3.8.____cpython.yaml delete mode 100644 .ci_support/win_blas_implmklpython3.6.____cpython.yaml delete mode 100644 .ci_support/win_blas_implmklpython3.7.____cpython.yaml delete mode 100644 .ci_support/win_blas_implmklpython3.8.____cpython.yaml delete mode 100644 .ci_support/win_blas_implopenblaspython3.6.____cpython.yaml delete mode 100644 .ci_support/win_blas_implopenblaspython3.7.____cpython.yaml delete mode 100644 .ci_support/win_blas_implopenblaspython3.8.____cpython.yaml rename .ci_support/{linux_blas_implblispython3.6.____cpython.yaml => win_python3.6.____cpython.yaml} (77%) rename .ci_support/{linux_blas_implblispython3.7.____cpython.yaml => win_python3.7.____cpython.yaml} (77%) rename .ci_support/{linux_blas_implblispython3.8.____cpython.yaml => win_python3.8.____cpython.yaml} (77%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cc67b3c..a21dfd3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,40 +10,16 @@ jobs: strategy: maxParallel: 8 matrix: - linux_blas_implblispython3.6.____cpython: - CONFIG: linux_blas_implblispython3.6.____cpython + linux_python3.6.____cpython: + CONFIG: linux_python3.6.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implblispython3.7.____cpython: - CONFIG: linux_blas_implblispython3.7.____cpython + linux_python3.7.____cpython: + CONFIG: linux_python3.7.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implblispython3.8.____cpython: - CONFIG: linux_blas_implblispython3.8.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implmklpython3.6.____cpython: - CONFIG: linux_blas_implmklpython3.6.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implmklpython3.7.____cpython: - CONFIG: linux_blas_implmklpython3.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implmklpython3.8.____cpython: - CONFIG: linux_blas_implmklpython3.8.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implopenblaspython3.6.____cpython: - CONFIG: linux_blas_implopenblaspython3.6.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implopenblaspython3.7.____cpython: - CONFIG: linux_blas_implopenblaspython3.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_blas_implopenblaspython3.8.____cpython: - CONFIG: linux_blas_implopenblaspython3.8.____cpython + linux_python3.8.____cpython: + CONFIG: linux_python3.8.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 38dc563..e864659 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -10,32 +10,14 @@ jobs: strategy: maxParallel: 8 matrix: - osx_blas_implblispython3.6.____cpython: - CONFIG: osx_blas_implblispython3.6.____cpython + osx_python3.6.____cpython: + CONFIG: osx_python3.6.____cpython UPLOAD_PACKAGES: True - osx_blas_implblispython3.7.____cpython: - CONFIG: osx_blas_implblispython3.7.____cpython + osx_python3.7.____cpython: + CONFIG: osx_python3.7.____cpython UPLOAD_PACKAGES: True - osx_blas_implblispython3.8.____cpython: - CONFIG: osx_blas_implblispython3.8.____cpython - UPLOAD_PACKAGES: True - osx_blas_implmklpython3.6.____cpython: - CONFIG: osx_blas_implmklpython3.6.____cpython - UPLOAD_PACKAGES: True - osx_blas_implmklpython3.7.____cpython: - CONFIG: osx_blas_implmklpython3.7.____cpython - UPLOAD_PACKAGES: True - osx_blas_implmklpython3.8.____cpython: - CONFIG: osx_blas_implmklpython3.8.____cpython - UPLOAD_PACKAGES: True - osx_blas_implopenblaspython3.6.____cpython: - CONFIG: osx_blas_implopenblaspython3.6.____cpython - UPLOAD_PACKAGES: True - osx_blas_implopenblaspython3.7.____cpython: - CONFIG: osx_blas_implopenblaspython3.7.____cpython - UPLOAD_PACKAGES: True - osx_blas_implopenblaspython3.8.____cpython: - CONFIG: osx_blas_implopenblaspython3.8.____cpython + osx_python3.8.____cpython: + CONFIG: osx_python3.8.____cpython UPLOAD_PACKAGES: True steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 405ce5a..06d5476 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -10,40 +10,16 @@ jobs: strategy: maxParallel: 4 matrix: - win_blas_implblispython3.6.____cpython: - CONFIG: win_blas_implblispython3.6.____cpython + win_python3.6.____cpython: + CONFIG: win_python3.6.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True - win_blas_implblispython3.7.____cpython: - CONFIG: win_blas_implblispython3.7.____cpython + win_python3.7.____cpython: + CONFIG: win_python3.7.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True - win_blas_implblispython3.8.____cpython: - CONFIG: win_blas_implblispython3.8.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_blas_implmklpython3.6.____cpython: - CONFIG: win_blas_implmklpython3.6.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_blas_implmklpython3.7.____cpython: - CONFIG: win_blas_implmklpython3.7.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_blas_implmklpython3.8.____cpython: - CONFIG: win_blas_implmklpython3.8.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_blas_implopenblaspython3.6.____cpython: - CONFIG: win_blas_implopenblaspython3.6.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_blas_implopenblaspython3.7.____cpython: - CONFIG: win_blas_implopenblaspython3.7.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_blas_implopenblaspython3.8.____cpython: - CONFIG: win_blas_implopenblaspython3.8.____cpython + win_python3.8.____cpython: + CONFIG: win_python3.8.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True steps: diff --git a/.ci_support/linux_aarch64_python3.6.____cpython.yaml b/.ci_support/linux_aarch64_python3.6.____cpython.yaml index 741adbc..d61d0f1 100644 --- a/.ci_support/linux_aarch64_python3.6.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.6.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/.ci_support/linux_aarch64_python3.7.____cpython.yaml index 13f33ff..cd10148 100644 --- a/.ci_support/linux_aarch64_python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.7.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 394c7df..ea1c8a3 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml b/.ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml deleted file mode 100644 index 44bcbca..0000000 --- a/.ci_support/linux_blas_implopenblaspython3.6.____cpython.yaml +++ /dev/null @@ -1,34 +0,0 @@ -blas_impl: -- openblas -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml b/.ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml deleted file mode 100644 index d34bc6e..0000000 --- a/.ci_support/linux_blas_implopenblaspython3.7.____cpython.yaml +++ /dev/null @@ -1,34 +0,0 @@ -blas_impl: -- openblas -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml b/.ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml deleted file mode 100644 index 26cfebe..0000000 --- a/.ci_support/linux_blas_implopenblaspython3.8.____cpython.yaml +++ /dev/null @@ -1,34 +0,0 @@ -blas_impl: -- openblas -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/linux_ppc64le_python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_python3.6.____cpython.yaml index 5d54ab3..b5b188b 100644 --- a/.ci_support/linux_ppc64le_python3.6.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.6.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_python3.7.____cpython.yaml index a9b3ed7..c35d82e 100644 --- a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 0bdd7a9..7673dbd 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- openblas c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implmklpython3.6.____cpython.yaml b/.ci_support/linux_python3.6.____cpython.yaml similarity index 96% rename from .ci_support/linux_blas_implmklpython3.6.____cpython.yaml rename to .ci_support/linux_python3.6.____cpython.yaml index c75670c..c26567a 100644 --- a/.ci_support/linux_blas_implmklpython3.6.____cpython.yaml +++ b/.ci_support/linux_python3.6.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- mkl c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implmklpython3.7.____cpython.yaml b/.ci_support/linux_python3.7.____cpython.yaml similarity index 96% rename from .ci_support/linux_blas_implmklpython3.7.____cpython.yaml rename to .ci_support/linux_python3.7.____cpython.yaml index 9dd0e5f..2cb09f5 100644 --- a/.ci_support/linux_blas_implmklpython3.7.____cpython.yaml +++ b/.ci_support/linux_python3.7.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- mkl c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_blas_implmklpython3.8.____cpython.yaml b/.ci_support/linux_python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_blas_implmklpython3.8.____cpython.yaml rename to .ci_support/linux_python3.8.____cpython.yaml index 1df434f..c746260 100644 --- a/.ci_support/linux_blas_implmklpython3.8.____cpython.yaml +++ b/.ci_support/linux_python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -blas_impl: -- mkl c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/osx_blas_implblispython3.6.____cpython.yaml b/.ci_support/osx_blas_implblispython3.6.____cpython.yaml deleted file mode 100644 index 608f944..0000000 --- a/.ci_support/osx_blas_implblispython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- blis -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implblispython3.7.____cpython.yaml b/.ci_support/osx_blas_implblispython3.7.____cpython.yaml deleted file mode 100644 index 8963ab0..0000000 --- a/.ci_support/osx_blas_implblispython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- blis -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implblispython3.8.____cpython.yaml b/.ci_support/osx_blas_implblispython3.8.____cpython.yaml deleted file mode 100644 index e491c13..0000000 --- a/.ci_support/osx_blas_implblispython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- blis -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml b/.ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml deleted file mode 100644 index 4a1206d..0000000 --- a/.ci_support/osx_blas_implopenblaspython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- openblas -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml b/.ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml deleted file mode 100644 index 8e72f2d..0000000 --- a/.ci_support/osx_blas_implopenblaspython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- openblas -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml b/.ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml deleted file mode 100644 index 9f34cd4..0000000 --- a/.ci_support/osx_blas_implopenblaspython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -blas_impl: -- openblas -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/osx_blas_implmklpython3.6.____cpython.yaml b/.ci_support/osx_python3.6.____cpython.yaml similarity index 96% rename from .ci_support/osx_blas_implmklpython3.6.____cpython.yaml rename to .ci_support/osx_python3.6.____cpython.yaml index 4d7a324..337066c 100644 --- a/.ci_support/osx_blas_implmklpython3.6.____cpython.yaml +++ b/.ci_support/osx_python3.6.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -blas_impl: -- mkl c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_blas_implmklpython3.7.____cpython.yaml b/.ci_support/osx_python3.7.____cpython.yaml similarity index 96% rename from .ci_support/osx_blas_implmklpython3.7.____cpython.yaml rename to .ci_support/osx_python3.7.____cpython.yaml index 30cf1f8..71a8bc6 100644 --- a/.ci_support/osx_blas_implmklpython3.7.____cpython.yaml +++ b/.ci_support/osx_python3.7.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -blas_impl: -- mkl c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_blas_implmklpython3.8.____cpython.yaml b/.ci_support/osx_python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_blas_implmklpython3.8.____cpython.yaml rename to .ci_support/osx_python3.8.____cpython.yaml index 2cedb48..cfa7e7c 100644 --- a/.ci_support/osx_blas_implmklpython3.8.____cpython.yaml +++ b/.ci_support/osx_python3.8.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -blas_impl: -- mkl c_compiler: - clang c_compiler_version: diff --git a/.ci_support/win_blas_implblispython3.6.____cpython.yaml b/.ci_support/win_blas_implblispython3.6.____cpython.yaml deleted file mode 100644 index 78ba2eb..0000000 --- a/.ci_support/win_blas_implblispython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- blis -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implblispython3.7.____cpython.yaml b/.ci_support/win_blas_implblispython3.7.____cpython.yaml deleted file mode 100644 index 0f8b8bb..0000000 --- a/.ci_support/win_blas_implblispython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- blis -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implblispython3.8.____cpython.yaml b/.ci_support/win_blas_implblispython3.8.____cpython.yaml deleted file mode 100644 index a32746e..0000000 --- a/.ci_support/win_blas_implblispython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- blis -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implmklpython3.6.____cpython.yaml b/.ci_support/win_blas_implmklpython3.6.____cpython.yaml deleted file mode 100644 index fc77725..0000000 --- a/.ci_support/win_blas_implmklpython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implmklpython3.7.____cpython.yaml b/.ci_support/win_blas_implmklpython3.7.____cpython.yaml deleted file mode 100644 index a99c763..0000000 --- a/.ci_support/win_blas_implmklpython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implmklpython3.8.____cpython.yaml b/.ci_support/win_blas_implmklpython3.8.____cpython.yaml deleted file mode 100644 index 09b4faf..0000000 --- a/.ci_support/win_blas_implmklpython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml deleted file mode 100644 index 11194bb..0000000 --- a/.ci_support/win_blas_implopenblaspython3.6.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- openblas -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml deleted file mode 100644 index 5c88c61..0000000 --- a/.ci_support/win_blas_implopenblaspython3.7.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- openblas -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml b/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml deleted file mode 100644 index b87050e..0000000 --- a/.ci_support/win_blas_implopenblaspython3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -blas_impl: -- openblas -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -fftw: -- '3' -glpk: -- '4.65' -gsl: -- '2.6' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -mkl: -- '2019' -openblas: -- 0.3.6 -pin_run_as_build: - fftw: - max_pin: x - glpk: - max_pin: x.x - mkl: - max_pin: x - openblas: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '5.6' diff --git a/.ci_support/linux_blas_implblispython3.6.____cpython.yaml b/.ci_support/win_python3.6.____cpython.yaml similarity index 77% rename from .ci_support/linux_blas_implblispython3.6.____cpython.yaml rename to .ci_support/win_python3.6.____cpython.yaml index 14a044d..e96edc4 100644 --- a/.ci_support/linux_blas_implblispython3.6.____cpython.yaml +++ b/.ci_support/win_python3.6.____cpython.yaml @@ -1,15 +1,9 @@ -blas_impl: -- blis c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/linux_blas_implblispython3.7.____cpython.yaml b/.ci_support/win_python3.7.____cpython.yaml similarity index 77% rename from .ci_support/linux_blas_implblispython3.7.____cpython.yaml rename to .ci_support/win_python3.7.____cpython.yaml index 8d11624..dfa0d03 100644 --- a/.ci_support/linux_blas_implblispython3.7.____cpython.yaml +++ b/.ci_support/win_python3.7.____cpython.yaml @@ -1,15 +1,9 @@ -blas_impl: -- blis c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/.ci_support/linux_blas_implblispython3.8.____cpython.yaml b/.ci_support/win_python3.8.____cpython.yaml similarity index 77% rename from .ci_support/linux_blas_implblispython3.8.____cpython.yaml rename to .ci_support/win_python3.8.____cpython.yaml index 5905ad6..9132450 100644 --- a/.ci_support/linux_blas_implblispython3.8.____cpython.yaml +++ b/.ci_support/win_python3.8.____cpython.yaml @@ -1,15 +1,9 @@ -blas_impl: -- blis c_compiler: -- gcc -c_compiler_version: -- '7' +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 fftw: - '3' glpk: diff --git a/README.md b/README.md index 1640647..6ece9e4 100644 --- a/README.md +++ b/README.md @@ -63,69 +63,6 @@ Current build status variant - - linux_blas_implblispython3.6.____cpython - - - variant - - - - linux_blas_implblispython3.7.____cpython - - - variant - - - - linux_blas_implblispython3.8.____cpython - - - variant - - - - linux_blas_implmklpython3.6.____cpython - - - variant - - - - linux_blas_implmklpython3.7.____cpython - - - variant - - - - linux_blas_implmklpython3.8.____cpython - - - variant - - - - linux_blas_implopenblaspython3.6.____cpython - - - variant - - - - linux_blas_implopenblaspython3.7.____cpython - - - variant - - - - linux_blas_implopenblaspython3.8.____cpython - - - variant - - linux_ppc64le_python3.6.____cpython @@ -148,129 +85,66 @@ Current build status - osx_blas_implblispython3.6.____cpython - - - variant - - - - osx_blas_implblispython3.7.____cpython - - - variant - - - - osx_blas_implblispython3.8.____cpython - - - variant - - - - osx_blas_implmklpython3.6.____cpython - - - variant - - - - osx_blas_implmklpython3.7.____cpython - - - variant - - - - osx_blas_implmklpython3.8.____cpython - - - variant - - - - osx_blas_implopenblaspython3.6.____cpython - - - variant - - - - osx_blas_implopenblaspython3.7.____cpython - - - variant - - - - osx_blas_implopenblaspython3.8.____cpython - - - variant - - - - win_blas_implblispython3.6.____cpython + linux_python3.6.____cpython - variant + variant - win_blas_implblispython3.7.____cpython + linux_python3.7.____cpython - variant + variant - win_blas_implblispython3.8.____cpython + linux_python3.8.____cpython - variant + variant - win_blas_implmklpython3.6.____cpython + osx_python3.6.____cpython - variant + variant - win_blas_implmklpython3.7.____cpython + osx_python3.7.____cpython - variant + variant - win_blas_implmklpython3.8.____cpython + osx_python3.8.____cpython - variant + variant - win_blas_implopenblaspython3.6.____cpython + win_python3.6.____cpython - variant + variant - win_blas_implopenblaspython3.7.____cpython + win_python3.7.____cpython - variant + variant - win_blas_implopenblaspython3.8.____cpython + win_python3.8.____cpython - variant + variant From bf8dd0c28b9748d875c2a9549bc51f823e77820d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 28 Mar 2020 18:45:39 +0100 Subject: [PATCH 6/7] typo? --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 138b0ba..c117414 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -4,7 +4,7 @@ set CVXOPT_MSVC=1 :: the cvxopt builder for suitesparse looks for static ".lib" libraries (not ".dll"!) set "CVXOPT_BLAS_LIB_DIR=%LIBRARY_PREFIX%\lib" -set CVXOPT_BLAS_LIB=blis +set CVXOPT_BLAS_LIB=blas set CVXOPT_LAPACK_LIB=lapack set CVXOPT_BUILD_GSL=1 From deff1a18dc2e3b2b4f50583e200290fd7f5c4167 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 28 Mar 2020 20:53:04 +0100 Subject: [PATCH 7/7] add patch as suggested by @isuruf --- ...remove-BLAS_NO_UNDERSCORE-on-windows.patch | 37 +++++++++++++++++++ recipe/meta.yaml | 2 + 2 files changed, 39 insertions(+) create mode 100644 recipe/0001-remove-BLAS_NO_UNDERSCORE-on-windows.patch diff --git a/recipe/0001-remove-BLAS_NO_UNDERSCORE-on-windows.patch b/recipe/0001-remove-BLAS_NO_UNDERSCORE-on-windows.patch new file mode 100644 index 0000000..78ab4c6 --- /dev/null +++ b/recipe/0001-remove-BLAS_NO_UNDERSCORE-on-windows.patch @@ -0,0 +1,37 @@ +From 6c6f07bd89ebf1424dd266b03d091cfb13559da9 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sat, 28 Mar 2020 20:49:34 +0100 +Subject: [PATCH] remove BLAS_NO_UNDERSCORE on windows + +--- + CHOLMOD/Include/cholmod_blas.h | 1 - + UMFPACK/Source/cholmod_blas.h | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/CHOLMOD/Include/cholmod_blas.h b/CHOLMOD/Include/cholmod_blas.h +index aef3e63f..ca1ce8df 100644 +--- a/CHOLMOD/Include/cholmod_blas.h ++++ b/CHOLMOD/Include/cholmod_blas.h +@@ -49,7 +49,6 @@ + #define CHOLMOD_CYGWIN + #else + #define CHOLMOD_WINDOWS +-#define BLAS_NO_UNDERSCORE + #endif + #define CHOLMOD_ARCHITECTURE "Microsoft Windows" + +diff --git a/UMFPACK/Source/cholmod_blas.h b/UMFPACK/Source/cholmod_blas.h +index 2cc47e30..53a528f9 100644 +--- a/UMFPACK/Source/cholmod_blas.h ++++ b/UMFPACK/Source/cholmod_blas.h +@@ -44,7 +44,6 @@ + #define CHOLMOD_CYGWIN + #else + #define CHOLMOD_WINDOWS +-#define BLAS_NO_UNDERSCORE + #endif + #define CHOLMOD_ARCHITECTURE "Microsoft Windows" + +-- +2.24.0.windows.2 + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4a50664..a54180a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,8 @@ source: - url: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v{{ suitesparse_for_win_version }}.tar.gz # [win] sha256: 5ba5add1663d51a1b6fb128b50fe869b497f3096765ff7f8212f0ede044b9557 # [win] folder: suitesparse # [win] + patches: # [win] + - 0001-remove-BLAS_NO_UNDERSCORE-on-windows.patch # [win] build: skip: true # [py<35]