diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d5ff321c..157d71a3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -21,6 +21,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ab8492e8..edb6e894 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -24,6 +24,7 @@ jobs: CONFIG: osx_arm64_blas_implopenblasblas_impl_liblibopenblas.0.dylib UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? 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 e59601be..cd52e30a 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,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: 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 fc5cada1..54daa314 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,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: 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 a64a4d7c..fd5a7210 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,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: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 61dd73b0..bde8d5a5 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -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: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index b41054f1..27542373 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -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: 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 20f09701..cdacc460 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 @@ -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: 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 ba4c7e83..db988fa9 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 @@ -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: 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 9d049bcb..4a0f2411 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 @@ -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: 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 dae73c08..b8073d2e 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 @@ -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: 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 796baa9e..c830b3be 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 @@ -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: 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 12399cad..063b57a8 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 @@ -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: 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 79ce7a10..bb4ddc03 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 @@ -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: 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 a3c63c6d..cdc21d35 100644 --- a/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml +++ b/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml @@ -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: diff --git a/.gitignore b/.gitignore index 62bf0590..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,9 @@ * !/conda-forge.yml -# Don't ignore any subfolders if the parent folder is 'un-ignored' -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ # Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247e..899ba03c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --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:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..07dff219 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --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" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de9..6d546976 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) diff --git a/recipe/build.sh b/recipe/build.sh index bd29fe21..1ba698d0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -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 \ diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 5cb68031..c1729a34 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -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] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10756ba9..2cd58e40 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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("-", "") %} @@ -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 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..92888eeb 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,4 +1,4 @@ -From edbf3225c76685d753715d1f0055e56c89dda2d1 Mon Sep 17 00:00:00 2001 +From 0c2f6522ec6674423301748907c1897c0715a522 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 @@ -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) @@ -21,5 +21,5 @@ index d9dbf974..dabab4c0 100644 # -------------------------------------------------- -- -2.26.2.windows.1 +2.38.1.windows.1 diff --git a/recipe/test_blas.sh b/recipe/test_blas.sh index a0cc769a..0921b2b5 100644 --- a/recipe/test_blas.sh +++ b/recipe/test_blas.sh @@ -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