Skip to content

LAPACK 3.10.1 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

LAPACK 3.10.1 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
013e51a
bump to LAPACK 3.10.1
h-vetinari Apr 23, 2023
fba227a
use lapack_rc label to pull in 3.10.1
h-vetinari Apr 24, 2023
6d57491
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.32.0, and co…
h-vetinari Mar 18, 2024
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
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '16'
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implblisblas_impl_liblibblis.4.dylib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '16'
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '16'
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '16'
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '16'
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_blas_implblisblas_impl_liblibblis.4.dll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ blas_impl:
blas_impl_lib:
- libblis.4.dll
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
m2w64_c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_blas_implmklblas_impl_libmkl_rt.2.dll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ blas_impl:
blas_impl_lib:
- mkl_rt.2.dll
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
m2w64_c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ blas_impl:
blas_impl_lib:
- openblas.dll
channel_sources:
- conda-forge
- conda-forge/label/lapack_rc,conda-forge
channel_targets:
- conda-forge main
m2w64_c_compiler:
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export FFLAGS="-I${LIBRARY_PREFIX}/include $FFLAGS"
export LDFLAGS="-L${LIBRARY_PREFIX}/lib $LDFLAGS"

export CONDA_SUBDIR="${target_platform}"
conda${EXE_SUFFIX} create -p ${NEW_ENV} -c conda-forge --yes --quiet \
conda${EXE_SUFFIX} create -p ${NEW_ENV} -c conda-forge/label/lapack_rc -c conda-forge --yes --quiet \
libblas=${PKG_VERSION}=*netlib \
libcblas=${PKG_VERSION}=*netlib \
liblapack=${PKG_VERSION}=*netlib \
Expand Down
5 changes: 5 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 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
- mkl # [x86_64 and not osx]
Expand Down
8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "3.9.0" %}
{% set version = "3.10.1" %}
# if build_num is reset to 0 (for new version), update increment for blas_minor below
{% set build_num = 21 %}
{% set build_num = 0 %}
{% set version_major = version.split(".")[0] %}
# blas_major denotes major infrastructural change to how blas is managed
{% set blas_major = "2" %}
# make sure we do not create colliding version strings of output "blas"
# for builds across lapack-versions within the same blas_major
{% set blas_minor = build_num + 100 %}
{% set blas_minor = build_num + 200 %}
{% set build_string_platform = target_platform | default("linux-64") %}
{% set build_string_platform = build_string_platform.replace("-", "") %}

Expand All @@ -16,7 +16,7 @@ package:

source:
- url: https://github.com/Reference-LAPACK/lapack/archive/v{{ version }}.tar.gz
sha256: 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573
sha256: cd005cd021f144d7d5f7f33c943942db9f03a28d110d6a3b80d718a295f7f714
patches:
# Test BLAS and LAPACKE in addition to LAPACK
- patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From edbf3225c76685d753715d1f0055e56c89dda2d1 Mon Sep 17 00:00:00 2001
From 0c2f6522ec6674423301748907c1897c0715a522 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Mon, 7 Jan 2019 00:23:59 -0600
Subject: [PATCH] Test BLAS and LAPACKE in addition to LAPACK
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH] Test BLAS and LAPACKE in addition to LAPACK
1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9dbf974..dabab4c0 100644
index 1ee66f1ad..74f4857cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,6 +295,8 @@ endif()
@@ -358,6 +358,8 @@ endif()

if(BUILD_TESTING)
add_subdirectory(TESTING)
Expand All @@ -21,5 +21,5 @@ index d9dbf974..dabab4c0 100644

# --------------------------------------------------
--
2.26.2.windows.1
2.38.1.windows.1

2 changes: 1 addition & 1 deletion recipe/test_blas.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SKIP_TESTS="dummy"

if [[ "${blas_impl}" == "blis" ]]; then
# conda-build can't install a correct environment for testing
conda install -c conda-forge "libblas=*=*blis" "libcblas=*=*blis" "liblapack=*=*netlib" "liblapacke=*=*netlib" --use-local --yes -p $PREFIX
conda install -c conda-forge/label/lapack_rc -c conda-forge "libblas=*=*blis" "libcblas=*=*blis" "liblapack=*=*netlib" "liblapacke=*=*netlib" --use-local --yes -p $PREFIX
fi

if [[ "$target_platform" != osx-* ]]; then
Expand Down