move rich_comparisons.hpp into utils

allows these comparisons to be shared outside of sorting more conveniently

Author: ndgrigorian

dpctl/tensor/libtensor/source/sorting/rich_comparisons.hpp renamed to dpctl/tensor/libtensor/include/utils/rich_comparisons.hpp

@@ -31,7 +31,7 @@ namespace dpctl
 {
 namespace tensor
 {
-namespace py_internal
+namespace rich_comparisons
 {
 
 namespace detail
@@ -129,6 +129,6 @@ template <typename T> struct DescendingSorter<std::complex<T>>
  using type = detail::ExtendedComplexFPGreater<std::complex<T>>;
 };
 
-} // end of namespace py_internal
+} // end of namespace rich_comparisons
 } // end of namespace tensor
 } // end of namespace dpctl

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

@@ -35,11 +35,11 @@
 #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"
 
-#include "rich_comparisons.hpp"
 #include "simplify_iteration_space.hpp"
 
 namespace py = pybind11;
@@ -68,7 +68,10 @@ 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>;
  }
 };
@@ -85,7 +88,10 @@ 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>;
  }
 };

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

@@ -30,11 +30,11 @@
 #include "utils/math_utils.hpp"
 #include "utils/memory_overlap.hpp"
 #include "utils/output_validation.hpp"
+#include "utils/rich_comparisons.hpp"
 #include "utils/type_dispatch.hpp"
 
 #include "kernels/sorting/merge_sort.hpp"
 #include "kernels/sorting/sort_impl_fn_ptr_t.hpp"
-#include "rich_comparisons.hpp"
 
 #include "merge_argsort.hpp"
 #include "py_argsort_common.hpp"
@@ -63,6 +63,7 @@ struct AscendingArgSortContigFactory
  if constexpr (std::is_same_v<IndexTy, std::int64_t> ||
  std::is_same_v<IndexTy, std::int32_t>)
  {
+ using dpctl::tensor::rich_comparisons::AscendingSorter;
  using Comp = typename AscendingSorter<argTy>::type;
 
  using dpctl::tensor::kernels::stable_argsort_axis1_contig_impl;
@@ -82,6 +83,7 @@ struct DescendingArgSortContigFactory
  if constexpr (std::is_same_v<IndexTy, std::int64_t> ||
  std::is_same_v<IndexTy, std::int32_t>)
  {
+ using dpctl::tensor::rich_comparisons::DescendingSorter;
  using Comp = typename DescendingSorter<argTy>::type;
 
  using dpctl::tensor::kernels::stable_argsort_axis1_contig_impl;

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

@@ -31,14 +31,14 @@
 #include "utils/math_utils.hpp"
 #include "utils/memory_overlap.hpp"
 #include "utils/output_validation.hpp"
+#include "utils/rich_comparisons.hpp"
 #include "utils/type_dispatch.hpp"
 
 #include "kernels/sorting/merge_sort.hpp"
 #include "kernels/sorting/sort_impl_fn_ptr_t.hpp"
 
 #include "merge_sort.hpp"
 #include "py_sort_common.hpp"
-#include "rich_comparisons.hpp"
 
 namespace td_ns = dpctl::tensor::type_dispatch;
 
@@ -59,6 +59,7 @@ template <typename fnT, typename argTy> struct AscendingSortContigFactory
 {
  fnT get()
  {
+ using dpctl::tensor::rich_comparisons::AscendingSorter;
  using Comp = typename AscendingSorter<argTy>::type;
 
  using dpctl::tensor::kernels::stable_sort_axis1_contig_impl;
@@ -70,7 +71,9 @@ template <typename fnT, typename argTy> struct DescendingSortContigFactory
 {
  fnT get()
  {
+ using dpctl::tensor::rich_comparisons::DescendingSorter;
  using Comp = typename DescendingSorter<argTy>::type;
+
  using dpctl::tensor::kernels::stable_sort_axis1_contig_impl;
  return stable_sort_axis1_contig_impl<argTy, Comp>;
  }

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

@@ -35,11 +35,11 @@
 #include "kernels/sorting/searchsorted.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"
 
-#include "rich_comparisons.hpp"
 #include "simplify_iteration_space.hpp"
 
 namespace py = pybind11;
@@ -76,6 +76,7 @@ struct LeftSideSearchSortedContigFactory
  {
  static constexpr bool left_side_search(true);
  using dpctl::tensor::kernels::searchsorted_contig_impl;
+ using dpctl::tensor::rich_comparisons::AscendingSorter;
 
  using Compare = typename AscendingSorter<argTy>::type;
 
@@ -99,7 +100,9 @@ struct RightSideSearchSortedContigFactory
  std::is_same_v<indTy, std::int64_t>)
  {
  static constexpr bool right_side_search(false);
+
  using dpctl::tensor::kernels::searchsorted_contig_impl;
+ using dpctl::tensor::rich_comparisons::AscendingSorter;
 
  using Compare = typename AscendingSorter<argTy>::type;
 
@@ -132,6 +135,7 @@ struct LeftSideSearchSortedStridedFactory
  {
  static constexpr bool left_side_search(true);
  using dpctl::tensor::kernels::searchsorted_strided_impl;
+ using dpctl::tensor::rich_comparisons::AscendingSorter;
 
  using Compare = typename AscendingSorter<argTy>::type;
 
@@ -156,6 +160,7 @@ struct RightSideSearchSortedStridedFactory
  {
  static constexpr bool right_side_search(false);
  using dpctl::tensor::kernels::searchsorted_strided_impl;
+ using dpctl::tensor::rich_comparisons::AscendingSorter;
 
  using Compare = typename AscendingSorter<argTy>::type;
 

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

@@ -41,10 +41,10 @@
 #include "utils/math_utils.hpp"
 #include "utils/memory_overlap.hpp"
 #include "utils/output_validation.hpp"
+#include "utils/rich_comparisons.hpp"
 #include "utils/type_dispatch.hpp"
 #include "utils/type_utils.hpp"
 
-#include "rich_comparisons.hpp"
 #include "topk.hpp"
 
 namespace dpctl
@@ -110,15 +110,16 @@ sycl::event topk_caller(sycl::queue &exec_q,
  using dpctl::tensor::kernels::topk_merge_impl;
  if (largest) {
  using CompTy =
- typename dpctl::tensor::py_internal::DescendingSorter<
+ typename dpctl::tensor::rich_comparisons::DescendingSorter<
  argTy>::type;
  return topk_merge_impl<argTy, IndexTy, CompTy>(
  exec_q, iter_nelems, axis_nelems, k, arg_cp, vals_cp, inds_cp,
  depends);
  }
  else {
- using CompTy = typename dpctl::tensor::py_internal::AscendingSorter<
- argTy>::type;
+ using CompTy =
+ typename dpctl::tensor::rich_comparisons::AscendingSorter<
+ argTy>::type;
  return topk_merge_impl<argTy, IndexTy, CompTy>(
  exec_q, iter_nelems, axis_nelems, k, arg_cp, vals_cp, inds_cp,
  depends);