factor out compare template param in isin

Author: ndgrigorian

dpctl/tensor/libtensor/include/kernels/sorting/isin.hpp

@@ -34,6 +34,7 @@
 #include "kernels/dpctl_tensor_types.hpp"
 #include "kernels/sorting/search_sorted_detail.hpp"
 #include "utils/offset_utils.hpp"
+#include "utils/rich_comparisons.hpp"
 
 namespace dpctl
 {
@@ -47,8 +48,7 @@ using dpctl::tensor::ssize_t;
 template <typename T,
           typename HayIndexerT,
           typename NeedlesIndexerT,
-          typename OutIndexerT,
-          typename Compare>
+          typename OutIndexerT>
 struct IsinFunctor
 {
 private:
@@ -78,6 +78,8 @@ struct IsinFunctor
 
     void operator()(sycl::id<1> id) const
     {
+        using Compare =
+            typename dpctl::tensor::rich_comparisons::AscendingSorter<T>::type;
         static constexpr Compare comp{};
 
         const std::size_t i = id[0];
@@ -115,7 +117,7 @@ typedef sycl::event (*isin_contig_impl_fp_ptr_t)(
 
 template <typename T> class isin_contig_impl_krn;
 
-template <typename T, typename Compare>
+template <typename T>
 sycl::event isin_contig_impl(sycl::queue &exec_q,
                              const bool invert,
                              const std::size_t hay_nelems,
@@ -148,9 +150,9 @@ sycl::event isin_contig_impl(sycl::queue &exec_q,
         static constexpr TrivialIndexerT out_indexer{};
 
         const auto fnctr =
-            IsinFunctor<T, TrivialIndexerT, TrivialIndexerT, TrivialIndexerT,
-                        Compare>(invert, hay_tp, needles_tp, out_tp, hay_nelems,
-                                 hay_indexer, needles_indexer, out_indexer);
+            IsinFunctor<T, TrivialIndexerT, TrivialIndexerT, TrivialIndexerT>(
+                invert, hay_tp, needles_tp, out_tp, hay_nelems, hay_indexer,
+                needles_indexer, out_indexer);
 
         cgh.parallel_for<KernelName>(gRange, fnctr);
     });
@@ -176,7 +178,7 @@ typedef sycl::event (*isin_strided_impl_fp_ptr_t)(
 
 template <typename T> class isin_strided_impl_krn;
 
-template <typename T, typename Compare>
+template <typename T>
 sycl::event isin_strided_impl(
     sycl::queue &exec_q,
     const bool invert,
@@ -224,7 +226,7 @@ sycl::event isin_strided_impl(
                                       out_strides);
 
         const auto fnctr =
-            IsinFunctor<T, HayIndexerT, NeedlesIndexerT, OutIndexerT, Compare>(
+            IsinFunctor<T, HayIndexerT, NeedlesIndexerT, OutIndexerT>(
                 invert, hay_tp, needles_tp, out_tp, hay_nelems, hay_indexer,
                 needles_indexer, out_indexer);
         using KernelName = class isin_strided_impl_krn<T>;

dpctl/tensor/libtensor/source/sorting/isin.cpp

@@ -35,7 +35,6 @@
 #include "kernels/sorting/isin.hpp"
 #include "utils/memory_overlap.hpp"
 #include "utils/output_validation.hpp"
-#include "utils/rich_comparisons.hpp"
 #include "utils/sycl_alloc_utils.hpp"
 #include "utils/type_dispatch.hpp"
 #include "utils/type_utils.hpp"
@@ -68,11 +67,7 @@ template <typename fnT, typename argTy> struct IsinContigFactory
     fnT get() const
     {
         using dpctl::tensor::kernels::isin_contig_impl;
-        using dpctl::tensor::rich_comparisons::AscendingSorter;
-
-        using Compare = typename AscendingSorter<argTy>::type;
-
-        return isin_contig_impl<argTy, Compare>;
+        return isin_contig_impl<argTy>;
     }
 };
 
@@ -88,11 +83,7 @@ template <typename fnT, typename argTy> struct IsinStridedFactory
     fnT get() const
     {
         using dpctl::tensor::kernels::isin_strided_impl;
-        using dpctl::tensor::rich_comparisons::AscendingSorter;
-
-        using Compare = typename AscendingSorter<argTy>::type;
-
-        return isin_strided_impl<argTy, Compare>;
+        return isin_strided_impl<argTy>;
     }
 };