Address PR feedback

sort.cpp -> merge_sort.cpp, argsort.cpp -> merge_argsort.cpp Refined exception texts thrown when implementation function pointer is found missing.

Author: oleksandr-pavlyk

dpctl/tensor/CMakeLists.txt

@@ -112,8 +112,8 @@ set(_reduction_sources
  ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/reductions/sum.cpp
 )
 set(_sorting_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/sort.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/argsort.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/merge_sort.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/merge_argsort.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/searchsorted.cpp
 )
 set(_sorting_radix_sources

dpctl/tensor/libtensor/source/sorting/argsort.cpp renamed to dpctl/tensor/libtensor/source/sorting/merge_argsort.cpp

@@ -36,7 +36,7 @@
 #include "kernels/sorting/sort_impl_fn_ptr_t.hpp"
 #include "rich_comparisons.hpp"
 
-#include "argsort.hpp"
+#include "merge_argsort.hpp"
 #include "py_argsort_common.hpp"
 
 namespace td_ns = dpctl::tensor::type_dispatch;
@@ -93,7 +93,7 @@ struct DescendingArgSortContigFactory
  }
 };
 
-void init_argsort_dispatch_tables(void)
+void init_merge_argsort_dispatch_tables(void)
 {
  using dpctl::tensor::kernels::sort_contig_fn_ptr_t;
 
@@ -108,9 +108,9 @@ void init_argsort_dispatch_tables(void)
  dtb2.populate_dispatch_table(descending_argsort_contig_dispatch_table);
 }
 
-void init_argsort_functions(py::module_ m)
+void init_merge_argsort_functions(py::module_ m)
 {
- dpctl::tensor::py_internal::init_argsort_dispatch_tables();
+ dpctl::tensor::py_internal::init_merge_argsort_dispatch_tables();
 
  auto py_argsort_ascending = [](const dpctl::tensor::usm_ndarray &src,
  const int trailing_dims_to_sort,

dpctl/tensor/libtensor/source/sorting/sort.hpp renamed to dpctl/tensor/libtensor/source/sorting/merge_argsort.hpp

@@ -35,7 +35,7 @@ namespace tensor
 namespace py_internal
 {
 
-extern void init_sort_functions(py::module_);
+extern void init_merge_argsort_functions(py::module_);
 
 } // namespace py_internal
 } // namespace tensor

dpctl/tensor/libtensor/source/sorting/sort.cpp renamed to dpctl/tensor/libtensor/source/sorting/merge_sort.cpp

@@ -36,9 +36,9 @@
 #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"
-#include "sort.hpp"
 
 namespace td_ns = dpctl::tensor::type_dispatch;
 
@@ -76,7 +76,7 @@ template <typename fnT, typename argTy> struct DescendingSortContigFactory
  }
 };
 
-void init_sort_dispatch_vectors(void)
+void init_merge_sort_dispatch_vectors(void)
 {
  using dpctl::tensor::kernels::sort_contig_fn_ptr_t;
 
@@ -91,9 +91,9 @@ void init_sort_dispatch_vectors(void)
  dtv2.populate_dispatch_vector(descending_sort_contig_dispatch_vector);
 }
 
-void init_sort_functions(py::module_ m)
+void init_merge_sort_functions(py::module_ m)
 {
- dpctl::tensor::py_internal::init_sort_dispatch_vectors();
+ dpctl::tensor::py_internal::init_merge_sort_dispatch_vectors();
 
  auto py_sort_ascending = [](const dpctl::tensor::usm_ndarray &src,
  const int trailing_dims_to_sort,

dpctl/tensor/libtensor/source/sorting/argsort.hpp renamed to dpctl/tensor/libtensor/source/sorting/merge_sort.hpp

@@ -35,7 +35,7 @@ namespace tensor
 namespace py_internal
 {
 
-extern void init_argsort_functions(py::module_);
+extern void init_merge_sort_functions(py::module_);
 
 } // namespace py_internal
 } // namespace tensor

dpctl/tensor/libtensor/source/sorting/py_argsort_common.hpp

@@ -130,7 +130,7 @@ py_argsort(const dpctl::tensor::usm_ndarray &src,
  auto fn = sort_contig_fns[src_typeid][dst_typeid];
 
  if (fn == nullptr) {
- throw py::value_error("Not implemented for given index type");
+ throw py::value_error("Not implemented for dtypes of input arrays");
  }
 
  sycl::event comp_ev =

dpctl/tensor/libtensor/source/sorting/py_sort_common.hpp

@@ -130,6 +130,11 @@ py_sort(const dpctl::tensor::usm_ndarray &src,
 
  auto fn = sort_contig_fns[src_typeid];
 
+ if (nullptr == fn) {
+ throw py::value_error(
+ "Not implemented for the dtype of input arrays");
+ }
+
  sycl::event comp_ev =
  fn(exec_q, iter_nelems, sort_nelems, src.get_data(), dst.get_data(),
  zero_offset, zero_offset, zero_offset, zero_offset, depends);

dpctl/tensor/libtensor/source/tensor_sorting.cpp

@@ -25,15 +25,15 @@
 
 #include <pybind11/pybind11.h>
 
-#include "sorting/argsort.hpp"
+#include "sorting/merge_argsort.hpp"
+#include "sorting/merge_sort.hpp"
 #include "sorting/searchsorted.hpp"
-#include "sorting/sort.hpp"
 
 namespace py = pybind11;
 
 PYBIND11_MODULE(_tensor_sorting_impl, m)
 {
- dpctl::tensor::py_internal::init_sort_functions(m);
- dpctl::tensor::py_internal::init_argsort_functions(m);
+ dpctl::tensor::py_internal::init_merge_sort_functions(m);
+ dpctl::tensor::py_internal::init_merge_argsort_functions(m);
  dpctl::tensor::py_internal::init_searchsorted_functions(m);
 }