From 4d376e9a633f02680c55202df8fa7ce466e80bf7 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 1 Mar 2024 17:54:49 +0000 Subject: [PATCH 1/6] Change runpath to rpath and add test --- recipe/build.sh | 2 +- recipe/meta.yaml | 2 +- recipe/test-rpath.sh | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index dd8ce71..87696bc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -25,7 +25,7 @@ for i in `ls`; do ln -sv ${PREFIX}/${targetsDir}/$j ${PREFIX}/$j if [[ $j =~ \.so\. ]]; then - patchelf --set-rpath '$ORIGIN' ${PREFIX}/${targetsDir}/$j + patchelf --set-rpath '$ORIGIN' --force-rpath ${PREFIX}/${targetsDir}/$j fi done fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5ade885..800f532 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ source: sha256: 310a71bc9c92d6e61eeddf3489cc195519665fbfaca16c618b03da0ac5ea9f7d # [win] build: - number: 0 + number: 1 skip: true # [osx] outputs: diff --git a/recipe/test-rpath.sh b/recipe/test-rpath.sh index 16ee3b4..16ad3a7 100644 --- a/recipe/test-rpath.sh +++ b/recipe/test-rpath.sh @@ -11,7 +11,11 @@ for lib in `find ${PREFIX}/${targetsDir}/lib -type f`; do rpath=$(patchelf --print-rpath $lib) echo "$lib rpath: $rpath" - [[ $rpath == "\$ORIGIN" ]] || errors+="$lib\n" + if [[ $rpath != "\$ORIGIN" ]]; then + errors+="$lib\n" + elif [[ $(objdump -x ${lib} | grep "PATH") == *"RUNPATH"* ]]; then + errors+="$lib\n" + fi done if [[ $errors ]]; then From 74244eb1c0cf42e5fc7160dc5b05cc5065d4db0d Mon Sep 17 00:00:00 2001 From: adibbley Date: Tue, 5 Mar 2024 14:06:24 -0500 Subject: [PATCH 2/6] Update for CUDA 12.4.0 --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 800f532..35d5c56 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "cuda-cudart" %} -{% set version = "12.3.101" %} -{% set cuda_version = "12.3" %} +{% set version = "12.4.99" %} +{% set cuda_version = "12.4" %} {% set platform = "linux-x86_64" %} # [linux64] {% set platform = "linux-ppc64le" %} # [ppc64le] {% set platform = "linux-sbsa" %} # [aarch64] @@ -18,13 +18,13 @@ package: source: url: https://developer.download.nvidia.com/compute/cuda/redist/cuda_cudart/{{ platform }}/cuda_cudart-{{ platform }}-{{ version }}-archive.{{ extension }} - sha256: e37d478d1e7a10490d55fb87a5ef379a18c648f3010e1d3687c4298ddc3e9e19 # [linux64] - sha256: 23f6ef558bb954dea3ef5b378c3ad28e1da93080890bd8bf1a18a75ae2ee605d # [ppc64le] - sha256: 131e62c60ba979f6870687db99a7537482f6df445915789d2a4799dc4e898b66 # [aarch64] - sha256: 310a71bc9c92d6e61eeddf3489cc195519665fbfaca16c618b03da0ac5ea9f7d # [win] + sha256: dc126fb171d996c495756d44d565f7dd927245cbdc7191b9f8d5075d09ada699 # [linux64] + sha256: 129451060d510965a382707447cb93c9cb6d886a36c5e3b55a824711e9166b2c # [ppc64le] + sha256: 5bb3b037be5c175679f9de8469f8701ccff48014c9fb3d7310d6cc5fbc57cc0b # [aarch64] + sha256: 1034ca43da4afbc79f69269cc60dc081de631e1c0d229d60f045d9516409317a # [win] build: - number: 1 + number: 0 skip: true # [osx] outputs: From 0fd5805de67750361321ed962589db2bdd577890 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:22:31 +0000 Subject: [PATCH 3/6] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.05.14.24.26 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- build-locally.py | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f017291..a4d638b 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}" @@ -65,7 +65,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_win_build.bat b/.scripts/run_win_build.bat index 7bde26b..a5871f6 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 @@ -50,7 +50,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.exe build "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/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 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." ) From a0eca8be22d5244dd1c699fc6a24af2cd4350a6f Mon Sep 17 00:00:00 2001 From: adibbley Date: Thu, 4 Apr 2024 08:59:14 -0400 Subject: [PATCH 4/6] Update for CUDA 12.4.1 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 35d5c56..9dbff28 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "cuda-cudart" %} -{% set version = "12.4.99" %} +{% set version = "12.4.127" %} {% set cuda_version = "12.4" %} {% set platform = "linux-x86_64" %} # [linux64] {% set platform = "linux-ppc64le" %} # [ppc64le] @@ -18,10 +18,10 @@ package: source: url: https://developer.download.nvidia.com/compute/cuda/redist/cuda_cudart/{{ platform }}/cuda_cudart-{{ platform }}-{{ version }}-archive.{{ extension }} - sha256: dc126fb171d996c495756d44d565f7dd927245cbdc7191b9f8d5075d09ada699 # [linux64] - sha256: 129451060d510965a382707447cb93c9cb6d886a36c5e3b55a824711e9166b2c # [ppc64le] - sha256: 5bb3b037be5c175679f9de8469f8701ccff48014c9fb3d7310d6cc5fbc57cc0b # [aarch64] - sha256: 1034ca43da4afbc79f69269cc60dc081de631e1c0d229d60f045d9516409317a # [win] + sha256: 0483bff9a36e7a44465db3cd42874f6f70f019297dcf803fbefcbf58d7448c8f # [linux64] + sha256: f5e636944c7817b4f178070daa1259f25b3e84ebd092305d32aa189b21ae37e3 # [ppc64le] + sha256: fb96abcff3544384440b9259f9aeab9bf222a5775348546ef87c68ee02eee379 # [aarch64] + sha256: 6a1c32e68ee1a95ca17334691ff9ad1ffe7f352c24a083d55e4c96b8063b2bcb # [win] build: number: 0 From 90e505dd5eecb93c95be8ddeae40b281e786122c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 04:13:27 +0000 Subject: [PATCH 5/6] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.04.19.02.56 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .ci_support/linux_64_.yaml | 6 ++++++ .ci_support/linux_aarch64_.yaml | 6 ++++++ .ci_support/linux_ppc64le_.yaml | 6 ++++++ .ci_support/win_64_.yaml | 2 ++ .scripts/build_steps.sh | 2 +- .scripts/run_win_build.bat | 2 +- 7 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abcbeb9..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,6 +13,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/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index d0283c3..5d614fe 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,3 +23,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 4f36128..23e6f36 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -6,6 +6,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -25,3 +29,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index eb5daee..3adf975 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -19,3 +23,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 2614db3..d1d2b41 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a4d638b..2f3df6c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -65,7 +65,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${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_win_build.bat b/.scripts/run_win_build.bat index a5871f6..7491838 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -50,7 +50,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "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 From bbe72c867cf22672810128d27ac97f1335ccf83f Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Fri, 3 May 2024 15:34:25 -0500 Subject: [PATCH 6/6] Upload all noarch packages, they're needed --- abs.yaml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/abs.yaml b/abs.yaml index 6ac203c..7bc0ed8 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,14 +1,4 @@ -# The buildout of these CUDA packages is happening on a private channel for the moment, -# while we wait for a redistribution license. -# It also prevents uploading to our public staging channel. -# The below can probably all be deleted next time the feedstock needs updating. - -upload_channels: - - lc030263 - -upload_to_staging_channel_in_pr: False - -# don't skip existing, to update any existing packages -# don't error overlinking (this should stay, see https://github.com/conda-forge/cuda-cudart-feedstock/pull/15) -build_parameters: - - "--suppress-variables" \ No newline at end of file +# without this, only the linux-64 noarch package will be uploaded +# (the noarch packages contain the libraries) +noarch_upload: + - all