diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index edb6e894..52fa5b9b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib: diff --git a/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.4.yaml b/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.4.yaml index 91307801..4b25ce38 100644 --- a/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.4.yaml +++ b/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.4.yaml @@ -11,9 +11,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml b/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml index d90844bd..b9a782f5 100644 --- a/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml +++ b/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml @@ -11,9 +11,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml b/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml index 39de7eab..014a1a88 100644 --- a/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml +++ b/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml @@ -11,9 +11,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml b/.ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml index 1d82684a..2c2a9f70 100644 --- a/.ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml +++ b/.ci_support/osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_default_impl: - openblas blas_impl: @@ -13,7 +15,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.4.dylib.yaml b/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.4.dylib.yaml index baca95f5..615c0a6b 100644 --- a/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.4.dylib.yaml +++ b/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.4.dylib.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_default_impl: - openblas blas_impl: @@ -13,7 +15,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml b/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml index 61e58df1..cbf2a25e 100644 --- a/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml +++ b/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_default_impl: - openblas blas_impl: @@ -13,7 +15,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml b/.ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml index c862bd53..2528b119 100644 --- a/.ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml +++ b/.ci_support/osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_default_impl: - openblas blas_impl: diff --git a/.ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml b/.ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml index 69503a3d..d221eff3 100644 --- a/.ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml +++ b/.ci_support/osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_default_impl: - openblas blas_impl: diff --git a/.ci_support/win_64_blas_implblisblas_impl_liblibblis.4.dll.yaml b/.ci_support/win_64_blas_implblisblas_impl_liblibblis.4.dll.yaml index aca63598..660b957e 100644 --- a/.ci_support/win_64_blas_implblisblas_impl_liblibblis.4.dll.yaml +++ b/.ci_support/win_64_blas_implblisblas_impl_liblibblis.4.dll.yaml @@ -4,14 +4,14 @@ blas_impl: - blis blas_impl_lib: - libblis.4.dll -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main m2w64_c_compiler: - m2w64-toolchain +m2w64_c_stdlib: +- m2w64-toolchain m2w64_fortran_compiler: - m2w64-toolchain target_platform: diff --git a/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.2.dll.yaml b/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.2.dll.yaml index dca9647b..7ada087e 100644 --- a/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.2.dll.yaml +++ b/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.2.dll.yaml @@ -4,14 +4,14 @@ blas_impl: - mkl blas_impl_lib: - mkl_rt.2.dll -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main m2w64_c_compiler: - m2w64-toolchain +m2w64_c_stdlib: +- m2w64-toolchain m2w64_fortran_compiler: - m2w64-toolchain target_platform: diff --git a/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml b/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml index 65319347..4746f168 100644 --- a/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml +++ b/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml @@ -4,14 +4,14 @@ blas_impl: - openblas blas_impl_lib: - openblas.dll -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main m2w64_c_compiler: - m2w64-toolchain +m2w64_c_stdlib: +- m2w64-toolchain m2w64_fortran_compiler: - m2w64-toolchain target_platform: diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03c..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff219..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d546976..65650bf2 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/.travis.yml b/.travis.yml index c833fba0..0edc9143 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ddae222..7a65910a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "3.9.0" %} # if build_num is reset to 0 (for new version), update increment for blas_minor below -{% set build_num = 22 %} +{% set build_num = 23 %} {% set version_major = version.split(".")[0] %} # blas_major denotes major infrastructural change to how blas is managed {% set blas_major = "2" %} @@ -20,8 +20,9 @@ source: patches: # Test BLAS and LAPACKE in addition to LAPACK - patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch - # Only the test-suite is compiled here, and we therefore do not need to - # carry all the patches that the lapack-feedstock has (see comment below) + # backport https://github.com/Reference-LAPACK/lapack/pull/391 + # to fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114304 + - patches/0002-remove-extraneous-semicolon.patch - url: https://github.com/isuruf/vecLibFort/archive/99af8640e98c829b41c3235e3706760cd5696fe4.tar.gz sha256: 80de7c6e83d1d84d016b4cb299f2c15f5a82b9d36865dd5c16bf221fe9a303ad @@ -33,8 +34,10 @@ build: requirements: build: - {{ compiler("c") }} # [unix] + - {{ stdlib("c") }} # [unix] - {{ compiler("fortran") }} # [unix] - {{ compiler("m2w64_c") }} # [win] + - {{ stdlib("m2w64_c") }} # [win] - {{ compiler("m2w64_fortran") }} # [win] - cmake - m2-make # [win] @@ -66,6 +69,7 @@ outputs: requirements: build: - {{ compiler('fortran') }} # [blas_impl == 'accelerate'] + - {{ stdlib('c') }} # [blas_impl == 'accelerate'] host: - libopenblas 0.3.27 # [blas_impl == 'openblas'] # from https://github.com/conda-forge/intel_repack-feedstock/ @@ -230,8 +234,10 @@ outputs: requirements: build: - {{ compiler('c') }} # [unix] + - {{ stdlib('c') }} # [unix] - {{ compiler('fortran') }} # [unix] - {{ compiler('m2w64_c') }} # [win] + - {{ stdlib('m2w64_c') }} # [win] - {{ compiler('m2w64_fortran') }} # [win] - cmake - m2-make # [win] diff --git a/recipe/patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch b/recipe/patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch index 91c5b4b3..9b50eb22 100644 --- a/recipe/patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch +++ b/recipe/patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch @@ -1,14 +1,14 @@ -From edbf3225c76685d753715d1f0055e56c89dda2d1 Mon Sep 17 00:00:00 2001 +From 48c2ace8dcd69883470c67562d0e0b36ee1ddd90 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 7 Jan 2019 00:23:59 -0600 -Subject: [PATCH] Test BLAS and LAPACKE in addition to LAPACK +Subject: [PATCH 1/2] Test BLAS and LAPACKE in addition to LAPACK --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9dbf974..dabab4c0 100644 +index d9dbf9746..dabab4c02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,6 +295,8 @@ endif() @@ -20,6 +20,3 @@ index d9dbf974..dabab4c0 100644 endif() # -------------------------------------------------- --- -2.26.2.windows.1 - diff --git a/recipe/patches/0002-remove-extraneous-semicolon.patch b/recipe/patches/0002-remove-extraneous-semicolon.patch new file mode 100644 index 00000000..219e20bf --- /dev/null +++ b/recipe/patches/0002-remove-extraneous-semicolon.patch @@ -0,0 +1,22 @@ +From 024de713931ec886eacf032e64dd205b79588ad7 Mon Sep 17 00:00:00 2001 +From: Iain Hibbert +Date: Sun, 23 Feb 2020 21:39:25 +0000 +Subject: [PATCH 2/2] remove extraneous semicolon + +this semicolon causes a test to fail with read error, using g95 +--- + TESTING/dbal.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/TESTING/dbal.in b/TESTING/dbal.in +index c00fe3e83..828629b15 100644 +--- a/TESTING/dbal.in ++++ b/TESTING/dbal.in +@@ -209,6 +209,6 @@ DBL: Tests DGEBAL + 0.00000000000000000000D+00 0.00000000000000000000D+00 0.00000000000000000000D+00 0.63043209914231165391D-03 0.10000000000000000000D+01 0.79310682416114036641D+03 + 0.00000000000000000000D+00 0.00000000000000000000D+00 0.00000000000000000000D+00 0.00000000000000000000D+00 0.12608641982846233078D-02 0.10000000000000000000D+01 + +- 2.494800386918399765D+291 1.582914569427869018D+175 1.004336277661868922D+59 3.186183822264904554D-58 5.053968264940243633D-175 0.40083367200179455560D-291; ++ 2.494800386918399765D+291 1.582914569427869018D+175 1.004336277661868922D+59 3.186183822264904554D-58 5.053968264940243633D-175 0.40083367200179455560D-291 + + 0