Merge branch 'branch-24.12' into enh_nccl_subcomm

rapidsai · Nov 18, 2024 · 9550466 · 9550466
2 parents 2b2abfe + 7ab2b3d
commit 9550466
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 1,670 deletions.
diff --git a/cpp/include/raft/distance/fused_distance_nn-ext.cuh b/cpp/include/raft/distance/fused_distance_nn-ext.cuh
diff --git a/cpp/include/raft/distance/fused_distance_nn.cuh b/cpp/include/raft/distance/fused_distance_nn.cuh
@@ -15,10 +15,4 @@
  */
 #pragma once
 
-#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
-#include "fused_distance_nn-inl.cuh"
-#endif
-
-#ifdef RAFT_COMPILED
-#include "fused_distance_nn-ext.cuh"
-#endif
+#include "fused_distance_nn-inl.cuh"
diff --git a/cpp/include/raft/linalg/detail/coalesced_reduction-ext.cuh b/cpp/include/raft/linalg/detail/coalesced_reduction-ext.cuh
diff --git a/cpp/include/raft/linalg/detail/coalesced_reduction.cuh b/cpp/include/raft/linalg/detail/coalesced_reduction.cuh
@@ -16,11 +16,4 @@
 
 #pragma once
 
-// Always include inline definitions of coalesced reduction, because we do not
-// force explicit instantion.
 #include "coalesced_reduction-inl.cuh"
-
-// Do include the extern template instantiations when possible.
-#ifdef RAFT_COMPILED
-#include "coalesced_reduction-ext.cuh"
-#endif