Module renaming & small fixes

Author: AlexanderKalistratov

dpnp/CMakeLists.txt

@@ -58,7 +58,7 @@ add_subdirectory(backend/extensions/fft)
 add_subdirectory(backend/extensions/lapack)
 add_subdirectory(backend/extensions/vm)
 add_subdirectory(backend/extensions/ufunc)
-add_subdirectory(backend/extensions/sycl_ext)
+add_subdirectory(backend/extensions/statistics)
 
 add_subdirectory(dpnp_algo)
 add_subdirectory(dpnp_utils)

dpnp/backend/extensions/sycl_ext/CMakeLists.txt renamed to dpnp/backend/extensions/statistics/CMakeLists.txt

@@ -24,11 +24,11 @@
 # *****************************************************************************
 
 
-set(python_module_name _sycl_ext_impl)
+set(python_module_name _statistics_impl)
 set(_module_src
     ${CMAKE_CURRENT_SOURCE_DIR}/histogram.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/histogram_common.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sycl_ext_py.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/statistics_py.cpp
 )
 
 pybind11_add_module(${python_module_name} MODULE ${_module_src})
@@ -83,5 +83,5 @@ if (DPNP_GENERATE_COVERAGE)
 endif()
 
 install(TARGETS ${python_module_name}
-  DESTINATION "dpnp/backend/extensions/sycl_ext"
+  DESTINATION "dpnp/backend/extensions/statistics"
 )

dpnp/backend/extensions/statistics/__init__.py

@@ -0,0 +1,3 @@
+from dpnp.backend.extensions.statistics._statistics_impl import histogram
+
+__all__ = ["histogram"]

dpnp/backend/extensions/sycl_ext/histogram.cpp renamed to dpnp/backend/extensions/statistics/histogram.cpp

@@ -44,7 +44,7 @@
 namespace dpctl_td_ns = dpctl::tensor::type_dispatch;
 using dpctl::tensor::usm_ndarray;
 
-using namespace histogram;
+using namespace statistics::histogram;
 
 namespace
 {
@@ -175,7 +175,7 @@ struct ContigFactory
     }
 };
 
-using sycl_ext::histogram::Histogram;
+using statistics::histogram::Histogram;
 
 Histogram::FnT
     dispatch(Histogram *hist, int data_typenum, int, int hist_typenum)
@@ -248,7 +248,7 @@ std::tuple<sycl::event, sycl::event>
 
 std::unique_ptr<Histogram> hist;
 
-void sycl_ext::histogram::populate_histogram(py::module_ m)
+void statistics::histogram::populate_histogram(py::module_ m)
 {
     using namespace std::placeholders;
 

dpnp/backend/extensions/sycl_ext/histogram.hpp renamed to dpnp/backend/extensions/statistics/histogram.hpp

@@ -29,7 +29,7 @@
 
 namespace dpctl_td_ns = dpctl::tensor::type_dispatch;
 
-namespace sycl_ext
+namespace statistics
 {
 namespace histogram
 {
@@ -58,4 +58,4 @@ struct Histogram
 
 void populate_histogram(py::module_ m);
 } // namespace histogram
-} // namespace sycl_ext
+} // namespace statistics

dpnp/backend/extensions/sycl_ext/histogram_common.cpp renamed to dpnp/backend/extensions/statistics/histogram_common.cpp

@@ -39,6 +39,8 @@ namespace dpctl_td_ns = dpctl::tensor::type_dispatch;
 using dpctl::tensor::usm_ndarray;
 using dpctl_td_ns::typenum_t;
 
+namespace statistics
+{
 namespace histogram
 {
 
@@ -194,3 +196,4 @@ void validate(const usm_ndarray &sample,
 }
 
 } // namespace histogram
+} // namespace statistics

dpnp/backend/extensions/sycl_ext/histogram_common.hpp renamed to dpnp/backend/extensions/statistics/histogram_common.hpp

@@ -39,6 +39,8 @@ class usm_ndarray;
 
 using dpctl::tensor::usm_ndarray;
 
+namespace statistics
+{
 namespace histogram
 {
 
@@ -466,3 +468,4 @@ void validate(const usm_ndarray &sample,
               std::optional<const dpctl::tensor::usm_ndarray> &weights,
               const usm_ndarray &histogram);
 } // namespace histogram
+} // namespace statistics

dpnp/backend/extensions/sycl_ext/sycl_ext_py.cpp renamed to dpnp/backend/extensions/statistics/statistics_py.cpp

@@ -32,7 +32,7 @@
 
 #include "histogram.hpp"
 
-PYBIND11_MODULE(_sycl_ext_impl, m)
+PYBIND11_MODULE(_statistics_impl, m)
 {
-    sycl_ext::histogram::populate_histogram(m);
+    statistics::histogram::populate_histogram(m);
 }

dpnp/dpnp_iface_histograms.py

@@ -44,9 +44,7 @@
 import numpy
 
 import dpnp
-
-# pylint: disable=no-name-in-module
-import dpnp.backend.extensions.sycl_ext._sycl_ext_impl as sycl_ext
+import dpnp.backend.extensions.statistics as statistics_ext
 
 # pylint: disable=no-name-in-module
 from .dpnp_utils import map_dtype_to_device
@@ -207,19 +205,6 @@ def _get_bin_edges(a, bins, range, usm_type):
     return bin_edges, None
 
 
-def _search_sorted_inclusive(a, v):
-    """
-    Like :obj:`dpnp.searchsorted`, but where the last item in `v` is placed
-    on the right.
-    In the context of a histogram, this makes the last bin edge inclusive
-
-    """
-
-    return dpnp.concatenate(
-        (a.searchsorted(v[:-1], "left"), a.searchsorted(v[-1:], "right"))
-    )
-
-
 def digitize(x, bins, right=False):
     """
     Return the indices of the bins to which each value in input array belongs.
@@ -452,6 +437,9 @@ def histogram(a, bins=10, range=None, density=None, weights=None):
 
     """
 
+    print(statistics_ext)
+    print(dir(statistics_ext))
+
     a, weights, usm_type = _ravel_check_a_and_weights(a, weights)
 
     bin_edges, _ = _get_bin_edges(a, bins, range, usm_type)
@@ -509,7 +497,7 @@ def histogram(a, bins=10, range=None, density=None, weights=None):
     )
     n_usm = dpnp.get_usm_ndarray(n_casted)
 
-    ht_ev, mem_ev = sycl_ext.histogram(
+    ht_ev, mem_ev = statistics_ext.histogram(
         a_usm,
         bins_usm,
         weights_usm,