Merge branch 'branch-24.10' into cagra-bf

rapidsai · Sep 24, 2024 · 7a3c901 · 7a3c901
2 parents 89ea7d7 + b79f15d
commit 7a3c901
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -58,7 +58,7 @@ for FILE in dependencies.yaml conda/environments/*.yaml; do
  sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
  done
  for DEP in "${UCXX_DEPENDENCIES[@]}"; do
- sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_UCXX_SHORT_TAG_PEP440}.*/,>=0.0.0a0/g" "${FILE}"
+ sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_UCXX_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
  done
 done
 for FILE in python/*/pyproject.toml; do

diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml
@@ -73,7 +73,7 @@ cuda11_cuda_profiler_api_run_version:
  - ">=11.4.240,<12"
 
 spdlog_version:
- - ">=1.12.0,<1.13"
+ - ">=1.14.1,<1.15"
 
 fmt_version:
- - ">=10.1.1,<11"
+ - ">=11.0.2,<12"
diff --git a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml
@@ -23,7 +23,7 @@ nlohmann_json_version:
  - ">=3.11.2"
 
 spdlog_version:
- - ">=1.12.0,<1.13"
+ - ">=1.14.1,<1.15"
 
 fmt_version:
- - ">=10.1.1,<11"
+ - ">=11.0.2,<12"
diff --git a/cpp/cmake/thirdparty/get_spdlog.cmake b/cpp/cmake/thirdparty/get_spdlog.cmake
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2021-2023, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -19,15 +19,6 @@ function(find_and_configure_spdlog)
  rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports)
  rapids_export_package(BUILD spdlog rmm-exports)
 
- if(spdlog_ADDED)
- rapids_export(
- BUILD spdlog
- EXPORT_SET spdlog
- GLOBAL_TARGETS spdlog spdlog_header_only
- NAMESPACE spdlog::)
- include("${rapids-cmake-dir}/export/find_package_root.cmake")
- rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET rmm-exports)
- endif()
 endfunction()
 
 find_and_configure_spdlog()
diff --git a/cpp/include/raft/linalg/detail/eig.cuh b/cpp/include/raft/linalg/detail/eig.cuh
@@ -95,16 +95,19 @@ void eigDC(raft::resources const& handle,
  return;
 #endif
 
-#if CUDART_VERSION <= 12040
- // Use a new stream instead of `cudaStreamPerThread` to avoid cusolver bug # 4580093.
+ int cudart_version = 0;
+ RAFT_CUDA_TRY(cudaRuntimeGetVersion(&cudart_version));
+ cudaStream_t stream_new;
+ cudaEvent_t sync_event = resource::detail::get_cuda_stream_sync_event(handle);
  rmm::cuda_stream stream_new_wrapper;
- cudaStream_t stream_new = stream_new_wrapper.value();
- cudaEvent_t sync_event = resource::detail::get_cuda_stream_sync_event(handle);
- RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream));
- RAFT_CUDA_TRY(cudaStreamWaitEvent(stream_new, sync_event));
-#else
- cudaStream_t stream_new = stream;
-#endif
+ if (cudart_version < 12050) {
+ // Use a new stream instead of `cudaStreamPerThread` to avoid cusolver bug # 4580093.
+ stream_new = stream_new_wrapper.value();
+ RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream));
+ RAFT_CUDA_TRY(cudaStreamWaitEvent(stream_new, sync_event));
+ } else {
+ stream_new = stream;
+ }
  cusolverDnHandle_t cusolverH = resource::get_cusolver_dn_handle(handle);
 
  cusolverDnParams_t dn_params = nullptr;
@@ -152,11 +155,11 @@ void eigDC(raft::resources const& handle,
  "eig.cuh: eigensolver couldn't converge to a solution. "
  "This usually occurs when some of the features do not vary enough.");
 
-#if CUDART_VERSION <= 12040
- // Synchronize the created stream with the original stream before return
- RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream_new));
- RAFT_CUDA_TRY(cudaStreamWaitEvent(stream, sync_event));
-#endif
+ if (cudart_version < 12050) {
+  // Synchronize the created stream with the original stream before return
+  RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream_new));
+  RAFT_CUDA_TRY(cudaStreamWaitEvent(stream, sync_event));
+ }
 }
 
 enum EigVecMemUsage { OVERWRITE_INPUT, COPY_INPUT };