From bcec98f2e5fcc3beebe6698e269da65f2192ea8c Mon Sep 17 00:00:00 2001 From: Yue Yang Date: Wed, 21 Dec 2022 20:24:03 +0800 Subject: [PATCH 1/3] Update MKL to 2023.0 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8c00db28..034347af 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 = 16 %} +{% set build_num = 17 %} {% set version_major = version.split(".")[0] %} # blas_major denotes major infrastructural change to how blas is managed {% set blas_major = "2" %} @@ -69,7 +69,7 @@ outputs: host: - libopenblas 0.3.21 # [blas_impl == 'openblas'] # from https://github.com/conda-forge/intel_repack-feedstock/ - - mkl 2022.1 # [blas_impl == 'mkl'] + - mkl 2023.0 # [blas_impl == 'mkl'] - blis 0.9.0 # [blas_impl == 'blis'] run: - {{ pin_compatible("libopenblas", max_pin="x.x.x", exact=win) }} # [blas_impl == 'openblas'] @@ -199,10 +199,10 @@ outputs: requirements: host: - openblas 0.3.21 # [blas_impl == "openblas"] - - mkl-devel 2022.1 # [blas_impl == "mkl"] + - mkl-devel 2023.0 # [blas_impl == "mkl"] run: - openblas 0.3.21 # [blas_impl == "openblas"] - - mkl-devel 2022.1 # [blas_impl == "mkl"] + - mkl-devel 2023.0 # [blas_impl == "mkl"] - {{ pin_subpackage("liblapack", exact=True) }} # [blas_impl != 'blis'] - {{ pin_subpackage("liblapacke", exact=True) }} # [blas_impl != 'blis'] - liblapack {{ version }} *netlib # [blas_impl == 'blis'] From bd9edfb322b8eab2dc0430c09b63c6654f3c5f29 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 12:26:56 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2022.12.21.11.24.57 --- .azure-pipelines/azure-pipelines-win.yml | 6 +++- .ci_support/README | 12 ++++---- ...las_implblisblas_impl_liblibblis.so.4.yaml | 4 +-- ...blas_implmklblas_impl_liblibmkl_rt.so.yaml | 4 +-- ...openblasblas_impl_liblibopenblas.so.0.yaml | 4 +-- .ci_support/linux_aarch64_.yaml | 4 +-- .ci_support/linux_ppc64le_.yaml | 4 +-- ...teblas_impl_liblibvecLibFort-ng.dylib.yaml | 4 +-- ..._implblisblas_impl_liblibblis.4.dylib.yaml | 4 +-- ...s_implmklblas_impl_liblibmkl_rt.dylib.yaml | 4 +-- ...nblasblas_impl_liblibopenblas.0.dylib.yaml | 4 +-- ...teblas_impl_liblibvecLibFort-ng.dylib.yaml | 2 +- ...nblasblas_impl_liblibopenblas.0.dylib.yaml | 2 +- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 +-- .scripts/run_osx_build.sh | 5 ++-- README.md | 28 +++++++++---------- 17 files changed, 50 insertions(+), 47 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d34916da..20ecf9a7 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -20,6 +20,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -41,7 +42,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -78,6 +79,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/README b/.ci_support/README index 69c5db60..a47316be 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. 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 e1ef8ab3..931ff99f 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 @@ -7,7 +7,7 @@ blas_impl_lib: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -19,7 +19,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' target_platform: - linux-64 zip_keys: 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 492c943a..53d47ffc 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 @@ -7,7 +7,7 @@ blas_impl_lib: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -19,7 +19,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' target_platform: - linux-64 zip_keys: 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 a2d9d69d..488f0951 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 @@ -7,7 +7,7 @@ blas_impl_lib: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -19,7 +19,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b9b697fa..87837e75 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -23,7 +23,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index bcd2ff88..6957d385 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -7,7 +7,7 @@ blas_impl_lib: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -19,7 +19,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' target_platform: - linux-ppc64le zip_keys: 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 8972adb9..bfa888e8 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 @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ channel_targets: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: 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 bcb44926..b54da8ce 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 @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ channel_targets: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml b/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml index cf134062..3ab110a5 100644 --- a/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml +++ b/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ channel_targets: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: 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 8510d0b3..3968eda7 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 @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ channel_targets: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: 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 ee888a79..c15eb62c 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 @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: 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 9ebeb2c7..12d28bef 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 @@ -9,7 +9,7 @@ blas_impl_lib: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa24..8b4ef2f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6b..84431a63 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a0..b3abaeb5 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 311697ed..fc53dc3c 100644 --- a/README.md +++ b/README.md @@ -37,98 +37,98 @@ Current build status linux_64_blas_implblisblas_impl_liblibblis.so.4 - variant + variant linux_64_blas_implmklblas_impl_liblibmkl_rt.so - variant + variant linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0 - variant + variant linux_aarch64 - variant + variant linux_ppc64le - variant + variant osx_64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib - variant + variant osx_64_blas_implblisblas_impl_liblibblis.4.dylib - variant + variant osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib - variant + variant osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib - variant + variant osx_arm64_blas_implaccelerateblas_impl_liblibvecLibFort-ng.dylib - variant + variant osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib - variant + variant win_64_blas_implblisblas_impl_liblibblis.4.dll - variant + variant win_64_blas_implmklblas_impl_libmkl_rt.2.dll - variant + variant win_64_blas_implopenblasblas_impl_libopenblas.dll - variant + variant From 1d11a24e4cfe6a92fb211f643273bcb8881bdf44 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 22:44:45 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.04.14.16.29.36 --- .azure-pipelines/azure-pipelines-win.yml | 4 +- .scripts/build_steps.sh | 4 +- .scripts/run_osx_build.sh | 4 +- README.md | 55 +++++++++++++++++++++++- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 20ecf9a7..a1e8a9d7 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_blas_implblisblas_impl_liblibblis.4.dll: @@ -42,7 +42,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a63..a6b09f6b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb5..bb00584b 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index fc53dc3c..8d25e0f0 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,62 @@ +About blas-feedstock +==================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/blas-feedstock/blob/main/LICENSE.txt) + About blas -========== +---------- Home: https://github.com/conda-forge/blas-feedstock Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/blas-feedstock/blob/main/LICENSE.txt) +Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want. +About libblas +------------- + +Home: https://github.com/conda-forge/blas-feedstock + +Package license: BSD-3-Clause + +Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want. +About libcblas +-------------- + +Home: https://github.com/conda-forge/blas-feedstock + +Package license: BSD-3-Clause + +Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want. +About liblapack +--------------- + +Home: https://github.com/conda-forge/blas-feedstock + +Package license: BSD-3-Clause + +Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want. +About liblapacke +---------------- + +Home: https://github.com/conda-forge/blas-feedstock + +Package license: BSD-3-Clause + +Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want. +About blas-devel +---------------- + +Home: https://github.com/conda-forge/blas-feedstock + +Package license: BSD-3-Clause + +Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want. +About blas +---------- + +Home: https://github.com/conda-forge/blas-feedstock + +Package license: BSD-3-Clause Summary: Metapackage to select the BLAS variant. Use conda's pinning mechanism in your environment to control which variant you want.