Skip to content

Commit

Permalink
Merge pull request #218 from napetrov/napetrov-libcblas
Browse files Browse the repository at this point in the history
Removing libcblas dependency
  • Loading branch information
jeremiedbb authored Mar 24, 2023
2 parents f3f07f6 + c3726f5 commit d113c4f
Show file tree
Hide file tree
Showing 25 changed files with 1 addition and 52 deletions.
2 changes: 0 additions & 2 deletions .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.23'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.21'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.23'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.21'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
numpy:
- '1.23'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libcblas:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libcblas:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_numpy1.21python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libcblas:
- 3.9 *netlib
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libcblas:
- 3.9 *netlib
numpy:
- '1.23'
pin_run_as_build:
Expand Down
5 changes: 1 addition & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ source:
- patches/0001-ignore-errors-when-tearing-down-modules.patch

build:
number: 0
number: 1
skip: true # [py<38]
script:
- rm $PREFIX/include/cblas.h # [not win]
- del /f %LIBRARY_INC%\cblas.h # [win]
# build the C files in parallel. This helps beat the
# time limit consistently on drone.io
- {{ PYTHON }} setup.py build_ext -j{{ CPU_COUNT }}
Expand All @@ -37,7 +35,6 @@ requirements:
- pip ==22.0.4
- setuptools
- cython >=0.29.24
- libcblas
- numpy
- scipy >=1.3.2 # [not aarch64]
- scipy >=1.8 # [aarch64]
Expand Down

0 comments on commit d113c4f

Please sign in to comment.