From 1866120665da322ba3867c50fa0bbfd843a1b1e2 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Apr 2023 14:52:41 -0700 Subject: [PATCH] Use pin_compatible to ensure that lower CTKs can be used (#1462) The runtime requirement for the CTK is weaker than the build-time requirement. We allow installing raft into environments with an older CTK (any 11.x) than the build requirement (11.8) Authors: - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Corey J. Nolet (https://github.com/cjnolet) - Divye Gala (https://github.com/divyegala) - AJ Schmidt (https://github.com/ajschmidt8) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/raft/pull/1462 --- conda/recipes/libraft/meta.yaml | 7 ++++++- cpp/include/raft/distance/detail/kernels/gram_matrix.cuh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 8ec9cc10c6..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 @@ -68,7 +71,6 @@ outputs: run: - {{ 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 }} @@ -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 }} 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