From bf8fd71edc8003a1537eb33cf8def127461cbb38 Mon Sep 17 00:00:00 2001 From: adibbley Date: Thu, 4 Apr 2024 09:01:45 -0400 Subject: [PATCH 1/2] Update for CUDA 12.4.1 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b3b35d5..9264ec1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "cuda-nvcc-split" %} -{% set version = "12.4.99" %} +{% set version = "12.4.131" %} {% set cuda_version = "12.4" %} package: From c260dcbd18a1ed5d813912223bbf43debe0fd822 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:50:20 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.08.10.57.16 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .ci_support/linux_64_cross_target_platformlinux-64.yaml | 6 ++++++ .../linux_64_cross_target_platformlinux-aarch64.yaml | 6 ++++++ .../linux_64_cross_target_platformlinux-ppc64le.yaml | 6 ++++++ .../linux_aarch64_cross_target_platformlinux-aarch64.yaml | 6 ++++++ .../linux_ppc64le_cross_target_platformlinux-ppc64le.yaml | 6 ++++++ .ci_support/win_64_.yaml | 2 ++ .scripts/build_steps.sh | 2 +- .scripts/run_win_build.bat | 2 +- README.md | 4 ++-- 10 files changed, 37 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 772f32f..81b8cba 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/.ci_support/linux_64_cross_target_platformlinux-64.yaml b/.ci_support/linux_64_cross_target_platformlinux-64.yaml index 4f29a0a..3fa3287 100644 --- a/.ci_support/linux_64_cross_target_platformlinux-64.yaml +++ b/.ci_support/linux_64_cross_target_platformlinux-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: @@ -21,3 +25,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_64_cross_target_platformlinux-aarch64.yaml b/.ci_support/linux_64_cross_target_platformlinux-aarch64.yaml index 9e2fa79..2b415a4 100644 --- a/.ci_support/linux_64_cross_target_platformlinux-aarch64.yaml +++ b/.ci_support/linux_64_cross_target_platformlinux-aarch64.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: @@ -21,3 +25,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_64_cross_target_platformlinux-ppc64le.yaml b/.ci_support/linux_64_cross_target_platformlinux-ppc64le.yaml index dc5b070..f43502a 100644 --- a/.ci_support/linux_64_cross_target_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_64_cross_target_platformlinux-ppc64le.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: @@ -21,3 +25,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_aarch64_cross_target_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_cross_target_platformlinux-aarch64.yaml index b246f2f..9f84e0f 100644 --- a/.ci_support/linux_aarch64_cross_target_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_cross_target_platformlinux-aarch64.yaml @@ -4,6 +4,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_cross_target_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_cross_target_platformlinux-ppc64le.yaml index ceeab9e..8bbb543 100644 --- a/.ci_support/linux_ppc64le_cross_target_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_cross_target_platformlinux-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: @@ -21,3 +25,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 cab9cbb..355d7f9 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 diff --git a/README.md b/README.md index 5654d7a..a995e0a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Documentation: https://docs.nvidia.com/cuda/index.html Compiler for CUDA applications. -About cuda-nvcc_linux-ppc64le +About cuda-nvcc_linux-aarch64 ----------------------------- Home: https://developer.nvidia.com/cuda-toolkit @@ -60,7 +60,7 @@ Documentation: https://docs.nvidia.com/cuda/index.html Compiler for CUDA applications. -About cuda-nvcc_linux-aarch64 +About cuda-nvcc_linux-ppc64le ----------------------------- Home: https://developer.nvidia.com/cuda-toolkit