From 3c589fb6fa62cc1c613d00e9e7eac4cd1829e88c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 23 Oct 2024 14:53:31 -0700 Subject: [PATCH 1/5] Explicitly list CUDA libs in Python Conda package --- conda/recipes/kvikio/conda_build_config.yaml | 14 ++++++++++++-- conda/recipes/kvikio/meta.yaml | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml index 35cb51e2f9..89f18357ac 100644 --- a/conda/recipes/kvikio/conda_build_config.yaml +++ b/conda/recipes/kvikio/conda_build_config.yaml @@ -4,6 +4,9 @@ c_compiler_version: cxx_compiler_version: - 11 +cmake_version: + - ">=3.26.4,!=3.30.0" + cuda_compiler: - cuda-nvcc @@ -16,8 +19,15 @@ c_stdlib: c_stdlib_version: - "2.17" -cmake_version: - - ">=3.26.4,!=3.30.0" +# The CTK libraries below are missing from the conda-forge::cudatoolkit package +# for CUDA 11. The "*_host_*" version specifiers correspond to `11.8` packages +# and the "*_run_*" version specifiers correspond to `11.x` packages. + +cuda11_libcufile_host_version: + - "1.4.0.31" + +cuda11_libcufile_run_version: + - ">=1.0.0.82,<=1.4.0.31" nvcomp_version: - "=4.0.1" diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 3c41af3310..4e421744fe 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -58,6 +58,10 @@ requirements: - cython >=3.0.0 {% if cuda_major == "11" %} - cudatoolkit + - libcufile {{ cuda11_libcufile_run_version }} # [linux64] + {% else %} + - cuda-cudart-dev + - libcufile-dev # [linux] {% endif %} - cuda-version ={{ cuda_version }} - nvcomp {{ nvcomp_version }} @@ -76,6 +80,10 @@ requirements: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} - cudatoolkit + - libcufile {{ cuda11_libcufile_run_version }} # [linux64] + {% else %} + - cuda-cudart + - libcufile # [linux] {% endif %} test: From 08ca09739a02e73f606eb129a0096425767d17b5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 23 Oct 2024 14:58:56 -0700 Subject: [PATCH 2/5] Set `libcurl` version in `conda_build_config.yaml` --- conda/recipes/kvikio/conda_build_config.yaml | 3 +++ conda/recipes/kvikio/meta.yaml | 2 +- conda/recipes/libkvikio/conda_build_config.yaml | 3 +++ conda/recipes/libkvikio/meta.yaml | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml index 89f18357ac..38a589a4d8 100644 --- a/conda/recipes/kvikio/conda_build_config.yaml +++ b/conda/recipes/kvikio/conda_build_config.yaml @@ -29,5 +29,8 @@ cuda11_libcufile_host_version: cuda11_libcufile_run_version: - ">=1.0.0.82,<=1.4.0.31" +libcurl_version: + - "=7.87.0" + nvcomp_version: - "=4.0.1" diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 4e421744fe..630871e228 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -68,7 +68,7 @@ requirements: - rapids-build-backend >=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.10.0 - libkvikio ={{ version }} - - libcurl==7.87.0 + - libcurl {{ libcurl_version }} run: - python - numpy >=1.23,<3.0a0 diff --git a/conda/recipes/libkvikio/conda_build_config.yaml b/conda/recipes/libkvikio/conda_build_config.yaml index 9cf2923599..5dfadf3ff0 100644 --- a/conda/recipes/libkvikio/conda_build_config.yaml +++ b/conda/recipes/libkvikio/conda_build_config.yaml @@ -28,3 +28,6 @@ cuda11_libcufile_host_version: cuda11_libcufile_run_version: - ">=1.0.0.82,<=1.4.0.31" + +libcurl_version: + - "=7.87.0" diff --git a/conda/recipes/libkvikio/meta.yaml b/conda/recipes/libkvikio/meta.yaml index 999b9fc2c1..4019a55ec8 100644 --- a/conda/recipes/libkvikio/meta.yaml +++ b/conda/recipes/libkvikio/meta.yaml @@ -52,7 +52,7 @@ requirements: {% else %} - libcufile-dev # [linux] {% endif %} - - libcurl==7.87.0 + - libcurl {{ libcurl_version }} outputs: - name: libkvikio @@ -75,7 +75,7 @@ outputs: - cmake {{ cmake_version }} host: - cuda-version ={{ cuda_version }} - - libcurl==7.87.0 + - libcurl {{ libcurl_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} From bb821b7b6e6803ee6ac5eebcd2f7313b5ed9a99c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 21 Nov 2024 13:29:51 -0800 Subject: [PATCH 3/5] Ignore CUDA libs `run_exports` --- conda/recipes/kvikio/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 630871e228..271712ac51 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -37,6 +37,8 @@ build: - {{ compiler('cuda11') }} {% else %} - {{ compiler('cuda') }} + - cuda-cudart-dev + - libcufile-dev # [linux] {% endif %} requirements: From c63b16b6cdde058ca994c3d59439e647c62e70c5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 21 Nov 2024 21:21:37 -0800 Subject: [PATCH 4/5] Another `=`s for `libcurl_version` --- conda/recipes/libkvikio/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libkvikio/conda_build_config.yaml b/conda/recipes/libkvikio/conda_build_config.yaml index 5dfadf3ff0..b895b842f3 100644 --- a/conda/recipes/libkvikio/conda_build_config.yaml +++ b/conda/recipes/libkvikio/conda_build_config.yaml @@ -30,4 +30,4 @@ cuda11_libcufile_run_version: - ">=1.0.0.82,<=1.4.0.31" libcurl_version: - - "=7.87.0" + - "==7.87.0" From a56c5f6f792c679b62f7b23f255596ffded2f45e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 21 Nov 2024 21:23:25 -0800 Subject: [PATCH 5/5] Also `==` for Python's `libcurl_version` --- conda/recipes/kvikio/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml index 1bacdfd2a2..639a56f509 100644 --- a/conda/recipes/kvikio/conda_build_config.yaml +++ b/conda/recipes/kvikio/conda_build_config.yaml @@ -30,7 +30,7 @@ cuda11_libcufile_run_version: - ">=1.0.0.82,<=1.4.0.31" libcurl_version: - - "=7.87.0" + - "==7.87.0" nvcomp_version: - "=4.1.0.6"