Remove redundant dpctl::tensor::py_internal qualifiers

Author: vlad-perevezentsev

dpctl_ext/tensor/libtensor/source/accumulators.cpp

@@ -196,8 +196,8 @@ std::size_t py_mask_positions(const dpctl::tensor::usm_ndarray &mask,
     int mask_nd = mask.get_ndim();
     int nd = mask_nd;
 
-    dpctl::tensor::py_internal::compact_iteration_space(
-        nd, shape, strides_vector, compact_shape, compact_strides);
+    compact_iteration_space(nd, shape, strides_vector, compact_shape,
+                            compact_strides);
 
     // Strided implementation
     auto strided_fn =
@@ -351,8 +351,8 @@ std::size_t py_cumsum_1d(const dpctl::tensor::usm_ndarray &src,
     int src_nd = src.get_ndim();
     int nd = src_nd;
 
-    dpctl::tensor::py_internal::compact_iteration_space(
-        nd, shape, strides_vector, compact_shape, compact_strides);
+    compact_iteration_space(nd, shape, strides_vector, compact_shape,
+                            compact_strides);
 
     // Strided implementation
     auto strided_fn = cumsum_1d_strided_dispatch_vector[src_typeid];

dpctl_ext/tensor/libtensor/source/boolean_advanced_indexing.cpp

@@ -336,21 +336,19 @@ std::pair<sycl::event, sycl::event>
         shT masked_src_shape;
         shT ortho_src_strides;
         shT masked_src_strides;
-        dpctl::tensor::py_internal::split_iteration_space(
-            src_shape_vec, src_strides_vec, axis_start, axis_end,
-            ortho_src_shape,
-            masked_src_shape, // 4 vectors modified
-            ortho_src_strides, masked_src_strides);
+        split_iteration_space(src_shape_vec, src_strides_vec, axis_start,
+                              axis_end, ortho_src_shape,
+                              masked_src_shape, // 4 vectors modified
+                              ortho_src_strides, masked_src_strides);
 
         shT ortho_dst_shape;
         shT masked_dst_shape;
         shT ortho_dst_strides;
         shT masked_dst_strides;
-        dpctl::tensor::py_internal::split_iteration_space(
-            dst_shape_vec, dst_strides_vec, axis_start, axis_start + 1,
-            ortho_dst_shape,
-            masked_dst_shape, // 4 vectors modified
-            ortho_dst_strides, masked_dst_strides);
+        split_iteration_space(dst_shape_vec, dst_strides_vec, axis_start,
+                              axis_start + 1, ortho_dst_shape,
+                              masked_dst_shape, // 4 vectors modified
+                              ortho_dst_strides, masked_dst_strides);
 
         assert(ortho_src_shape.size() == static_cast<std::size_t>(ortho_nd));
         assert(ortho_dst_shape.size() == static_cast<std::size_t>(ortho_nd));
@@ -366,7 +364,7 @@ std::pair<sycl::event, sycl::event>
         py::ssize_t ortho_src_offset(0);
         py::ssize_t ortho_dst_offset(0);
 
-        dpctl::tensor::py_internal::simplify_iteration_space(
+        simplify_iteration_space(
             ortho_nd, _shape, ortho_src_strides, ortho_dst_strides,
             // output
             simplified_ortho_shape, simplified_ortho_src_strides,
@@ -646,21 +644,19 @@ std::pair<sycl::event, sycl::event>
         shT masked_dst_shape;
         shT ortho_dst_strides;
         shT masked_dst_strides;
-        dpctl::tensor::py_internal::split_iteration_space(
-            dst_shape_vec, dst_strides_vec, axis_start, axis_end,
-            ortho_dst_shape,
-            masked_dst_shape, // 4 vectors modified
-            ortho_dst_strides, masked_dst_strides);
+        split_iteration_space(dst_shape_vec, dst_strides_vec, axis_start,
+                              axis_end, ortho_dst_shape,
+                              masked_dst_shape, // 4 vectors modified
+                              ortho_dst_strides, masked_dst_strides);
 
         shT ortho_rhs_shape;
         shT masked_rhs_shape;
         shT ortho_rhs_strides;
         shT masked_rhs_strides;
-        dpctl::tensor::py_internal::split_iteration_space(
-            rhs_shape_vec, rhs_strides_vec, axis_start, axis_start + 1,
-            ortho_rhs_shape,
-            masked_rhs_shape, // 4 vectors modified
-            ortho_rhs_strides, masked_rhs_strides);
+        split_iteration_space(rhs_shape_vec, rhs_strides_vec, axis_start,
+                              axis_start + 1, ortho_rhs_shape,
+                              masked_rhs_shape, // 4 vectors modified
+                              ortho_rhs_strides, masked_rhs_strides);
 
         assert(ortho_dst_shape.size() == static_cast<std::size_t>(ortho_nd));
         assert(ortho_rhs_shape.size() == static_cast<std::size_t>(ortho_nd));
@@ -676,7 +672,7 @@ std::pair<sycl::event, sycl::event>
         py::ssize_t ortho_dst_offset(0);
         py::ssize_t ortho_rhs_offset(0);
 
-        dpctl::tensor::py_internal::simplify_iteration_space(
+        simplify_iteration_space(
             ortho_nd, _shape, ortho_dst_strides, ortho_rhs_strides,
             simplified_ortho_shape, simplified_ortho_dst_strides,
             simplified_ortho_rhs_strides, ortho_dst_offset, ortho_rhs_offset);

dpctl_ext/tensor/libtensor/source/clip.cpp

@@ -218,7 +218,7 @@ std::pair<sycl::event, sycl::event>
     py::ssize_t max_offset(0);
     py::ssize_t dst_offset(0);
 
-    dpctl::tensor::py_internal::simplify_iteration_space_4(
+    simplify_iteration_space_4(
         nd, src_shape, src_strides, min_strides, max_strides, dst_strides,
         // outputs
         simplified_shape, simplified_src_strides, simplified_min_strides,

dpctl_ext/tensor/libtensor/source/copy_and_cast_usm_to_usm.cpp

@@ -188,11 +188,10 @@ std::pair<sycl::event, sycl::event> copy_usm_ndarray_into_usm_ndarray(
     const py::ssize_t *shape = src_shape;
 
     // nd, simplified_* and *_offset are modified by reference
-    dpctl::tensor::py_internal::simplify_iteration_space(
-        nd, shape, src_strides, dst_strides,
-        // output
-        simplified_shape, simplified_src_strides, simplified_dst_strides,
-        src_offset, dst_offset);
+    simplify_iteration_space(nd, shape, src_strides, dst_strides,
+                             // output
+                             simplified_shape, simplified_src_strides,
+                             simplified_dst_strides, src_offset, dst_offset);
 
     if (nd < 2) {
         if (nd == 1) {

dpctl_ext/tensor/libtensor/source/copy_as_contig.cpp

@@ -225,11 +225,11 @@ std::pair<sycl::event, sycl::event>
     int nd = src_nd;
 
     // nd, simplified_* and *_offset are modified by reference
-    dpctl::tensor::py_internal::simplify_iteration_space(
-        nd, src_shape_vec.data(), src_strides_vec, dst.get_strides_vector(),
-        // output
-        simplified_shape, simplified_src_strides, simplified_dst_strides,
-        src_offset, dst_offset);
+    simplify_iteration_space(nd, src_shape_vec.data(), src_strides_vec,
+                             dst.get_strides_vector(),
+                             // output
+                             simplified_shape, simplified_src_strides,
+                             simplified_dst_strides, src_offset, dst_offset);
 
     if (!((0 == src_offset) && (0 == dst_offset))) {
         throw std::runtime_error(
@@ -359,11 +359,11 @@ std::pair<sycl::event, sycl::event>
     int nd = src_nd;
 
     // nd, simplified_* and *_offset are modified by reference
-    dpctl::tensor::py_internal::simplify_iteration_space(
-        nd, src_shape_vec.data(), src_strides_vec, dst.get_strides_vector(),
-        // output
-        simplified_shape, simplified_src_strides, simplified_dst_strides,
-        src_offset, dst_offset);
+    simplify_iteration_space(nd, src_shape_vec.data(), src_strides_vec,
+                             dst.get_strides_vector(),
+                             // output
+                             simplified_shape, simplified_src_strides,
+                             simplified_dst_strides, src_offset, dst_offset);
 
     if (!((0 == src_offset) && (0 == dst_offset))) {
         throw std::runtime_error(
@@ -521,12 +521,11 @@ std::pair<sycl::event, sycl::event>
     int nd = static_cast<int>(batch_shape_vec.size());
 
     // nd, simplified_* and *_offset are modified by reference
-    dpctl::tensor::py_internal::simplify_iteration_space(
-        nd, batch_shape_vec.data(), src_batch_strides_vec,
-        dst_batch_strides_vec,
-        // output
-        simplified_shape, simplified_src_strides, simplified_dst_strides,
-        src_offset, dst_offset);
+    simplify_iteration_space(nd, batch_shape_vec.data(), src_batch_strides_vec,
+                             dst_batch_strides_vec,
+                             // output
+                             simplified_shape, simplified_src_strides,
+                             simplified_dst_strides, src_offset, dst_offset);
 
     if (!((0 == src_offset) && (0 == dst_offset))) {
         throw std::runtime_error(
@@ -714,12 +713,11 @@ std::pair<sycl::event, sycl::event>
     int nd = static_cast<int>(batch_shape_vec.size());
 
     // nd, simplified_* and *_offset are modified by reference
-    dpctl::tensor::py_internal::simplify_iteration_space(
-        nd, batch_shape_vec.data(), src_batch_strides_vec,
-        dst_batch_strides_vec,
-        // output
-        simplified_shape, simplified_src_strides, simplified_dst_strides,
-        src_offset, dst_offset);
+    simplify_iteration_space(nd, batch_shape_vec.data(), src_batch_strides_vec,
+                             dst_batch_strides_vec,
+                             // output
+                             simplified_shape, simplified_src_strides,
+                             simplified_dst_strides, src_offset, dst_offset);
 
     if (!((0 == src_offset) && (0 == dst_offset))) {
         throw std::runtime_error(

dpctl_ext/tensor/libtensor/source/copy_for_roll.cpp

@@ -197,11 +197,10 @@ std::pair<sycl::event, sycl::event>
     const py::ssize_t *shape = src_shape_ptr;
 
     // nd, simplified_* and *_offset are modified by reference
-    dpctl::tensor::py_internal::simplify_iteration_space(
-        nd, shape, src_strides, dst_strides,
-        // output
-        simplified_shape, simplified_src_strides, simplified_dst_strides,
-        src_offset, dst_offset);
+    simplify_iteration_space(nd, shape, src_strides, dst_strides,
+                             // output
+                             simplified_shape, simplified_src_strides,
+                             simplified_dst_strides, src_offset, dst_offset);
 
     if (nd == 1 && simplified_src_strides[0] == 1 &&
         simplified_dst_strides[0] == 1) {

dpctl_ext/tensor/libtensor/source/repeat.cpp

@@ -285,17 +285,17 @@ std::pair<sycl::event, sycl::event>
         shT orthog_src_strides;
         shT axis_src_shape;
         shT axis_src_stride;
-        dpctl::tensor::py_internal::split_iteration_space(
-            src_shape_vec, src_strides_vec, axis, axis + 1, orthog_src_shape,
-            axis_src_shape, orthog_src_strides, axis_src_stride);
+        split_iteration_space(src_shape_vec, src_strides_vec, axis, axis + 1,
+                              orthog_src_shape, axis_src_shape,
+                              orthog_src_strides, axis_src_stride);
 
         shT orthog_dst_shape;
         shT orthog_dst_strides;
         shT axis_dst_shape;
         shT axis_dst_stride;
-        dpctl::tensor::py_internal::split_iteration_space(
-            dst_shape_vec, dst_strides_vec, axis, axis + 1, orthog_dst_shape,
-            axis_dst_shape, orthog_dst_strides, axis_dst_stride);
+        split_iteration_space(dst_shape_vec, dst_strides_vec, axis, axis + 1,
+                              orthog_dst_shape, axis_dst_shape,
+                              orthog_dst_strides, axis_dst_stride);
 
         assert(orthog_src_shape.size() == static_cast<std::size_t>(orthog_nd));
         assert(orthog_dst_shape.size() == static_cast<std::size_t>(orthog_nd));
@@ -310,7 +310,7 @@ std::pair<sycl::event, sycl::event>
 
         py::ssize_t orthog_src_offset(0);
         py::ssize_t orthog_dst_offset(0);
-        dpctl::tensor::py_internal::simplify_iteration_space(
+        simplify_iteration_space(
             orthog_nd, _shape, orthog_src_strides, orthog_dst_strides,
             // output
             simplified_orthog_shape, simplified_orthog_src_strides,
@@ -641,17 +641,17 @@ std::pair<sycl::event, sycl::event>
         shT orthog_src_strides;
         shT axis_src_shape;
         shT axis_src_stride;
-        dpctl::tensor::py_internal::split_iteration_space(
-            src_shape_vec, src_strides_vec, axis, axis + 1, orthog_src_shape,
-            axis_src_shape, orthog_src_strides, axis_src_stride);
+        split_iteration_space(src_shape_vec, src_strides_vec, axis, axis + 1,
+                              orthog_src_shape, axis_src_shape,
+                              orthog_src_strides, axis_src_stride);
 
         shT orthog_dst_shape;
         shT orthog_dst_strides;
         shT axis_dst_shape;
         shT axis_dst_stride;
-        dpctl::tensor::py_internal::split_iteration_space(
-            dst_shape_vec, dst_strides_vec, axis, axis + 1, orthog_dst_shape,
-            axis_dst_shape, orthog_dst_strides, axis_dst_stride);
+        split_iteration_space(dst_shape_vec, dst_strides_vec, axis, axis + 1,
+                              orthog_dst_shape, axis_dst_shape,
+                              orthog_dst_strides, axis_dst_stride);
 
         assert(orthog_src_shape.size() == static_cast<std::size_t>(orthog_nd));
         assert(orthog_dst_shape.size() == static_cast<std::size_t>(orthog_nd));
@@ -667,7 +667,7 @@ std::pair<sycl::event, sycl::event>
         py::ssize_t orthog_src_offset(0);
         py::ssize_t orthog_dst_offset(0);
 
-        dpctl::tensor::py_internal::simplify_iteration_space(
+        simplify_iteration_space(
             orthog_nd, _shape, orthog_src_strides, orthog_dst_strides,
             // output
             simplified_orthog_shape, simplified_orthog_src_strides,

dpctl_ext/tensor/libtensor/source/where.cpp

@@ -201,7 +201,7 @@ std::pair<sycl::event, sycl::event>
     py::ssize_t x2_offset(0);
     py::ssize_t dst_offset(0);
 
-    dpctl::tensor::py_internal::simplify_iteration_space_4(
+    simplify_iteration_space_4(
         nd, x1_shape, cond_strides, x1_strides, x2_strides, dst_strides,
         // outputs
         simplified_shape, simplified_cond_strides, simplified_x1_strides,