Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .ci_support/linux_64_blas_implblis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_blas_implmkl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_blas_implopenblas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_blas_implnvpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_blas_implopenblas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implaccelerate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implblis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implnewaccelerate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implopenblas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_blas_implaccelerate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_blas_implnewaccelerate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_blas_implopenblas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_blas_implblis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler:
c_stdlib:
- vs
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_blas_implmkl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler:
c_stdlib:
- vs
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_blas_implopenblas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_compiler:
c_stdlib:
- vs
channel_sources:
- conda-forge/label/lapack_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
4 changes: 3 additions & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ set "LDFLAGS=/LIBPATH:%LIBRARY_PREFIX%\lib %LDFLAGS%"

set "PYTHON_EXEC=%BUILD_PREFIX%\python.exe"

%MINIFORGE_HOME%\Scripts\conda.exe create -p %NEW_ENV% -c conda-forge/label/lapack_rc -c conda-forge --yes --quiet ^
%MINIFORGE_HOME%\Scripts\conda.exe create -p %NEW_ENV% --yes --quiet ^
libblas=%PKG_VERSION%=*netlib ^
libcblas=%PKG_VERSION%=*netlib ^
liblapack=%PKG_VERSION%=*netlib ^
liblapacke=%PKG_VERSION%=*netlib ^
flang_win-64=%fortran_compiler_version%
if %ERRORLEVEL% neq 0 exit 1

:: default activation for clang-windows uses clang.exe, not clang-cl.exe, see
:: https://github.com/conda-forge/clang-win-activation-feedstock/pull/48
:: clang.exe cannot handle /LIBPATH: in LDFLAGS, but we need that for lld-link
set "CC=clang-cl.exe"

python %RECIPE_DIR%\create_forwarder_dll.py
if %ERRORLEVEL% neq 0 exit 1

:: Link against the netlib libraries
cmake -LAH -G Ninja .. ^
Expand Down
2 changes: 1 addition & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export LIBRARY_PATH="${LIBRARY_PREFIX}/lib"
export PYTHON_EXEC=$BUILD_PREFIX/bin/python

export CONDA_SUBDIR="${target_platform}"
conda create -p ${NEW_ENV} -c conda-forge/label/lapack_rc -c conda-forge --yes --quiet \
conda create -p ${NEW_ENV} --yes --quiet \
libblas=${PKG_VERSION}=*netlib \
libcblas=${PKG_VERSION}=*netlib \
liblapack=${PKG_VERSION}=*netlib \
Expand Down
5 changes: 0 additions & 5 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ c_compiler: # [win]
cxx_compiler: # [win]
- clangxx # [win]

# temporarily while we bring up LAPACK 3.10.1;
# only required for blis; rest installs directly in build.sh
channel_sources:
- conda-forge/label/lapack_rc,conda-forge

blas_impl:
- openblas
- openblas # [win]
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "3.11.0" %}
# if build_num is reset to 0 (for new version), update increment for blas_minor below
{% set build_num = 0 %}
{% set build_num = 1 %}

{% set version_major = version.split(".")[0] %}
{% set version_minor = version.split(".")[1] %}
Expand Down