Separate fused_l2_nn_helpers

These types are not used in the ext header, but are useful to have.

cpp/include/raft/distance/fused_l2_nn-ext.cuh

@@ -16,23 +16,17 @@
 
 #pragma once
 
-#include <cstdint>                         // int64_t
-#include <raft/core/device_resources.hpp>  // raft::device_resources
-#include <raft/core/kvp.hpp>               // raft::KeyValuePair
-#include <raft/util/raft_explicit.hpp>     // RAFT_EXPLICIT
+#include <cstdint>                                // int64_t
+#include <raft/core/device_resources.hpp>         // raft::device_resources
+#include <raft/core/kvp.hpp>                      // raft::KeyValuePair
+#include <raft/distance/fused_l2_nn_helpers.cuh>  // include initialize and reduce operations
+#include <raft/util/raft_explicit.hpp>            // RAFT_EXPLICIT
 
 #ifdef RAFT_EXPLICIT_INSTANTIATE_ONLY
 
 namespace raft {
 namespace distance {
 
-template <typename DataT, typename OutT, typename IdxT, typename ReduceOpT>
-void initialize(raft::device_resources const& handle,
-                OutT* min,
-                IdxT m,
-                DataT maxVal,
-                ReduceOpT redOp) RAFT_EXPLICIT;
-
 template <typename DataT, typename OutT, typename IdxT>
 void fusedL2NNMinReduce(OutT* min,
                         const DataT* x,

cpp/include/raft/distance/fused_l2_nn-inl.cuh

@@ -23,38 +23,14 @@
 #include <limits>
 #include <raft/core/device_resources.hpp>
 #include <raft/distance/detail/fused_l2_nn.cuh>
+#include <raft/distance/fused_l2_nn_helpers.cuh>
 #include <raft/linalg/contractions.cuh>
 #include <raft/util/cuda_utils.cuh>
 #include <stdint.h>
 #include <type_traits>
 
 namespace raft {
 namespace distance {
-/**
- * \defgroup fused_l2_nn Fused 1-nearest neighbors
- * @{
- */
-
-template <typename LabelT, typename DataT>
-using KVPMinReduce = detail::KVPMinReduceImpl<LabelT, DataT>;
-
-template <typename LabelT, typename DataT>
-using MinAndDistanceReduceOp = detail::MinAndDistanceReduceOpImpl<LabelT, DataT>;
-
-template <typename LabelT, typename DataT>
-using MinReduceOp = detail::MinReduceOpImpl<LabelT, DataT>;
-
-/** @} */
-
-/**
- * Initialize array using init value from reduction op
- */
-template <typename DataT, typename OutT, typename IdxT, typename ReduceOpT>
-void initialize(
-  raft::device_resources const& handle, OutT* min, IdxT m, DataT maxVal, ReduceOpT redOp)
-{
-  detail::initialize<DataT, OutT, IdxT, ReduceOpT>(min, m, maxVal, redOp, handle.get_stream());
-}
 
 /**
  * \ingroup fused_l2_nn

cpp/include/raft/distance/fused_l2_nn_helpers.cuh

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023, 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <raft/distance/detail/fused_l2_nn.cuh>
+
+namespace raft::distance {
+
+/**
+ * \defgroup fused_l2_nn Fused 1-nearest neighbors
+ * @{
+ */
+
+template <typename LabelT, typename DataT>
+using KVPMinReduce = detail::KVPMinReduceImpl<LabelT, DataT>;
+
+template <typename LabelT, typename DataT>
+using MinAndDistanceReduceOp = detail::MinAndDistanceReduceOpImpl<LabelT, DataT>;
+
+template <typename LabelT, typename DataT>
+using MinReduceOp = detail::MinReduceOpImpl<LabelT, DataT>;
+
+/** @} */
+
+/**
+ * Initialize array using init value from reduction op
+ */
+template <typename DataT, typename OutT, typename IdxT, typename ReduceOpT>
+void initialize(
+  raft::device_resources const& handle, OutT* min, IdxT m, DataT maxVal, ReduceOpT redOp)
+{
+  detail::initialize<DataT, OutT, IdxT, ReduceOpT>(min, m, maxVal, redOp, handle.get_stream());
+}
+
+}  // namespace raft::distance