From 9ba98362f311a30ca390a0f91bf3c5de14746523 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 02:40:34 +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 b4e5dfb..681575f 100644 --- a/README.md +++ b/README.md @@ -276,3 +276,6 @@ Feedstock Maintainers * [@vyasr](https://github.com/vyasr/) * [@vzhurba01](https://github.com/vzhurba01/) + + + From 4a1536ae6a1bda580f6a96115c40db389ac842f3 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Dec 2024 21:41:06 -0500 Subject: [PATCH 2/7] Delete recipe/0001-include-pxd-pyx.patch --- recipe/0001-include-pxd-pyx.patch | 33 ------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 recipe/0001-include-pxd-pyx.patch diff --git a/recipe/0001-include-pxd-pyx.patch b/recipe/0001-include-pxd-pyx.patch deleted file mode 100644 index 90b921f..0000000 --- a/recipe/0001-include-pxd-pyx.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 240fbb78b2a7746a3ad026070cd5e5d6deaaa337 Mon Sep 17 00:00:00 2001 -From: Vladislav Zhurba -Date: Fri, 8 Nov 2024 16:28:13 -0800 -Subject: [PATCH] Fix discovery for trampoline files - ---- - cuda_bindings/MANIFEST.in | 2 +- - cuda_bindings/pyproject.toml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cuda_bindings/MANIFEST.in b/cuda_bindings/MANIFEST.in -index ef9def92..88bab329 100644 ---- a/cuda_bindings/MANIFEST.in -+++ b/cuda_bindings/MANIFEST.in -@@ -1,4 +1,4 @@ - recursive-include cuda/ *.pyx *.pxd - # at least with setuptools 75.0.0 this folder was added erroneously - # to the payload, causing file copying to the build environment failed --exclude cuda/bindings -+exclude cuda/bindings cuda?bindings -diff --git a/cuda_bindings/pyproject.toml b/cuda_bindings/pyproject.toml -index 4a405c32..63c09db5 100644 ---- a/cuda_bindings/pyproject.toml -+++ b/cuda_bindings/pyproject.toml -@@ -37,7 +37,7 @@ Repository = "https://github.com/NVIDIA/cuda-python" - Documentation = "https://nvidia.github.io/cuda-python/" - - [tool.setuptools.packages.find] --include = ["cuda.bindings*"] -+include = ["cuda*"] - - [tool.versioneer] - VCS = "git" From 1c6cb8b724d2685ae4e84d369394d862fe715612 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Dec 2024 21:52:19 -0500 Subject: [PATCH 3/7] update checksum --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6535e3e..b70b339 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,13 +14,12 @@ package: version: {{ version }} source: - url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.tar.gz - sha256: a6c7f6b802411fb1e0c9c2b6660d70c277a75b4f904f84d38cfe9ac341c9f379 - patches: - - 0001-include-pxd-pyx.patch + # TODO: remove the hard-coded .post1 in the next release + url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.post1.tar.gz + sha256: abbfad534cb51d79f748cc5dfdc761fa6bb2c7a2b59e64b1d03608e7b0f64b1b build: - number: 1 + number: 2 {% if not (environ.get("cuda_compiler_version")|string()) == (major_version|string()) %} skip: true {% endif %} From e64ab497653144c5d153871489da97d828907f35 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Dec 2024 22:13:02 -0500 Subject: [PATCH 4/7] check __version__ --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b70b339..7100bec 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -95,6 +95,8 @@ test: - set "CL=%CL% /I%CONDA_PREFIX%\{{ subdir }}\include" # [win] - cythonize -i -3 test_cimport.pyx - python -c "import test_cimport; test_cimport.test()" + - python -c "import cuda.bindings; print(cuda.bindings.__version__)" + - python -c "import cuda; print(cuda.__version__)" # TODO: Remove this imports: - cuda - cuda.cuda From bfa7d4cf0e66c39d63bf3b130fb70de2c342ecb7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 12 Dec 2024 19:54:35 -0800 Subject: [PATCH 5/7] Update `ordering` in CUDA 12 migrator --- .ci_support/migrations/cuda12x.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci_support/migrations/cuda12x.yaml b/.ci_support/migrations/cuda12x.yaml index 4538d59..6e90190 100644 --- a/.ci_support/migrations/cuda12x.yaml +++ b/.ci_support/migrations/cuda12x.yaml @@ -67,6 +67,8 @@ __migrator: - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.4 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.6 # [((linux and not ppc64le) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 12 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] From 54995a75f2769bb89f0c366cdabd645b9f22d5e5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 03:58:23 +0000 Subject: [PATCH 6/7] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.44.9, and conda-forge-pinning 2024.12.13.03.36.57 --- .azure-pipelines/azure-pipelines-win.yml | 1 + ...sion12cxx_compiler_version12python3.10.____cpython.yaml | 1 - ...sion12cxx_compiler_version12python3.11.____cpython.yaml | 1 - ...sion12cxx_compiler_version12python3.12.____cpython.yaml | 1 - ...ersion12cxx_compiler_version12python3.13.____cp313.yaml | 1 - ...rsion12cxx_compiler_version12python3.9.____cpython.yaml | 1 - ...sion12cxx_compiler_version12python3.10.____cpython.yaml | 5 ----- ...sion12cxx_compiler_version12python3.11.____cpython.yaml | 5 ----- ...sion12cxx_compiler_version12python3.12.____cpython.yaml | 5 ----- ...ersion12cxx_compiler_version12python3.13.____cp313.yaml | 5 ----- ...rsion12cxx_compiler_version12python3.9.____cpython.yaml | 5 ----- .scripts/run_win_build.bat | 1 + README.md | 3 --- build-locally.py | 7 +++++++ 14 files changed, 9 insertions(+), 33 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c7bb10d..772929b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -36,6 +36,7 @@ jobs: displayName: Run Windows build env: MINIFORGE_HOME: $(MINIFORGE_HOME) + CONDA_BLD_PATH: $(CONDA_BLD_PATH) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml index 2f65d77..30f6602 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml @@ -33,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml index b88c3e4..14911de 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml @@ -33,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml index 9423d44..aee2ba4 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml @@ -33,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml index 7c0ac4b..ac57548 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml @@ -33,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml index f1c6d00..5ad9433 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml @@ -33,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml index 7935281..feb1395 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -37,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml index ccbc36b..951bb2c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.11.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -37,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml index 99e7524..7b8fdec 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.12.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -37,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml index 856fb43..41484fc 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.13.____cp313.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -37,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml index 1564f6c..61022b0 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -37,7 +33,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index cc0d2c4..2e7dd39 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -36,6 +36,7 @@ if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% del /S /Q "%MAMBA_ROOT_PREFIX%" >nul del /S /Q "%MICROMAMBA_TMPDIR%" >nul +call :end_group call :start_group "Configuring conda" diff --git a/README.md b/README.md index 681575f..b4e5dfb 100644 --- a/README.md +++ b/README.md @@ -276,6 +276,3 @@ Feedstock Maintainers * [@vyasr](https://github.com/vyasr/) * [@vzhurba01](https://github.com/vzhurba01/) - - - diff --git a/build-locally.py b/build-locally.py index 6788aea..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -26,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" From d0788e8de118eafbdb17b9d619b4ae92c0a85134 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 12 Dec 2024 20:14:00 -0800 Subject: [PATCH 7/7] Use only one `skip` to make `conda-souschef` happy --- recipe/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7100bec..1c365cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,13 +20,12 @@ source: build: number: 2 - {% if not (environ.get("cuda_compiler_version")|string()) == (major_version|string()) %} - skip: true - {% endif %} # `linux_ppc64le` is unsupported by the CUDA Toolkit as of 12.5.0. # So skip building `cuda-python` on `linux_ppc64le` # xref: https://github.com/conda-forge/cuda-feedstock/issues/27 - skip: true # [ppc64le] + {% if ppc64le or not (environ.get("cuda_compiler_version")|string()) == (major_version|string()) %} + skip: true + {% endif %} script: - pushd cuda_bindings - {{ PYTHON }} -m pip install . --no-deps -vv