From 5c052acc49b9e2f0ef9061933cfa1bac9558b5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Mon, 28 Jun 2021 13:53:57 +0200 Subject: [PATCH 1/5] add cuda 11.3 --- recipe/install_cuda.bat | 17 +++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/recipe/install_cuda.bat b/recipe/install_cuda.bat index 1e0dd4e4..6bbedbe0 100644 --- a/recipe/install_cuda.bat +++ b/recipe/install_cuda.bat @@ -19,6 +19,7 @@ if "%CUDA_VERSION%" == "10.2" goto cuda102 if "%CUDA_VERSION%" == "11.0" goto cuda110 if "%CUDA_VERSION%" == "11.1" goto cuda111 if "%CUDA_VERSION%" == "11.2" goto cuda1122 +if "%CUDA_VERSION%" == "11.3" goto cuda1131 echo CUDA '%CUDA_VERSION%' is not supported exit /b 1 @@ -108,6 +109,22 @@ set "CUDA_INSTALLER_CHECKSUM=f9da6687d8a4f137ff14f8389b496e0a" set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" goto cuda_common +:cuda113 +set "CUDA_NETWORK_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.3.0/network_installers/cuda_11.3.0_win10_network.exe" +set "CUDA_NETWORK_INSTALLER_CHECKSUM=dddd7b22fcbb530b467db764eeb8439f" +set "CUDA_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda_11.3.0_465.89_win10.exe" +set "CUDA_INSTALLER_CHECKSUM=564c6ecf0b82f481d291519387e71db5" +set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" +goto cuda_common + +:cuda1131 +set "CUDA_NETWORK_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.3.1/network_installers/cuda_11.3.1_win10_network.exe" +set "CUDA_NETWORK_INSTALLER_CHECKSUM=8e812588cd299fe6e8d1e85b55bddf28" +set "CUDA_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.89_win10.exe" +set "CUDA_INSTALLER_CHECKSUM=7bf61cf7b059ba08197c70035879c352" +set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" +goto cuda_common + :: The actual installation logic :cuda_common diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ed1f5564..56130489 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "conda-forge-ci-setup" %} -{% set version = "3.9.4" %} +{% set version = "3.9.5" %} package: name: {{ name|lower }} From 6dd71601011ce0151be5d2b64d5cf3eab0fc88bd Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Mon, 28 Jun 2021 11:57:48 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and conda-forge-pinning 2021.06.27.12.20.29 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- ...iler_version11.0python3.6.____cpython.yaml | 2 +- ...iler_version11.0python3.7.____cpython.yaml | 2 +- ...iler_version11.0python3.8.____cpython.yaml | 2 +- ...iler_version11.0python3.9.____cpython.yaml | 2 +- .ci_support/migrations/python39.yaml | 26 ---------- .scripts/build_steps.sh | 27 ++++++---- .scripts/logging_utils.sh | 9 +++- .scripts/run_docker_build.sh | 19 ++++--- .scripts/run_osx_build.sh | 52 ++++++++++++------- .travis.yml | 4 ++ README.md | 1 + build-locally.py | 27 ++++++++-- 13 files changed, 102 insertions(+), 73 deletions(-) delete mode 100644 .ci_support/migrations/python39.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1c37265b..152aee49 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,7 +5,7 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest strategy: matrix: linux_64_cuda_compiler_version10.1python3.6.____cpython: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0python3.6.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0python3.6.____cpython.yaml index 670d1e46..6a8a88c1 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0python3.6.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0python3.6.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0python3.7.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0python3.7.____cpython.yaml index 19c36d06..6c8bcb83 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0python3.7.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0python3.7.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0python3.8.____cpython.yaml index 6e5a7d35..84d593c8 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0python3.8.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0python3.9.____cpython.yaml index f8baf9df..6930e937 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0python3.9.____cpython.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/migrations/python39.yaml b/.ci_support/migrations/python39.yaml deleted file mode 100644 index 3eff5c74..00000000 --- a/.ci_support/migrations/python39.yaml +++ /dev/null @@ -1,26 +0,0 @@ -migrator_ts: 1602104489 -__migrator: - migration_number: 2 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython # new entry - - 3.6.* *_73_pypy - paused: false - pr_limit: 50 - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta -python: - - 3.9.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.19 -python_impl: - - cpython diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index e3087a1c..13ff5ecf 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -10,9 +10,10 @@ export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh -endgroup "Start Docker" +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -startgroup "Configuring conda" export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" @@ -43,34 +44,38 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEB EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -endgroup "Configuring conda" + +( endgroup "Configuring conda" ) 2> /dev/null if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - startgroup "Running conda debug" if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" fi conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - endgroup "Running conda debug" + # Drop into an interactive shell /bin/bash else - startgroup "Running conda $BUILD_CMD" conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - endgroup "Running conda build" - startgroup "Validating outputs" + ( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" - endgroup "Validating outputs" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - startgroup "Uploading packages" upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - endgroup "Uploading packages" fi + + ( endgroup "Uploading packages" ) 2> /dev/null fi +( startgroup "Final checks" ) 2> /dev/null + touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index a53ef3f2..57bc95c2 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -13,18 +13,23 @@ function startgroup { travis ) echo "$1" echo -en 'travis_fold:start:'"${1// /}"'\\r';; + github_actions ) + echo "::group::$1";; * ) echo "$1";; esac -} +} 2> /dev/null function endgroup { # End a foldable group of log lines # Pass a single argument, quoted + case ${CI:-} in azure ) echo "##[endgroup]";; travis ) echo -en 'travis_fold:end:'"${1// /}"'\\r';; + github_actions ) + echo "::endgroup::";; esac -} +} 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 16d6c15a..244ccd1f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -7,7 +7,7 @@ source .scripts/logging_utils.sh -startgroup "Configure Docker" +( startgroup "Configure Docker" ) 2> /dev/null set -xeo pipefail @@ -52,11 +52,11 @@ if [ -z "${DOCKER_IMAGE}" ]; then echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) if [ "${DOCKER_IMAGE}" = "" ]; then - echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" fi else - DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" fi fi @@ -69,9 +69,11 @@ DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi -endgroup "Configure Docker" -startgroup "Start Docker" +( endgroup "Configure Docker" ) 2> /dev/null + +( startgroup "Start Docker" ) 2> /dev/null + export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ @@ -94,4 +96,7 @@ docker run ${DOCKER_RUN_ARGS} \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index faf1286c..436d6454 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -2,19 +2,24 @@ source .scripts/logging_utils.sh -set -x +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null -startgroup "Installing a fresh version of Miniforge" MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -bash $MINIFORGE_FILE -b -endgroup "Installing a fresh version of Miniforge" +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} + +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -startgroup "Configuring conda" BUILD_CMD=build -source ${HOME}/miniforge3/etc/profile.d/conda.sh +source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." @@ -26,21 +31,27 @@ pip install --no-deps recipe/. echo -e "\n\nSetting up the condarc and mangling the compiler." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml -mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -echo -e "\n\nMangling homebrew in the CI to avoid conflicts." -/usr/bin/sudo mangle_homebrew -/usr/bin/sudo -k +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi echo -e "\n\nRunning the build setup script." # Overriding global run_conda_forge_build_setup_osx with local copy. source recipe/run_conda_forge_build_setup_osx -endgroup "Configuring conda" -set -e +( endgroup "Configuring conda" ) 2> /dev/null + -startgroup "Running conda $BUILD_CMD" echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml @@ -49,13 +60,16 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -endgroup "Running conda build" -startgroup "Validating outputs" +( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" -endgroup "Validating outputs" + +( endgroup "Validating outputs" ) 2> /dev/null + +( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - startgroup "Uploading packages" upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml - endgroup "Uploading packages" -fi \ No newline at end of file +fi + +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9a3df5a0..f3230647 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,18 +10,22 @@ matrix: - env: CONFIG=linux_ppc64le_python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - env: CONFIG=linux_ppc64le_python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - env: CONFIG=linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal script: - export CI=travis diff --git a/README.md b/README.md index 0ebea42f..44845789 100644 --- a/README.md +++ b/README.md @@ -468,6 +468,7 @@ Installing `conda-forge-ci-setup` from the `conda-forge` channel can be achieved ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `conda-forge-ci-setup` can be installed with: diff --git a/build-locally.py b/build-locally.py index 3453cfe6..00eeb34b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -7,6 +7,7 @@ import glob import subprocess from argparse import ArgumentParser +import platform def setup_environment(ns): @@ -16,6 +17,10 @@ def setup_environment(ns): os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: os.environ["BUILD_OUTPUT_ID"] = ns.output_id + if "MINIFORGE_HOME" not in os.environ: + os.environ["MINIFORGE_HOME"] = os.path.join( + os.path.dirname(__file__), "miniforge3" + ) def run_docker_build(ns): @@ -23,6 +28,11 @@ def run_docker_build(ns): subprocess.check_call([script]) +def run_osx_build(ns): + script = ".scripts/run_osx_build.sh" + subprocess.check_call([script]) + + def verify_config(ns): valid_configs = { os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") @@ -46,10 +56,16 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith("linux"): + if ns.config.startswith("win"): raise ValueError( - f"only Linux configs currently supported, got {ns.config}" + f"only Linux/macOS configs currently supported, got {ns.config}" ) + elif ns.config.startswith("osx") and platform.system() == "Darwin": + if "OSX_SDK_DIR" not in os.environ: + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" + "to download the SDK automatically to '/opt/MacOSX.sdk'" + ) def main(args=None): @@ -68,7 +84,12 @@ def main(args=None): verify_config(ns) setup_environment(ns) - run_docker_build(ns) + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) if __name__ == "__main__": From 114c507be686857484eb3e3bbedb82f9f87a69e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Thu, 1 Jul 2021 14:39:54 +0200 Subject: [PATCH 3/5] add 11.4 --- recipe/install_cuda.bat | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipe/install_cuda.bat b/recipe/install_cuda.bat index 6bbedbe0..ebce9482 100644 --- a/recipe/install_cuda.bat +++ b/recipe/install_cuda.bat @@ -20,6 +20,7 @@ if "%CUDA_VERSION%" == "11.0" goto cuda110 if "%CUDA_VERSION%" == "11.1" goto cuda111 if "%CUDA_VERSION%" == "11.2" goto cuda1122 if "%CUDA_VERSION%" == "11.3" goto cuda1131 +if "%CUDA_VERSION%" == "11.4" goto cuda114 echo CUDA '%CUDA_VERSION%' is not supported exit /b 1 @@ -125,6 +126,14 @@ set "CUDA_INSTALLER_CHECKSUM=7bf61cf7b059ba08197c70035879c352" set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" goto cuda_common +:cuda114 +set "CUDA_NETWORK_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.4.0/network_installers/cuda_11.4.0_win10_network.exe" +set "CUDA_NETWORK_INSTALLER_CHECKSUM=140811a2ca1a0993fcc8ee1a16d21a79" +set "CUDA_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.4.0/local_installers/cuda_11.4.0_471.11_win10.exe" +set "CUDA_INSTALLER_CHECKSUM=423695ea246810200e210f07a0e0bd43" +set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" +goto cuda_common + :: The actual installation logic :cuda_common From 50aad87209500e362677684f0f5f6b1ba4fafa49 Mon Sep 17 00:00:00 2001 From: Jaime RGP Date: Tue, 26 Oct 2021 18:56:08 +0200 Subject: [PATCH 4/5] add 11.15 --- recipe/install_cuda.bat | 9 +++++++++ recipe/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/recipe/install_cuda.bat b/recipe/install_cuda.bat index ebce9482..421e5abd 100644 --- a/recipe/install_cuda.bat +++ b/recipe/install_cuda.bat @@ -21,6 +21,7 @@ if "%CUDA_VERSION%" == "11.1" goto cuda111 if "%CUDA_VERSION%" == "11.2" goto cuda1122 if "%CUDA_VERSION%" == "11.3" goto cuda1131 if "%CUDA_VERSION%" == "11.4" goto cuda114 +if "%CUDA_VERSION%" == "11.5" goto cuda115 echo CUDA '%CUDA_VERSION%' is not supported exit /b 1 @@ -134,6 +135,14 @@ set "CUDA_INSTALLER_CHECKSUM=423695ea246810200e210f07a0e0bd43" set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" goto cuda_common +:cuda114 +set "CUDA_NETWORK_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.5.0/network_installers/cuda_11.5.0_win10_network.exe" +set "CUDA_NETWORK_INSTALLER_CHECKSUM=499fb5f0d25424a4a52f901a78beceef" +set "CUDA_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_496.13_win10.exe" +set "CUDA_INSTALLER_CHECKSUM=9ae3759817c87dc8ae6f0d38cb164361" +set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" +goto cuda_common + :: The actual installation logic :cuda_common diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9aeb6b77..ec33cf6f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "conda-forge-ci-setup" %} -{% set version = "3.15.0" %} +{% set version = "3.15.1" %} package: name: {{ name|lower }} From 3c22e52852055901a8b831b0b24b9e743e5a24d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Tue, 26 Oct 2021 19:54:31 +0200 Subject: [PATCH 5/5] 114->115 Co-authored-by: Leo Fang --- recipe/install_cuda.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install_cuda.bat b/recipe/install_cuda.bat index 421e5abd..f93e83fe 100644 --- a/recipe/install_cuda.bat +++ b/recipe/install_cuda.bat @@ -135,7 +135,7 @@ set "CUDA_INSTALLER_CHECKSUM=423695ea246810200e210f07a0e0bd43" set "CUDA_COMPONENTS=%CUDA_COMPONENTS% nsight_nvtx_%CUDA_VERSION%" goto cuda_common -:cuda114 +:cuda115 set "CUDA_NETWORK_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.5.0/network_installers/cuda_11.5.0_win10_network.exe" set "CUDA_NETWORK_INSTALLER_CHECKSUM=499fb5f0d25424a4a52f901a78beceef" set "CUDA_INSTALLER_URL=https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_496.13_win10.exe"