From cf125c3faab318a71e3270911997856254d19e37 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:07:02 +0000 Subject: [PATCH 1/7] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index fbe113f..3d2934f 100644 --- a/README.md +++ b/README.md @@ -275,3 +275,6 @@ Feedstock Maintainers * [@mmccarty](https://github.com/mmccarty/) * [@vyasr](https://github.com/vyasr/) + + + From 811d959e84c0d351525f43a0075c6c458009de54 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:08:51 +0000 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.26.07.13.35 --- .scripts/build_steps.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ README.md | 3 --- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..97dc8d9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,13 @@ else --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:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7491838..24ef201 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -53,6 +53,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index 3d2934f..fbe113f 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,3 @@ Feedstock Maintainers * [@mmccarty](https://github.com/mmccarty/) * [@vyasr](https://github.com/vyasr/) - - - From 04f473377b613b323a9d13b7210944dd33d45685 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 11:48:19 -0700 Subject: [PATCH 3/7] Use `win64` selectors throughout --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1aa085d..462beff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -5,7 +5,7 @@ {% set patch_version = version.split(".")[2]|int %} {% set target_name = "x86_64-linux" %} # [linux64] {% set target_name = "sbsa-linux" %} # [aarch64] -{% set target_name = "x64" %} # [win] +{% set target_name = "x64" %} # [win64] package: name: {{ name|lower }} @@ -72,7 +72,7 @@ requirements: # run-exports of cuda-nvrtc-dev and instead allow a looser pinning here. - {{ pin_compatible('cuda-nvrtc', min_pin='x', max_pin='x') }} - {{ pin_compatible('cuda-version', min_pin='x', max_pin='x') }} - - pywin32 # [win] + - pywin32 # [win64] run_constrained: # cuda-cudart is not a hard dependency because cuda-python re-implements # cudart. This package is optionally dlopen'd for getting the local cudart From 3cd4d20b40f9beb659a302aeb4e9fb6055700156 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 11:46:31 -0700 Subject: [PATCH 4/7] Use splayed layout to set `CUDA_HOME` --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 462beff..891ff95 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,6 +6,8 @@ {% set target_name = "x86_64-linux" %} # [linux64] {% set target_name = "sbsa-linux" %} # [aarch64] {% set target_name = "x64" %} # [win64] +{% set subdir = os.sep.join(["", "targets", target_name]) %} # [linux] +{% set subdir = os.sep.join(["", "Library"]) %} # [win64] package: name: {{ name|lower }} @@ -28,8 +30,7 @@ build: - {{ PYTHON }} -m pip install . --no-deps -vv script_env: # Ensure that CUDA includes can be found by the host compiler - - CUDA_HOME="${PREFIX}/targets/{{ target_name }}" # [linux] - - CUDA_HOME=%PREFIX%\Library # [win64] + - CUDA_HOME={{ PREFIX ~ subdir ~ os.pathsep ~ BUILD_PREFIX ~ subdir }} run_exports: - {{ pin_subpackage('cuda-python', min_pin='x', max_pin='x') }} ignore_run_exports_from: From 8ee6bfe921a73a4c3d4c8fbf2adb6bb20c3ece82 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 11:46:32 -0700 Subject: [PATCH 5/7] Drop CUDA CRT headers from `host` These should now come from the CUDA compiler. --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 891ff95..035d319 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,6 @@ build: # The run-exports from these dev packages are too tight, so we ignore them. # The cuda-python package supports CUDA Enhanced Compatibility through its # use of dlopen, so it is compatible with other CUDA minor versions. - - cuda-crt-dev_{{ target_platform }} - cuda-cudart-dev - cuda-nvrtc-dev @@ -53,7 +52,6 @@ requirements: - python # [build_platform != target_platform] - cython # [build_platform != target_platform] host: - - cuda-crt-dev_{{ target_platform }} - cuda-cudart-dev - cuda-cudart - cuda-nvrtc-dev From da7c19a7d3affda4d76fac1feff544b1b526e437 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 12:07:21 -0700 Subject: [PATCH 6/7] Fix GitHub autogenerated tarball checksum --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 035d319..2076ec6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ package: source: url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.tar.gz - sha256: ee7e3df43da7d924207e03efa4d5e5466801510b3e1f0377d425c6e6a8d823bb + sha256: eb6d1b2cd881de0c14963ddb9cb7f3ec5df1b31370133267678265e31fb743b2 build: number: 0 From b368c3746cda64adb79bdb29ccf9af20d76e06ee Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 12:29:54 -0700 Subject: [PATCH 7/7] Bump `build/number` to `1` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2076ec6..b0a934a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ source: sha256: eb6d1b2cd881de0c14963ddb9cb7f3ec5df1b31370133267678265e31fb743b2 build: - number: 0 + number: 1 {% if not (environ.get("cuda_compiler_version")|string()).startswith(major_version|string()) %} skip: true {% endif %}