From 8f985afb7374137edf6acb00fa6be6f3ab0732d5 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Apr 2023 11:48:14 -0700 Subject: [PATCH 1/5] Use pin_compatible for the CTK rather than pinning a specific version --- conda/recipes/libraft/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 8ec9cc10c6..b95b06fa47 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -66,9 +66,9 @@ outputs: - librmm requirements: run: + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - {{ pin_subpackage('libraft-headers-only', exact=True) }} - cuda-profiler-api {{ cuda_profiler_api_run_version }} - - cudatoolkit {{ cuda_version }} - librmm ={{ minor_version }} - libcublas {{ libcublas_run_version }} - libcublas-dev {{ libcublas_run_version }} From 617072fa8dd290e97e3ab03025f62d4568165bbc Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Apr 2023 12:00:06 -0700 Subject: [PATCH 2/5] Use cuda spec instead --- conda/recipes/libraft/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index b95b06fa47..7b42ba448d 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -66,8 +66,8 @@ outputs: - librmm requirements: run: - - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - {{ pin_subpackage('libraft-headers-only', exact=True) }} + - cuda_toolkit {{ cuda_spec }} - cuda-profiler-api {{ cuda_profiler_api_run_version }} - librmm ={{ minor_version }} - libcublas {{ libcublas_run_version }} From 75e16bffdf352c9c5f8d8f00a8b02b535ccbf256 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Apr 2023 12:00:46 -0700 Subject: [PATCH 3/5] clang-format --- cpp/include/raft/distance/detail/kernels/gram_matrix.cuh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/include/raft/distance/detail/kernels/gram_matrix.cuh b/cpp/include/raft/distance/detail/kernels/gram_matrix.cuh index a68b904470..2154aa560c 100644 --- a/cpp/include/raft/distance/detail/kernels/gram_matrix.cuh +++ b/cpp/include/raft/distance/detail/kernels/gram_matrix.cuh @@ -20,7 +20,7 @@ #include #include #include -//#include +// #include #include #include From 61c37f683e2cd63c8d13ff52cfdb9aeca6d6541b Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Apr 2023 12:23:33 -0700 Subject: [PATCH 4/5] Fix name --- conda/recipes/libraft/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 7b42ba448d..1d9f5d646e 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -67,7 +67,7 @@ outputs: requirements: run: - {{ pin_subpackage('libraft-headers-only', exact=True) }} - - cuda_toolkit {{ cuda_spec }} + - cudatoolkit {{ cuda_spec }} - cuda-profiler-api {{ cuda_profiler_api_run_version }} - librmm ={{ minor_version }} - libcublas {{ libcublas_run_version }} From 9d62fb26526b587858522bd76ccfce9d7547e027 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Apr 2023 13:22:46 -0700 Subject: [PATCH 5/5] Add run requirements for headers-only and use hard pins for the host sections of all outputs that compile --- conda/recipes/libraft/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 1d9f5d646e..83468d90af 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -52,6 +52,9 @@ outputs: host: - librmm ={{ minor_version }} - cudatoolkit {{ cuda_version }} + run: + - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} + - librmm ={{ minor_version }} about: home: https://rapids.ai/ license: Apache-2.0 @@ -67,7 +70,6 @@ outputs: requirements: run: - {{ pin_subpackage('libraft-headers-only', exact=True) }} - - cudatoolkit {{ cuda_spec }} - cuda-profiler-api {{ cuda_profiler_api_run_version }} - librmm ={{ minor_version }} - libcublas {{ libcublas_run_version }} @@ -101,6 +103,7 @@ outputs: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {{ pin_subpackage('libraft-headers', exact=True) }} + - cudatoolkit {{ cuda_version }} - cuda-profiler-api {{ cuda_profiler_api_host_version }} - libcublas {{ libcublas_host_version }} - libcublas-dev {{ libcublas_host_version }} @@ -135,6 +138,7 @@ outputs: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {{ pin_subpackage('libraft', exact=True) }} + - cudatoolkit {{ cuda_version }} - cuda-profiler-api {{ cuda_profiler_api_host_version }} - gmock {{ gtest_version }} - gtest {{ gtest_version }} @@ -200,6 +204,7 @@ outputs: - sysroot_{{ target_platform }} {{ sysroot_version }} host: - {{ pin_subpackage('libraft', exact=True) }} + - cudatoolkit {{ cuda_version }} - libcublas {{ libcublas_host_version }} - libcublas-dev {{ libcublas_host_version }} - glog {{ glog_version }}