diff --git a/.github/workflows/generate_coverage.yaml b/.github/workflows/generate_coverage.yaml index f56018b4ef8e..8ce241c35b6c 100644 --- a/.github/workflows/generate_coverage.yaml +++ b/.github/workflows/generate_coverage.yaml @@ -117,12 +117,14 @@ jobs: mamba info mamba list - - name: Build dpnp with coverage - id: build_coverage + - name: Build dpnp tensor with coverage + id: build_tensor uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2 + env: + SYCL_CACHE_PERSISTENT: 1 with: shell: bash - timeout_minutes: 120 + timeout_minutes: 60 max_attempts: 5 retry_on: error command: | @@ -130,11 +132,28 @@ jobs: conda activate coverage [ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh git clean -fxd - python scripts/gen_coverage.py + python scripts/gen_coverage.py --build-step tensor + + - name: Build dpnp with coverage (skip tensor) + id: build_skip_tensor + uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2 + env: + SYCL_CACHE_PERSISTENT: 1 + with: + shell: bash + timeout_minutes: 60 + max_attempts: 5 + retry_on: error + command: | + . $CONDA/etc/profile.d/conda.sh + conda activate coverage + [ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh + python scripts/gen_coverage.py --build-step skip-tensor - name: Total number of coverage attempts run: | - echo "Total number of coverage attempts: ${{ steps.build_coverage.outputs.total_attempts }}" + echo "Total tensor build attempts: ${{ steps.build_tensor.outputs.total_attempts }}" + echo "Total skip-tensor build attempts: ${{ steps.build_skip_tensor.outputs.total_attempts }}" - name: Upload coverage data to coveralls.io uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7 diff --git a/.gitignore b/.gitignore index f8ed987fa0d9..838c1659a63a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,12 +28,8 @@ dpnp_pytest.* example3 *dpnp_backend* +dpnp/include/ dpnp/**/*.cpython*.so dpnp/**/*.pyd *~ core - -# TODO: revert to `dpctl/` -# when dpnp fully migrates dpctl/tensor -dpctl_ext/**/*.cpython*.so -dpctl_ext/include/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dedacc3bc43..18ec06675c47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,12 +37,23 @@ project( ) option(DPNP_GENERATE_COVERAGE "Enable build DPNP with coverage instrumentation" OFF) +option( + DPNP_TENSOR_GENERATE_COVERAGE_FOR_PYBIND11_EXTENSIONS + "Build dpnp tensor pybind11 offloading extensions with coverage instrumentation" + OFF +) option(DPNP_BACKEND_TESTS "Enable building of DPNP backend test suite" OFF) option( DPNP_WITH_REDIST "Build DPNP assuming DPC++ redistributable is installed into Python prefix" OFF ) +option( + DPNP_TENSOR_OFFLOAD_COMPRESS + "Build using offload section compression feature of DPC++ to reduce \ +size of shared object with offloading sections" + OFF +) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) @@ -344,5 +355,4 @@ if(DEFINED SKBUILD) set(_ignore_me ${SKBUILD}) endif() -add_subdirectory(dpctl_ext) add_subdirectory(dpnp) diff --git a/dpctl_ext/CMakeLists.txt b/dpctl_ext/CMakeLists.txt deleted file mode 100644 index fa187463414d..000000000000 --- a/dpctl_ext/CMakeLists.txt +++ /dev/null @@ -1,202 +0,0 @@ -# -*- coding: utf-8 -*- -# ***************************************************************************** -# Copyright (c) 2026, Intel Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# - Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# - Neither the name of the copyright holder nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -# THE POSSIBILITY OF SUCH DAMAGE. -# ***************************************************************************** - -# TODO: rework this logic to remove current duplication -if(WIN32) - string( - CONCAT WARNING_FLAGS - "-Wall " - "-Wextra " - "-Winit-self " - "-Wunused-function " - "-Wuninitialized " - "-Wmissing-declarations " - "-Wstrict-prototypes " - "-Wno-unused-parameter " - ) - string(CONCAT SDL_FLAGS "/GS " "/DynamicBase ") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ox ${WARNING_FLAGS} ${SDL_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox ${WARNING_FLAGS} ${SDL_FLAGS}") - set(CMAKE_C_FLAGS_DEBUG - "${CMAKE_C_FLAGS_DEBUG} ${WARNING_FLAGS} ${SDL_FLAGS} -O0 -g1 -DDEBUG -Xsycl-target-frontend=spir64 \"-g0\"" - ) - set(CMAKE_CXX_FLAGS_DEBUG - "${CMAKE_CXX_FLAGS_DEBUG} ${WARNING_FLAGS} ${SDL_FLAGS} -O0 -g1 -DDEBUG -Xsycl-target-frontend=spir64 \"-g0\"" - ) - set(CMAKE_C_FLAGS_COVERAGE - "${CMAKE_C_FLAGS_DEBUG} ${WARNING_FLAGS} ${SDL_FLAGS} -O1 -g1 -DDEBUG" - ) - set(CMAKE_CXX_FLAGS_COVERAGE - "${CMAKE_CXX_FLAGS_DEBUG} ${WARNING_FLAGS} ${SDL_FLAGS} -O1 -g1 -DDEBUG" - ) - set(CMAKE_MODULE_LINKER_FLAGS_COVERAGE "${CMAKE_MODULE_LINKER_FLAGS_DEBUG}") - set(DPCTL_LDFLAGS "/NXCompat;/DynamicBase") - mark_as_advanced( - CMAKE_CXX_FLAGS_COVERAGE - CMAKE_C_FLAGS_COVERAGE - CMAKE_MODULE_LINKER_FLAGS_COVERAGE - ) -elseif(UNIX) - string( - CONCAT WARNING_FLAGS - "-Wall " - "-Wextra " - "-Winit-self " - "-Wunused-function " - "-Wuninitialized " - "-Wmissing-declarations " - "-Wstrict-prototypes " - "-Wno-unused-parameter " - "-fdiagnostics-color=auto " - ) - string( - CONCAT SDL_FLAGS - "-fstack-protector " - "-fstack-protector-all " - "-fpic " - "-fPIC " - "-D_FORTIFY_SOURCE=2 " - "-Wformat " - "-Wformat-security " - # "-fno-strict-overflow " # no-strict-overflow is implied by -fwrapv - "-fno-delete-null-pointer-checks " - "-fwrapv " - ) - string(CONCAT CFLAGS "${WARNING_FLAGS}" "${SDL_FLAGS}") - string(CONCAT CXXFLAGS "${WARNING_FLAGS}" "${SDL_FLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 ${CFLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 ${CXXFLAGS}") - set(CMAKE_C_FLAGS_DEBUG - "${CMAKE_C_FLAGS_DEBUG} ${CFLAGS} -O0 -g -DDEBUG -Xsycl-target-frontend=spir64 \"-g0\"" - ) - set(CMAKE_CXX_FLAGS_DEBUG - "${CMAKE_CXX_FLAGS_DEBUG} ${CXXFLAGS} -O0 -g -DDEBUG -Xsycl-target-frontend=spir64 \"-g0\"" - ) - set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_DEBUG} ${CFLAGS} -O1 -g1 -DDEBUG") - set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG} ${CXXFLAGS} -O1 -g1 -DDEBUG") - set(CMAKE_MODULE_LINKER_FLAGS_COVERAGE "${CMAKE_MODULE_LINKER_FLAGS_DEBUG}") - set(DPCTL_LDFLAGS "-z,noexecstack,-z,relro,-z,now") - mark_as_advanced( - CMAKE_CXX_FLAGS_COVERAGE - CMAKE_C_FLAGS_COVERAGE - CMAKE_MODULE_LINKER_FLAGS_COVERAGE - ) -else() - message(FATAL_ERROR "Unsupported system.") -endif() - -# at build time create include/ directory and copy header files over -set(DPCTL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) - -set(CMAKE_INSTALL_RPATH "$ORIGIN") - -function(build_dpctl_ext _trgt _src _dest) - set(options SYCL) - cmake_parse_arguments(BUILD_DPCTL_EXT "${options}" "RELATIVE_PATH" "" ${ARGN}) - add_cython_target(${_trgt} ${_src} CXX OUTPUT_VAR _generated_src) - set(_cythonize_trgt "${_trgt}_cythonize_pyx") - python_add_library(${_trgt} MODULE WITH_SOABI ${_generated_src}) - if(BUILD_DPCTL_EXT_SYCL) - add_sycl_to_target(TARGET ${_trgt} SOURCES ${_generated_src}) - target_compile_options(${_trgt} PRIVATE -fno-sycl-id-queries-fit-in-int) - target_link_options(${_trgt} PRIVATE -fsycl-device-code-split=per_kernel) - if(DPCTL_OFFLOAD_COMPRESS) - target_link_options(${_trgt} PRIVATE --offload-compress) - endif() - if(_dpctl_sycl_targets) - # make fat binary - target_compile_options( - ${_trgt} - PRIVATE ${_dpctl_sycl_target_compile_options} - ) - target_link_options(${_trgt} PRIVATE ${_dpctl_sycl_target_link_options}) - endif() - endif() - target_link_libraries(${_trgt} PRIVATE Python::NumPy) - if(DPCTL_GENERATE_COVERAGE) - target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1) - if(BUILD_DPCTL_EXT_SYCL) - target_compile_options(${_trgt} PRIVATE -fno-sycl-use-footer) - endif() - endif() - # Dpctl - target_include_directories(${_trgt} PRIVATE ${Dpctl_INCLUDE_DIR}) - target_link_directories(${_trgt} PRIVATE ${Dpctl_INCLUDE_DIR}/..) - target_link_libraries(${_trgt} PRIVATE DPCTLSyclInterface) - set(_linker_options "LINKER:${DPCTL_LDFLAGS}") - target_link_options(${_trgt} PRIVATE ${_linker_options}) - get_filename_component(_name_wle ${_generated_src} NAME_WLE) - get_filename_component(_generated_src_dir ${_generated_src} DIRECTORY) - set(_generated_public_h "${_generated_src_dir}/${_name_wle}.h") - set(_generated_api_h "${_generated_src_dir}/${_name_wle}_api.h") - - # TODO: create separate folder inside build folder that contains only - # headers related to this target and appropriate folder structure to - # eliminate shadow dependencies - # Go up two levels to build root for "dpctl_ext/tensor/_usmarray.h" resolution - get_filename_component(_parent_dir ${_generated_src_dir} DIRECTORY) - get_filename_component(_build_root ${_parent_dir} DIRECTORY) - # TODO: do not set directory if we did not generate header - target_include_directories(${_trgt} INTERFACE ${_build_root}) - set(_rpath_value "$ORIGIN") - if(BUILD_DPCTL_EXT_RELATIVE_PATH) - set(_rpath_value "${_rpath_value}/${BUILD_DPCTL_EXT_RELATIVE_PATH}") - endif() - if(DPCTL_WITH_REDIST) - set(_rpath_value "${_rpath_value}:${_rpath_value}/../../..") - endif() - set_target_properties(${_trgt} PROPERTIES INSTALL_RPATH ${_rpath_value}) - - install(TARGETS ${_trgt} LIBRARY DESTINATION ${_dest}) - install( - FILES ${_generated_api_h} - DESTINATION ${CMAKE_INSTALL_PREFIX}/dpctl_ext/include/${_dest} - OPTIONAL - ) - install( - FILES ${_generated_public_h} - DESTINATION ${CMAKE_INSTALL_PREFIX}/dpctl_ext/include/${_dest} - OPTIONAL - ) - if(DPCTL_GENERATE_COVERAGE) - get_filename_component(_original_src_dir ${_src} DIRECTORY) - file(RELATIVE_PATH _rel_dir ${CMAKE_SOURCE_DIR} ${_original_src_dir}) - install(FILES ${_generated_src} DESTINATION ${CMAKE_INSTALL_PREFIX}/${_rel_dir}) - endif() - - # Create target with headers only, because python is managing all the - # library imports at runtime - set(_trgt_headers ${_trgt}_headers) - add_library(${_trgt_headers} INTERFACE) - add_dependencies(${_trgt_headers} ${_trgt}) - get_target_property(_trgt_headers_dir ${_trgt} INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(${_trgt_headers} INTERFACE ${_trgt_headers_dir}) -endfunction() - -add_subdirectory(tensor) diff --git a/dpctl_ext/__init__.py b/dpctl_ext/__init__.py deleted file mode 100644 index a71324cb88d8..000000000000 --- a/dpctl_ext/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# ***************************************************************************** -# Copyright (c) 2026, Intel Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# - Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# - Neither the name of the copyright holder nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -# THE POSSIBILITY OF SUCH DAMAGE. -# ***************************************************************************** diff --git a/dpnp/CMakeLists.txt b/dpnp/CMakeLists.txt index 6850b799735c..af79c944a922 100644 --- a/dpnp/CMakeLists.txt +++ b/dpnp/CMakeLists.txt @@ -86,21 +86,119 @@ function(build_dpnp_cython_ext _trgt _src _dest) install(TARGETS ${_trgt} LIBRARY DESTINATION ${_dest}) endfunction() +function(build_dpnp_tensor_ext _trgt _src _dest) + set(options SYCL) + cmake_parse_arguments(BUILD_DPNP_TENSOR "${options}" "RELATIVE_PATH" "" ${ARGN}) + add_cython_target(${_trgt} ${_src} CXX OUTPUT_VAR _generated_src) + set(_cythonize_trgt "${_trgt}_cythonize_pyx") + python_add_library(${_trgt} MODULE WITH_SOABI ${_generated_src}) + if(BUILD_DPNP_SYCL) + add_sycl_to_target(TARGET ${_trgt} SOURCES ${_generated_src}) + target_compile_options(${_trgt} PRIVATE -fno-sycl-id-queries-fit-in-int) + target_link_options(${_trgt} PRIVATE -fsycl-device-code-split=per_kernel) + if(DPNP_TENSOR_OFFLOAD_COMPRESS) + target_link_options(${_trgt} PRIVATE --offload-compress) + endif() + if(_dpnp_sycl_targets) + # make fat binary + target_compile_options( + ${_trgt} + PRIVATE ${_dpnp_sycl_target_compile_options} + ) + target_link_options(${_trgt} PRIVATE ${_dpnp_sycl_target_link_options}) + endif() + endif() + target_link_libraries(${_trgt} PRIVATE Python::NumPy) + if(DPNP_GENERATE_COVERAGE) + target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1) + if(BUILD_DPNP_TENSOR_SYCL) + target_compile_options(${_trgt} PRIVATE -fno-sycl-use-footer) + endif() + endif() + # Dpctl + target_include_directories(${_trgt} PRIVATE ${Dpctl_INCLUDE_DIR}) + target_link_directories(${_trgt} PRIVATE ${Dpctl_INCLUDE_DIR}/..) + target_link_libraries(${_trgt} PRIVATE DPCTLSyclInterface) + set(_linker_options "LINKER:${DPNP_LDFLAGS}") + target_link_options(${_trgt} PRIVATE ${_linker_options}) + get_filename_component(_name_wle ${_generated_src} NAME_WLE) + get_filename_component(_generated_src_dir ${_generated_src} DIRECTORY) + set(_generated_public_h "${_generated_src_dir}/${_name_wle}.h") + set(_generated_api_h "${_generated_src_dir}/${_name_wle}_api.h") + + # TODO: create separate folder inside build folder that contains only + # headers related to this target and appropriate folder structure to + # eliminate shadow dependencies + # Go up two levels to build root for "dpnp/tensor/_usmarray.h" resolution + get_filename_component(_parent_dir ${_generated_src_dir} DIRECTORY) + get_filename_component(_build_root ${_parent_dir} DIRECTORY) + # TODO: do not set directory if we did not generate header + target_include_directories(${_trgt} INTERFACE ${_build_root}) + set(_rpath_value "$ORIGIN") + if(BUILD_DPNP_TENSOR_RELATIVE_PATH) + set(_rpath_value "${_rpath_value}/${BUILD_DPNP_TENSOR_RELATIVE_PATH}") + endif() + if(DPNP_WITH_REDIST) + set(_rpath_value "${_rpath_value}:${_rpath_value}/../../..") + endif() + set_target_properties(${_trgt} PROPERTIES INSTALL_RPATH ${_rpath_value}) + + install(TARGETS ${_trgt} LIBRARY DESTINATION ${_dest}) + install( + FILES ${_generated_api_h} + DESTINATION ${CMAKE_INSTALL_PREFIX}/dpnp/include/${_dest} + OPTIONAL + ) + install( + FILES ${_generated_public_h} + DESTINATION ${CMAKE_INSTALL_PREFIX}/dpnp/include/${_dest} + OPTIONAL + ) + if(DPNP_GENERATE_COVERAGE) + get_filename_component(_original_src_dir ${_src} DIRECTORY) + file(RELATIVE_PATH _rel_dir ${CMAKE_SOURCE_DIR} ${_original_src_dir}) + install(FILES ${_generated_src} DESTINATION ${CMAKE_INSTALL_PREFIX}/${_rel_dir}) + endif() + + # Create target with headers only, because python is managing all the + # library imports at runtime + set(_trgt_headers ${_trgt}_headers) + add_library(${_trgt_headers} INTERFACE) + add_dependencies(${_trgt_headers} ${_trgt}) + get_target_property(_trgt_headers_dir ${_trgt} INTERFACE_INCLUDE_DIRECTORIES) + target_include_directories(${_trgt_headers} INTERFACE ${_trgt_headers_dir}) +endfunction() + function(build_dpnp_cython_ext_with_backend _trgt _src _dest) build_dpnp_cython_ext(${_trgt} ${_src} ${_dest}) target_link_libraries(${_trgt} PRIVATE dpnp_backend_library) endfunction() -add_subdirectory(backend) -add_subdirectory(backend/extensions/blas) -add_subdirectory(backend/extensions/fft) -add_subdirectory(backend/extensions/indexing) -add_subdirectory(backend/extensions/lapack) -add_subdirectory(backend/extensions/statistics) -add_subdirectory(backend/extensions/ufunc) -add_subdirectory(backend/extensions/vm) -add_subdirectory(backend/extensions/window) - -add_subdirectory(dpnp_algo) -add_subdirectory(dpnp_utils) -add_subdirectory(random) +# Control which components to build (for memory-constrained CI builds) +# DPNP_BUILD_COMPONENTS: +# ALL (default), +# TENSOR_ONLY, +# SKIP_TENSOR, +if(NOT DEFINED DPNP_BUILD_COMPONENTS) + set(DPNP_BUILD_COMPONENTS "ALL") +endif() + +if(DPNP_BUILD_COMPONENTS STREQUAL "ALL" OR DPNP_BUILD_COMPONENTS STREQUAL "TENSOR_ONLY") + add_subdirectory(tensor) +endif() + +if(DPNP_BUILD_COMPONENTS STREQUAL "ALL" OR DPNP_BUILD_COMPONENTS STREQUAL "SKIP_TENSOR") + add_subdirectory(backend) + add_subdirectory(backend/extensions/blas) + add_subdirectory(backend/extensions/fft) + add_subdirectory(backend/extensions/indexing) + add_subdirectory(backend/extensions/lapack) + add_subdirectory(backend/extensions/statistics) + add_subdirectory(backend/extensions/ufunc) + add_subdirectory(backend/extensions/vm) + add_subdirectory(backend/extensions/window) + + add_subdirectory(dpnp_algo) + add_subdirectory(dpnp_utils) + add_subdirectory(random) +endif() diff --git a/dpnp/__init__.py b/dpnp/__init__.py index dd413d02f2bb..31ff41b2a63d 100644 --- a/dpnp/__init__.py +++ b/dpnp/__init__.py @@ -60,9 +60,7 @@ [os.getenv("PATH", ""), dll_path] ) -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor import __array_api_version__, DLDeviceType +from dpnp.tensor import __array_api_version__, DLDeviceType from .dpnp_array import dpnp_array as ndarray from .dpnp_array_api_info import __array_namespace_info__ diff --git a/dpnp/backend/extensions/blas/CMakeLists.txt b/dpnp/backend/extensions/blas/CMakeLists.txt index 1bf6055d080b..67e0d4cf02e1 100644 --- a/dpnp/backend/extensions/blas/CMakeLists.txt +++ b/dpnp/backend/extensions/blas/CMakeLists.txt @@ -71,7 +71,7 @@ target_include_directories( PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/fft/CMakeLists.txt b/dpnp/backend/extensions/fft/CMakeLists.txt index 28433ab5d98f..8f5179bbbd76 100644 --- a/dpnp/backend/extensions/fft/CMakeLists.txt +++ b/dpnp/backend/extensions/fft/CMakeLists.txt @@ -64,7 +64,7 @@ target_include_directories( ${python_module_name} PRIVATE ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/indexing/CMakeLists.txt b/dpnp/backend/extensions/indexing/CMakeLists.txt index e00cee6a29a5..0ca611bfdc9f 100644 --- a/dpnp/backend/extensions/indexing/CMakeLists.txt +++ b/dpnp/backend/extensions/indexing/CMakeLists.txt @@ -68,7 +68,7 @@ target_include_directories( PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/lapack/CMakeLists.txt b/dpnp/backend/extensions/lapack/CMakeLists.txt index 3105771d9722..6bf25ee651d2 100644 --- a/dpnp/backend/extensions/lapack/CMakeLists.txt +++ b/dpnp/backend/extensions/lapack/CMakeLists.txt @@ -89,7 +89,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/statistics/CMakeLists.txt b/dpnp/backend/extensions/statistics/CMakeLists.txt index 0e96d7ead6c1..701a852c5903 100644 --- a/dpnp/backend/extensions/statistics/CMakeLists.txt +++ b/dpnp/backend/extensions/statistics/CMakeLists.txt @@ -73,7 +73,7 @@ target_include_directories( PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/ufunc/CMakeLists.txt b/dpnp/backend/extensions/ufunc/CMakeLists.txt index 53d3a64122b3..68e6bf29135d 100644 --- a/dpnp/backend/extensions/ufunc/CMakeLists.txt +++ b/dpnp/backend/extensions/ufunc/CMakeLists.txt @@ -91,7 +91,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/vm/CMakeLists.txt b/dpnp/backend/extensions/vm/CMakeLists.txt index 5e0409f77671..a739838c8dcd 100644 --- a/dpnp/backend/extensions/vm/CMakeLists.txt +++ b/dpnp/backend/extensions/vm/CMakeLists.txt @@ -113,7 +113,7 @@ target_include_directories( PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/extensions/window/CMakeLists.txt b/dpnp/backend/extensions/window/CMakeLists.txt index 6898cdb332e0..085cd47e7891 100644 --- a/dpnp/backend/extensions/window/CMakeLists.txt +++ b/dpnp/backend/extensions/window/CMakeLists.txt @@ -69,7 +69,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_SOURCE_DIR}/dpnp/backend/include - ${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include + ${CMAKE_SOURCE_DIR}/dpnp/tensor/libtensor/include ) # treat below headers as system to suppress the warnings there during the build diff --git a/dpnp/backend/include/dpnp4pybind11.hpp b/dpnp/backend/include/dpnp4pybind11.hpp index d8e4c81b20a5..ada7b7e380fb 100644 --- a/dpnp/backend/include/dpnp4pybind11.hpp +++ b/dpnp/backend/include/dpnp4pybind11.hpp @@ -52,9 +52,10 @@ #include "dpctl/program/_program.h" #include "dpctl/program/_program_api.h" -// Include generated Cython headers for usm_ndarray struct definition and C-API -#include "dpctl_ext/tensor/_usmarray.h" -#include "dpctl_ext/tensor/_usmarray_api.h" +// Include generated Cython headers for usm_ndarray +// (struct definition and constants only) +#include "dpnp/tensor/_usmarray.h" +#include "dpnp/tensor/_usmarray_api.h" #include #include @@ -272,8 +273,8 @@ class dpctl_capi import_dpctl___sycl_queue(); import_dpctl__memory___memory(); import_dpctl__program___program(); - // Import dpctl_ext tensor module for PyUSMArrayType - import_dpctl_ext__tensor___usmarray(); + // Import dpnp tensor module for PyUSMArrayType + import_dpnp__tensor___usmarray(); // Python type objects for classes implemented by dpctl this->Py_SyclDeviceType_ = &Py_SyclDeviceType; @@ -386,10 +387,7 @@ class dpctl_capi default_usm_memory_ = std::shared_ptr( new py::object{py_default_usm_memory}, Deleter{}); - // TODO: revert to `py::module_::import("dpctl.tensor._usmarray");` - // when dpnp fully migrates dpctl/tensor - py::module_ mod_usmarray = - py::module_::import("dpctl_ext.tensor._usmarray"); + py::module_ mod_usmarray = py::module_::import("dpnp.tensor._usmarray"); auto tensor_kl = mod_usmarray.attr("usm_ndarray"); const py::object &py_default_usm_ndarray = diff --git a/dpnp/dpnp_algo/dpnp_arraycreation.py b/dpnp/dpnp_algo/dpnp_arraycreation.py index fb277dd4d310..66d8b9d9fbc8 100644 --- a/dpnp/dpnp_algo/dpnp_arraycreation.py +++ b/dpnp/dpnp_algo/dpnp_arraycreation.py @@ -32,10 +32,8 @@ import dpctl.utils as dpu import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from dpnp.dpnp_array import dpnp_array from dpnp.dpnp_utils import get_usm_allocations, map_dtype_to_device diff --git a/dpnp/dpnp_algo/dpnp_elementwise_common.py b/dpnp/dpnp_algo/dpnp_elementwise_common.py index 271013b58090..5902d389391f 100644 --- a/dpnp/dpnp_algo/dpnp_elementwise_common.py +++ b/dpnp/dpnp_algo/dpnp_elementwise_common.py @@ -32,30 +32,29 @@ import dpctl.utils as dpu import numpy -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._copy_utils as dtc -import dpctl_ext.tensor._tensor_impl as dti -import dpctl_ext.tensor._type_utils as dtu import dpnp import dpnp.backend.extensions.vm._vm_impl as vmi -from dpctl_ext.tensor._elementwise_common import ( + +# pylint: disable=no-name-in-module +import dpnp.tensor as dpt +import dpnp.tensor._copy_utils as dtc +import dpnp.tensor._tensor_impl as dti +import dpnp.tensor._type_utils as dtu +from dpnp.dpnp_array import dpnp_array +from dpnp.dpnp_utils import get_usm_allocations +from dpnp.dpnp_utils.dpnp_utils_common import ( + find_buf_dtype_3out, + find_buf_dtype_4out, +) +from dpnp.tensor._elementwise_common import ( BinaryElementwiseFunc, UnaryElementwiseFunc, ) -from dpctl_ext.tensor._scalar_utils import ( +from dpnp.tensor._scalar_utils import ( _get_dtype, _get_shape, _validate_dtype, ) -from dpnp.dpnp_array import dpnp_array -from dpnp.dpnp_utils import get_usm_allocations -from dpnp.dpnp_utils.dpnp_utils_common import ( - find_buf_dtype_3out, - find_buf_dtype_4out, -) __all__ = [ "DPNPI0", diff --git a/dpnp/dpnp_algo/dpnp_fill.py b/dpnp/dpnp_algo/dpnp_fill.py index c9ae58a114a9..7afda62bb07f 100644 --- a/dpnp/dpnp_algo/dpnp_fill.py +++ b/dpnp/dpnp_algo/dpnp_fill.py @@ -30,12 +30,10 @@ import dpctl.utils as dpu -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp -from dpctl_ext.tensor._ctors import _cast_fill_val -from dpctl_ext.tensor._tensor_impl import ( +import dpnp.tensor as dpt +from dpnp.tensor._ctors import _cast_fill_val +from dpnp.tensor._tensor_impl import ( _copy_usm_ndarray_into_usm_ndarray, _full_usm_ndarray, _zeros_usm_ndarray, diff --git a/dpnp/dpnp_array.py b/dpnp/dpnp_array.py index cbb5835bbfc4..ab9899c976e3 100644 --- a/dpnp/dpnp_array.py +++ b/dpnp/dpnp_array.py @@ -32,17 +32,16 @@ """ +# pylint: disable=duplicate-code # pylint: disable=invalid-name # pylint: disable=protected-access import warnings -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._type_utils as dtu import dpnp -from dpctl_ext.tensor._numpy_helper import AxisError +import dpnp.tensor as dpt +import dpnp.tensor._type_utils as dtu +from dpnp.tensor._numpy_helper import AxisError from . import memory as dpm diff --git a/dpnp/dpnp_array_api_info.py b/dpnp/dpnp_array_api_info.py index f792600cbb66..ef3f1e4c2b60 100644 --- a/dpnp/dpnp_array_api_info.py +++ b/dpnp/dpnp_array_api_info.py @@ -36,9 +36,7 @@ """ -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt def __array_namespace_info__(): diff --git a/dpnp/dpnp_container.py b/dpnp/dpnp_container.py index 9fe955746593..14d9278579ba 100644 --- a/dpnp/dpnp_container.py +++ b/dpnp/dpnp_container.py @@ -37,10 +37,8 @@ import dpctl.utils as dpu -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from dpnp.dpnp_array import dpnp_array __all__ = [ diff --git a/dpnp/dpnp_iface.py b/dpnp/dpnp_iface.py index 13b957ffff8f..4e046572f962 100644 --- a/dpnp/dpnp_iface.py +++ b/dpnp/dpnp_iface.py @@ -48,13 +48,12 @@ import dpctl.utils as dpu import numpy -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti import dpnp -from dpctl_ext.tensor._device import normalize_queue_device + +# pylint: disable=no-name-in-module +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti +from dpnp.tensor._device import normalize_queue_device from .dpnp_array import dpnp_array from .dpnp_utils import ( diff --git a/dpnp/dpnp_iface_arraycreation.py b/dpnp/dpnp_iface_arraycreation.py index 2800df0b2ac8..6062dca6cdfc 100644 --- a/dpnp/dpnp_iface_arraycreation.py +++ b/dpnp/dpnp_iface_arraycreation.py @@ -45,10 +45,8 @@ import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from dpnp import dpnp_container from .dpnp_algo.dpnp_arraycreation import ( diff --git a/dpnp/dpnp_iface_bitwise.py b/dpnp/dpnp_iface_bitwise.py index bff5c4e3aed9..604fd365ee18 100644 --- a/dpnp/dpnp_iface_bitwise.py +++ b/dpnp/dpnp_iface_bitwise.py @@ -45,10 +45,8 @@ import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._tensor_elementwise_impl as ti import dpnp.backend.extensions.ufunc._ufunc_impl as ufi +import dpnp.tensor._tensor_elementwise_impl as ti from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc diff --git a/dpnp/dpnp_iface_counting.py b/dpnp/dpnp_iface_counting.py index a8ebafbcead7..7bb13422f819 100644 --- a/dpnp/dpnp_iface_counting.py +++ b/dpnp/dpnp_iface_counting.py @@ -39,10 +39,8 @@ """ -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt def count_nonzero(a, axis=None, *, keepdims=False, out=None): diff --git a/dpnp/dpnp_iface_functional.py b/dpnp/dpnp_iface_functional.py index 797d8a736276..26c08f94ab6d 100644 --- a/dpnp/dpnp_iface_functional.py +++ b/dpnp/dpnp_iface_functional.py @@ -43,16 +43,13 @@ import dpnp -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import ( +# pylint: disable=no-name-in-module +from dpnp.dpnp_utils import get_usm_allocations +from dpnp.tensor._numpy_helper import ( normalize_axis_index, normalize_axis_tuple, ) -# pylint: disable=no-name-in-module -from dpnp.dpnp_utils import get_usm_allocations - def apply_along_axis(func1d, axis, arr, *args, **kwargs): """ diff --git a/dpnp/dpnp_iface_indexing.py b/dpnp/dpnp_iface_indexing.py index 4b8fb7bb6a38..98b37f53fccf 100644 --- a/dpnp/dpnp_iface_indexing.py +++ b/dpnp/dpnp_iface_indexing.py @@ -47,18 +47,17 @@ import dpctl.utils as dpu import numpy -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti import dpnp # pylint: disable=no-name-in-module import dpnp.backend.extensions.indexing._indexing_impl as indexing_ext -from dpctl_ext.tensor._copy_utils import _nonzero_impl -from dpctl_ext.tensor._indexing_functions import _get_indexing_mode -from dpctl_ext.tensor._numpy_helper import normalize_axis_index + +# pylint: disable=no-name-in-module +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti +from dpnp.tensor._copy_utils import _nonzero_impl +from dpnp.tensor._indexing_functions import _get_indexing_mode +from dpnp.tensor._numpy_helper import normalize_axis_index # pylint: disable=no-name-in-module from .dpnp_algo import ( diff --git a/dpnp/dpnp_iface_logic.py b/dpnp/dpnp_iface_logic.py index 616d1e548a34..ce1d40774ca0 100644 --- a/dpnp/dpnp_iface_logic.py +++ b/dpnp/dpnp_iface_logic.py @@ -46,12 +46,10 @@ import dpctl.utils as dpu import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as ti import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as ti from .dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc from .dpnp_array import dpnp_array diff --git a/dpnp/dpnp_iface_manipulation.py b/dpnp/dpnp_iface_manipulation.py index 0fc2c3f80fde..02f6b47c3dc1 100644 --- a/dpnp/dpnp_iface_manipulation.py +++ b/dpnp/dpnp_iface_manipulation.py @@ -47,11 +47,9 @@ import dpctl import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp -from dpctl_ext.tensor._numpy_helper import ( +import dpnp.tensor as dpt +from dpnp.tensor._numpy_helper import ( AxisError, normalize_axis_index, normalize_axis_tuple, diff --git a/dpnp/dpnp_iface_mathematical.py b/dpnp/dpnp_iface_mathematical.py index 89bc08681604..f44f7f017b3e 100644 --- a/dpnp/dpnp_iface_mathematical.py +++ b/dpnp/dpnp_iface_mathematical.py @@ -50,14 +50,12 @@ import dpctl.utils as dpu import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as ti -import dpctl_ext.tensor._type_utils as dtu import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi -from dpctl_ext.tensor._numpy_helper import ( +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as ti +import dpnp.tensor._type_utils as dtu +from dpnp.tensor._numpy_helper import ( normalize_axis_index, normalize_axis_tuple, ) diff --git a/dpnp/dpnp_iface_searching.py b/dpnp/dpnp_iface_searching.py index 19279f81286a..856fdbc98936 100644 --- a/dpnp/dpnp_iface_searching.py +++ b/dpnp/dpnp_iface_searching.py @@ -39,13 +39,14 @@ """ -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as dti +# pylint: disable=duplicate-code + import dpnp +# pylint: disable=no-name-in-module +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as dti + from .dpnp_array import dpnp_array from .dpnp_utils.dpnp_utils_reduction import dpnp_wrap_reduction_call diff --git a/dpnp/dpnp_iface_sorting.py b/dpnp/dpnp_iface_sorting.py index e7abef1f4338..cccd23171e15 100644 --- a/dpnp/dpnp_iface_sorting.py +++ b/dpnp/dpnp_iface_sorting.py @@ -41,11 +41,9 @@ from collections.abc import Sequence -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp -from dpctl_ext.tensor._numpy_helper import normalize_axis_index +import dpnp.tensor as dpt +from dpnp.tensor._numpy_helper import normalize_axis_index # pylint: disable=no-name-in-module from .dpnp_algo import ( diff --git a/dpnp/dpnp_iface_statistics.py b/dpnp/dpnp_iface_statistics.py index 4063233dc981..2cc641c8f2e2 100644 --- a/dpnp/dpnp_iface_statistics.py +++ b/dpnp/dpnp_iface_statistics.py @@ -46,13 +46,11 @@ import dpctl.utils as dpu import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as ti import dpnp import dpnp.backend.extensions.statistics._statistics_impl as statistics_ext -from dpctl_ext.tensor._numpy_helper import normalize_axis_index +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as ti +from dpnp.tensor._numpy_helper import normalize_axis_index from .dpnp_utils import get_usm_allocations from .dpnp_utils.dpnp_utils_common import ( diff --git a/dpnp/dpnp_iface_trigonometric.py b/dpnp/dpnp_iface_trigonometric.py index 906a20f1625e..35428a0416e7 100644 --- a/dpnp/dpnp_iface_trigonometric.py +++ b/dpnp/dpnp_iface_trigonometric.py @@ -42,13 +42,11 @@ # pylint: disable=protected-access # pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as ti -import dpctl_ext.tensor._type_utils as dtu import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as ti +import dpnp.tensor._type_utils as dtu from .dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc from .dpnp_utils.dpnp_utils_reduction import dpnp_wrap_reduction_call diff --git a/dpnp/dpnp_iface_types.py b/dpnp/dpnp_iface_types.py index 7d2d60089d98..d3b295289831 100644 --- a/dpnp/dpnp_iface_types.py +++ b/dpnp/dpnp_iface_types.py @@ -39,10 +39,8 @@ import dpctl import numpy -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from .dpnp_array import dpnp_array diff --git a/dpnp/dpnp_utils/dpnp_utils_common.py b/dpnp/dpnp_utils/dpnp_utils_common.py index aa294fefe275..55d0f57ca1e2 100644 --- a/dpnp/dpnp_utils/dpnp_utils_common.py +++ b/dpnp/dpnp_utils/dpnp_utils_common.py @@ -29,10 +29,8 @@ from collections.abc import Iterable -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._type_utils as dtu import dpnp +import dpnp.tensor._type_utils as dtu from dpnp.dpnp_utils import map_dtype_to_device __all__ = [ diff --git a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py index 28ed40ab5f61..3ea0ec170bb3 100644 --- a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py +++ b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py @@ -30,20 +30,19 @@ import numpy from dpctl.utils import ExecutionPlacementError -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti import dpnp import dpnp.backend.extensions.blas._blas_impl as bi -from dpctl_ext.tensor._numpy_helper import ( + +# pylint: disable=no-name-in-module +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti +from dpnp.dpnp_array import dpnp_array +from dpnp.dpnp_utils import get_usm_allocations +from dpnp.tensor._numpy_helper import ( AxisError, normalize_axis_index, normalize_axis_tuple, ) -from dpnp.dpnp_array import dpnp_array -from dpnp.dpnp_utils import get_usm_allocations __all__ = [ "dpnp_cross", diff --git a/dpnp/dpnp_utils/dpnp_utils_statistics.py b/dpnp/dpnp_utils/dpnp_utils_statistics.py index cd9932cb7153..6dd5d6433f82 100644 --- a/dpnp/dpnp_utils/dpnp_utils_statistics.py +++ b/dpnp/dpnp_utils/dpnp_utils_statistics.py @@ -31,12 +31,10 @@ import dpctl from dpctl.utils import ExecutionPlacementError -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp -from dpctl_ext.tensor._numpy_helper import normalize_axis_tuple +import dpnp.tensor as dpt from dpnp.dpnp_array import dpnp_array +from dpnp.tensor._numpy_helper import normalize_axis_tuple __all__ = ["dpnp_cov", "dpnp_median"] diff --git a/dpnp/exceptions/__init__.py b/dpnp/exceptions/__init__.py index 7abcdbf0553f..7e5a55961d51 100644 --- a/dpnp/exceptions/__init__.py +++ b/dpnp/exceptions/__init__.py @@ -35,9 +35,7 @@ from dpctl.utils import ExecutionPlacementError from numpy.exceptions import AxisError -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._dlpack import DLPackCreationError +from dpnp.tensor._dlpack import DLPackCreationError __all__ = [ "AxisError", diff --git a/dpnp/fft/dpnp_utils_fft.py b/dpnp/fft/dpnp_utils_fft.py index 20d0dcd0cff2..074f0a66d7bc 100644 --- a/dpnp/fft/dpnp_utils_fft.py +++ b/dpnp/fft/dpnp_utils_fft.py @@ -46,12 +46,10 @@ import numpy from dpctl.utils import ExecutionPlacementError -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._tensor_impl as ti import dpnp import dpnp.backend.extensions.fft._fft_impl as fi -from dpctl_ext.tensor._numpy_helper import ( +import dpnp.tensor._tensor_impl as ti +from dpnp.tensor._numpy_helper import ( normalize_axis_index, normalize_axis_tuple, ) diff --git a/dpnp/linalg/dpnp_iface_linalg.py b/dpnp/linalg/dpnp_iface_linalg.py index f4e0f96da5e6..625d387667ac 100644 --- a/dpnp/linalg/dpnp_iface_linalg.py +++ b/dpnp/linalg/dpnp_iface_linalg.py @@ -47,11 +47,8 @@ import numpy import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import normalize_axis_tuple from dpnp.backend.extensions.lapack._lapack_impl import LinAlgError +from dpnp.tensor._numpy_helper import normalize_axis_tuple from .dpnp_utils_linalg import ( assert_2d, diff --git a/dpnp/linalg/dpnp_utils_linalg.py b/dpnp/linalg/dpnp_utils_linalg.py index 28e11f6188c5..9d7b32d48177 100644 --- a/dpnp/linalg/dpnp_utils_linalg.py +++ b/dpnp/linalg/dpnp_utils_linalg.py @@ -46,14 +46,13 @@ import numpy from numpy import prod -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._tensor_impl as ti import dpnp import dpnp.backend.extensions.lapack._lapack_impl as li -from dpctl_ext.tensor._numpy_helper import normalize_axis_index + +# pylint: disable=no-name-in-module +import dpnp.tensor._tensor_impl as ti from dpnp.dpnp_utils import get_usm_allocations +from dpnp.tensor._numpy_helper import normalize_axis_index # pylint:disable=missing-class-docstring diff --git a/dpnp/memory/_memory.py b/dpnp/memory/_memory.py index 3e95baacd424..4987d14d97c0 100644 --- a/dpnp/memory/_memory.py +++ b/dpnp/memory/_memory.py @@ -30,9 +30,7 @@ from dpctl.memory import MemoryUSMHost as DPCTLMemoryUSMHost from dpctl.memory import MemoryUSMShared as DPCTLMemoryUSMShared -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt def _add_ptr_property(cls): diff --git a/dpnp/scipy/linalg/_utils.py b/dpnp/scipy/linalg/_utils.py index f7bdd5330d42..1e80797ca469 100644 --- a/dpnp/scipy/linalg/_utils.py +++ b/dpnp/scipy/linalg/_utils.py @@ -45,12 +45,11 @@ import dpctl.utils as dpu -# pylint: disable=no-name-in-module -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._tensor_impl as ti import dpnp import dpnp.backend.extensions.lapack._lapack_impl as li + +# pylint: disable=no-name-in-module +import dpnp.tensor._tensor_impl as ti from dpnp.dpnp_utils import get_usm_allocations from dpnp.linalg.dpnp_utils_linalg import _common_type diff --git a/dpctl_ext/tensor/CMakeLists.txt b/dpnp/tensor/CMakeLists.txt similarity index 96% rename from dpctl_ext/tensor/CMakeLists.txt rename to dpnp/tensor/CMakeLists.txt index 13c9e248594c..d1e80879bf2c 100644 --- a/dpctl_ext/tensor/CMakeLists.txt +++ b/dpnp/tensor/CMakeLists.txt @@ -29,10 +29,23 @@ find_package(Python COMPONENTS Development.Module) +# Tensor-specific debug flags +if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "DEBUG") + if(WIN32) + add_compile_options(-Xsycl-target-frontend=spir64 "-g0") + elseif(UNIX) + string(REPLACE "-g1" "-g" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "-g1" "-g" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") + endif() +endif() + +# Suppress unused parameter warnings +add_compile_options(-Wno-unused-parameter) + file(GLOB _cython_sources *.pyx) foreach(_cy_file ${_cython_sources}) get_filename_component(_trgt ${_cy_file} NAME_WLE) - build_dpctl_ext(${_trgt} ${_cy_file} "dpctl_ext/tensor" RELATIVE_PATH "..") + build_dpnp_tensor_ext(${_trgt} ${_cy_file} "dpnp/tensor" RELATIVE_PATH "..") target_include_directories(${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) endforeach() @@ -304,8 +317,7 @@ foreach(python_module_name ${_py_trgts}) ${python_module_name} PRIVATE -fsycl-device-code-split=per_kernel ) - # TODO: expand DPCTL_OFFLOAD_COMPRESS to the whole dpnp level - if(DPCTL_OFFLOAD_COMPRESS) + if(DPNP_TENSOR_OFFLOAD_COMPRESS) target_link_options(${python_module_name} PRIVATE --offload-compress) endif() @@ -319,8 +331,8 @@ foreach(python_module_name ${_py_trgts}) ${CMAKE_BINARY_DIR} # For generated Cython headers ) target_link_options(${python_module_name} PRIVATE ${_linker_options}) - if(DPCTL_GENERATE_COVERAGE) - if(DPCTL_GENERATE_COVERAGE_FOR_PYBIND11_EXTENSIONS) + if(DPNP_GENERATE_COVERAGE) + if(DPNP_TENSOR_GENERATE_COVERAGE_FOR_PYBIND11_EXTENSIONS) target_compile_options( ${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping @@ -350,6 +362,5 @@ foreach(python_module_name ${_py_trgts}) PROPERTIES INSTALL_RPATH "$ORIGIN/../../../.." ) endif() - # TODO: revert to `DESTINATION "dpctl/tensor"` - install(TARGETS ${python_module_name} DESTINATION "dpctl_ext/tensor") + install(TARGETS ${python_module_name} DESTINATION "dpnp/tensor") endforeach() diff --git a/dpctl_ext/tensor/__init__.pxd b/dpnp/tensor/__init__.pxd similarity index 100% rename from dpctl_ext/tensor/__init__.pxd rename to dpnp/tensor/__init__.pxd diff --git a/dpctl_ext/tensor/__init__.py b/dpnp/tensor/__init__.py similarity index 100% rename from dpctl_ext/tensor/__init__.py rename to dpnp/tensor/__init__.py diff --git a/dpctl_ext/tensor/_accumulation.py b/dpnp/tensor/_accumulation.py similarity index 98% rename from dpctl_ext/tensor/_accumulation.py rename to dpnp/tensor/_accumulation.py index 8628628f3bf8..305cf263514e 100644 --- a/dpctl_ext/tensor/_accumulation.py +++ b/dpnp/tensor/_accumulation.py @@ -29,11 +29,9 @@ import dpctl from dpctl.utils import ExecutionPlacementError, SequentialOrderManager -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_accumulation_impl as tai -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_accumulation_impl as tai +import dpnp.tensor._tensor_impl as ti from ._numpy_helper import normalize_axis_index from ._type_utils import ( diff --git a/dpctl_ext/tensor/_array_api.py b/dpnp/tensor/_array_api.py similarity index 98% rename from dpctl_ext/tensor/_array_api.py rename to dpnp/tensor/_array_api.py index 09f71bc1bdd3..a18bc2be1824 100644 --- a/dpctl_ext/tensor/_array_api.py +++ b/dpnp/tensor/_array_api.py @@ -28,9 +28,7 @@ import dpctl -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt from ._tensor_impl import ( default_device_complex_type, diff --git a/dpctl_ext/tensor/_clip.py b/dpnp/tensor/_clip.py similarity index 99% rename from dpctl_ext/tensor/_clip.py rename to dpnp/tensor/_clip.py index 8071f13bee19..64020e88ce39 100644 --- a/dpctl_ext/tensor/_clip.py +++ b/dpnp/tensor/_clip.py @@ -29,11 +29,9 @@ import dpctl from dpctl.utils import ExecutionPlacementError, SequentialOrderManager -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as tei -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as tei +import dpnp.tensor._tensor_impl as ti from ._copy_utils import ( _empty_like_orderK, diff --git a/dpctl_ext/tensor/_constants.py b/dpnp/tensor/_constants.py similarity index 100% rename from dpctl_ext/tensor/_constants.py rename to dpnp/tensor/_constants.py diff --git a/dpctl_ext/tensor/_copy_utils.py b/dpnp/tensor/_copy_utils.py similarity index 99% rename from dpctl_ext/tensor/_copy_utils.py rename to dpnp/tensor/_copy_utils.py index b056511ac33b..9a16d4f59acd 100644 --- a/dpctl_ext/tensor/_copy_utils.py +++ b/dpnp/tensor/_copy_utils.py @@ -35,10 +35,8 @@ import dpctl.utils import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._data_types import _get_dtype from ._device import normalize_queue_device diff --git a/dpctl_ext/tensor/_ctors.py b/dpnp/tensor/_ctors.py similarity index 99% rename from dpctl_ext/tensor/_ctors.py rename to dpnp/tensor/_ctors.py index 041faba73205..c6e14db7398f 100644 --- a/dpctl_ext/tensor/_ctors.py +++ b/dpnp/tensor/_ctors.py @@ -34,10 +34,8 @@ import dpctl.utils import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._copy_utils import ( _empty_like_orderK, diff --git a/dpctl_ext/tensor/_data_types.py b/dpnp/tensor/_data_types.py similarity index 100% rename from dpctl_ext/tensor/_data_types.py rename to dpnp/tensor/_data_types.py diff --git a/dpctl_ext/tensor/_device.py b/dpnp/tensor/_device.py similarity index 100% rename from dpctl_ext/tensor/_device.py rename to dpnp/tensor/_device.py diff --git a/dpctl_ext/tensor/_dldevice_conversions.py b/dpnp/tensor/_dldevice_conversions.py similarity index 100% rename from dpctl_ext/tensor/_dldevice_conversions.py rename to dpnp/tensor/_dldevice_conversions.py diff --git a/dpctl_ext/tensor/_dlpack.pxd b/dpnp/tensor/_dlpack.pxd similarity index 100% rename from dpctl_ext/tensor/_dlpack.pxd rename to dpnp/tensor/_dlpack.pxd diff --git a/dpctl_ext/tensor/_dlpack.pyx b/dpnp/tensor/_dlpack.pyx similarity index 99% rename from dpctl_ext/tensor/_dlpack.pyx rename to dpnp/tensor/_dlpack.pyx index 21b3d877c475..947377d3a660 100644 --- a/dpctl_ext/tensor/_dlpack.pyx +++ b/dpnp/tensor/_dlpack.pyx @@ -1086,7 +1086,7 @@ def from_dlpack(x, /, *, device=None, copy=None): .. code-block:: python import dpctl - import dpctl_ext.tensor as dpt + import dpnp.tensor as dpt class Container: "Helper class implementing `__dlpack__` protocol" @@ -1209,9 +1209,7 @@ def from_dlpack(x, /, *, device=None, copy=None): ) return from_dlpack_capsule(cpu_caps) else: - # TODO: revert to `import dpctl.tensor` - # when dpnp fully migrates dpctl/tensor - import dpctl_ext.tensor as dpt + import dpnp.tensor as dpt return dpt.asarray(blob, device=dev) elif got_buffer_error: # we are here, because dlpack_attr could not deal with requested diff --git a/dpctl_ext/tensor/_elementwise_common.py b/dpnp/tensor/_elementwise_common.py similarity index 99% rename from dpctl_ext/tensor/_elementwise_common.py rename to dpnp/tensor/_elementwise_common.py index ffe849db9cad..d312d50a4a8f 100644 --- a/dpctl_ext/tensor/_elementwise_common.py +++ b/dpnp/tensor/_elementwise_common.py @@ -29,10 +29,8 @@ import dpctl from dpctl.utils import ExecutionPlacementError, SequentialOrderManager -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._copy_utils import _empty_like_orderK, _empty_like_pair_orderK from ._manipulation_functions import _broadcast_shape_impl diff --git a/dpctl_ext/tensor/_elementwise_funcs.py b/dpnp/tensor/_elementwise_funcs.py similarity index 99% rename from dpctl_ext/tensor/_elementwise_funcs.py rename to dpnp/tensor/_elementwise_funcs.py index 6442ef0b4594..5d38cad0c2a5 100644 --- a/dpctl_ext/tensor/_elementwise_funcs.py +++ b/dpnp/tensor/_elementwise_funcs.py @@ -26,9 +26,7 @@ # THE POSSIBILITY OF SUCH DAMAGE. # ***************************************************************************** -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._tensor_elementwise_impl as ti +import dpnp.tensor._tensor_elementwise_impl as ti from ._elementwise_common import BinaryElementwiseFunc, UnaryElementwiseFunc from ._type_utils import ( diff --git a/dpctl_ext/tensor/_flags.pyx b/dpnp/tensor/_flags.pyx similarity index 100% rename from dpctl_ext/tensor/_flags.pyx rename to dpnp/tensor/_flags.pyx diff --git a/dpctl_ext/tensor/_indexing_functions.py b/dpnp/tensor/_indexing_functions.py similarity index 99% rename from dpctl_ext/tensor/_indexing_functions.py rename to dpnp/tensor/_indexing_functions.py index 08db81c1b166..8f097e59efc3 100644 --- a/dpctl_ext/tensor/_indexing_functions.py +++ b/dpnp/tensor/_indexing_functions.py @@ -31,10 +31,8 @@ import dpctl import dpctl.utils -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._copy_utils import ( _extract_impl, diff --git a/dpctl_ext/tensor/_linear_algebra_functions.py b/dpnp/tensor/_linear_algebra_functions.py similarity index 99% rename from dpctl_ext/tensor/_linear_algebra_functions.py rename to dpnp/tensor/_linear_algebra_functions.py index 6dfb30e881b2..bec0522cd18f 100644 --- a/dpctl_ext/tensor/_linear_algebra_functions.py +++ b/dpnp/tensor/_linear_algebra_functions.py @@ -31,12 +31,10 @@ import dpctl from dpctl.utils import ExecutionPlacementError, SequentialOrderManager -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as tei -import dpctl_ext.tensor._tensor_impl as ti -import dpctl_ext.tensor._tensor_linalg_impl as tli +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as tei +import dpnp.tensor._tensor_impl as ti +import dpnp.tensor._tensor_linalg_impl as tli from ._copy_utils import _empty_like_orderK, _empty_like_pair_orderK from ._manipulation_functions import _broadcast_shape_impl diff --git a/dpctl_ext/tensor/_manipulation_functions.py b/dpnp/tensor/_manipulation_functions.py similarity index 99% rename from dpctl_ext/tensor/_manipulation_functions.py rename to dpnp/tensor/_manipulation_functions.py index 33817dd0aa2e..965bafda7948 100644 --- a/dpctl_ext/tensor/_manipulation_functions.py +++ b/dpnp/tensor/_manipulation_functions.py @@ -33,10 +33,8 @@ import dpctl.utils as dputils import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._numpy_helper import normalize_axis_index, normalize_axis_tuple from ._type_utils import _supported_dtype, _to_device_supported_dtype diff --git a/dpctl_ext/tensor/_numpy_helper.py b/dpnp/tensor/_numpy_helper.py similarity index 100% rename from dpctl_ext/tensor/_numpy_helper.py rename to dpnp/tensor/_numpy_helper.py diff --git a/dpctl_ext/tensor/_print.py b/dpnp/tensor/_print.py similarity index 99% rename from dpctl_ext/tensor/_print.py rename to dpnp/tensor/_print.py index 5385eadb2537..c9325af9d312 100644 --- a/dpctl_ext/tensor/_print.py +++ b/dpnp/tensor/_print.py @@ -34,10 +34,8 @@ import dpctl.utils import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti __doc__ = "Print functions for :class:`dpctl.tensor.usm_ndarray`." diff --git a/dpctl_ext/tensor/_reduction.py b/dpnp/tensor/_reduction.py similarity index 99% rename from dpctl_ext/tensor/_reduction.py rename to dpnp/tensor/_reduction.py index 79e620605f07..82b75503e269 100644 --- a/dpctl_ext/tensor/_reduction.py +++ b/dpnp/tensor/_reduction.py @@ -29,11 +29,9 @@ import dpctl from dpctl.utils import ExecutionPlacementError, SequentialOrderManager -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti -import dpctl_ext.tensor._tensor_reductions_impl as tri +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti +import dpnp.tensor._tensor_reductions_impl as tri from ._numpy_helper import normalize_axis_tuple from ._type_utils import ( diff --git a/dpctl_ext/tensor/_reshape.py b/dpnp/tensor/_reshape.py similarity index 98% rename from dpctl_ext/tensor/_reshape.py rename to dpnp/tensor/_reshape.py index 7ecdace4fc42..6d817c5ccdf0 100644 --- a/dpctl_ext/tensor/_reshape.py +++ b/dpnp/tensor/_reshape.py @@ -31,9 +31,7 @@ import dpctl.utils import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt from ._tensor_impl import ( _copy_usm_ndarray_for_reshape, diff --git a/dpctl_ext/tensor/_scalar_utils.py b/dpnp/tensor/_scalar_utils.py similarity index 97% rename from dpctl_ext/tensor/_scalar_utils.py rename to dpnp/tensor/_scalar_utils.py index 84abdf7b5a52..828f01f1c862 100644 --- a/dpctl_ext/tensor/_scalar_utils.py +++ b/dpnp/tensor/_scalar_utils.py @@ -31,9 +31,7 @@ import dpctl.memory as dpm import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt from ._type_utils import ( WeakBooleanType, diff --git a/dpctl_ext/tensor/_search_functions.py b/dpnp/tensor/_search_functions.py similarity index 98% rename from dpctl_ext/tensor/_search_functions.py rename to dpnp/tensor/_search_functions.py index aae185b64e2b..7e443351311a 100644 --- a/dpctl_ext/tensor/_search_functions.py +++ b/dpnp/tensor/_search_functions.py @@ -29,10 +29,8 @@ import dpctl from dpctl.utils import ExecutionPlacementError, SequentialOrderManager -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._copy_utils import _empty_like_orderK, _empty_like_triple_orderK from ._manipulation_functions import _broadcast_shape_impl diff --git a/dpctl_ext/tensor/_searchsorted.py b/dpnp/tensor/_searchsorted.py similarity index 98% rename from dpctl_ext/tensor/_searchsorted.py rename to dpnp/tensor/_searchsorted.py index 4c680a49b07b..66a2df7ff375 100644 --- a/dpctl_ext/tensor/_searchsorted.py +++ b/dpnp/tensor/_searchsorted.py @@ -41,9 +41,6 @@ ) from ._tensor_sorting_impl import _searchsorted_left, _searchsorted_right from ._type_utils import isdtype, result_type - -# TODO: revert to `from ._usmarray import...` -# when dpnp fully migrates dpctl/tensor from ._usmarray import usm_ndarray diff --git a/dpctl_ext/tensor/_set_functions.py b/dpnp/tensor/_set_functions.py similarity index 99% rename from dpctl_ext/tensor/_set_functions.py rename to dpnp/tensor/_set_functions.py index 76840461b5e9..e6131ddf7d2a 100644 --- a/dpctl_ext/tensor/_set_functions.py +++ b/dpnp/tensor/_set_functions.py @@ -30,9 +30,7 @@ import dpctl.utils as du -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt from ._copy_utils import _empty_like_orderK from ._scalar_utils import ( diff --git a/dpctl_ext/tensor/_slicing.pxi b/dpnp/tensor/_slicing.pxi similarity index 100% rename from dpctl_ext/tensor/_slicing.pxi rename to dpnp/tensor/_slicing.pxi diff --git a/dpctl_ext/tensor/_sorting.py b/dpnp/tensor/_sorting.py similarity index 99% rename from dpctl_ext/tensor/_sorting.py rename to dpnp/tensor/_sorting.py index 42cd9e1b44be..fb4d3e4d98e4 100644 --- a/dpctl_ext/tensor/_sorting.py +++ b/dpnp/tensor/_sorting.py @@ -31,10 +31,8 @@ import dpctl.utils as du -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti from ._numpy_helper import normalize_axis_index from ._tensor_sorting_impl import ( diff --git a/dpctl_ext/tensor/_statistical_functions.py b/dpnp/tensor/_statistical_functions.py similarity index 98% rename from dpctl_ext/tensor/_statistical_functions.py rename to dpnp/tensor/_statistical_functions.py index c1544b84c6a7..3d717554b5f8 100644 --- a/dpctl_ext/tensor/_statistical_functions.py +++ b/dpnp/tensor/_statistical_functions.py @@ -27,12 +27,10 @@ import dpctl.utils as du -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_elementwise_impl as tei -import dpctl_ext.tensor._tensor_impl as ti -import dpctl_ext.tensor._tensor_reductions_impl as tri +import dpnp.tensor as dpt +import dpnp.tensor._tensor_elementwise_impl as tei +import dpnp.tensor._tensor_impl as ti +import dpnp.tensor._tensor_reductions_impl as tri from ._numpy_helper import normalize_axis_tuple diff --git a/dpctl_ext/tensor/_stride_utils.pxi b/dpnp/tensor/_stride_utils.pxi similarity index 100% rename from dpctl_ext/tensor/_stride_utils.pxi rename to dpnp/tensor/_stride_utils.pxi diff --git a/dpctl_ext/tensor/_testing.py b/dpnp/tensor/_testing.py similarity index 98% rename from dpctl_ext/tensor/_testing.py rename to dpnp/tensor/_testing.py index 4c9f5ebac9a4..ec1f0c47be60 100644 --- a/dpctl_ext/tensor/_testing.py +++ b/dpnp/tensor/_testing.py @@ -29,9 +29,7 @@ import dpctl.utils as du import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt +import dpnp.tensor as dpt from ._manipulation_functions import _broadcast_shape_impl from ._type_utils import _to_device_supported_dtype diff --git a/dpctl_ext/tensor/_type_utils.py b/dpnp/tensor/_type_utils.py similarity index 99% rename from dpctl_ext/tensor/_type_utils.py rename to dpnp/tensor/_type_utils.py index 8c15053cb4c1..3da9e7994760 100644 --- a/dpctl_ext/tensor/_type_utils.py +++ b/dpnp/tensor/_type_utils.py @@ -30,10 +30,8 @@ import numpy as np -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti def _all_data_types(_fp16, _fp64): diff --git a/dpctl_ext/tensor/_types.pxi b/dpnp/tensor/_types.pxi similarity index 100% rename from dpctl_ext/tensor/_types.pxi rename to dpnp/tensor/_types.pxi diff --git a/dpctl_ext/tensor/_usmarray.pxd b/dpnp/tensor/_usmarray.pxd similarity index 100% rename from dpctl_ext/tensor/_usmarray.pxd rename to dpnp/tensor/_usmarray.pxd diff --git a/dpctl_ext/tensor/_usmarray.pyx b/dpnp/tensor/_usmarray.pyx similarity index 93% rename from dpctl_ext/tensor/_usmarray.pyx rename to dpnp/tensor/_usmarray.pyx index e3b33fd71ac8..519fefed6129 100644 --- a/dpctl_ext/tensor/_usmarray.pyx +++ b/dpnp/tensor/_usmarray.pyx @@ -37,8 +37,7 @@ import numpy as np from dpctl._backend cimport DPCTLSyclUSMRef from dpctl._sycl_device_factory cimport _cached_default_device -# TODO: remote it when dpnp fully migrates dpctl/tensor -import dpctl_ext +import dpnp.tensor from ._data_types import bool as dpt_bool from ._device import Device @@ -466,7 +465,7 @@ cdef class usm_ndarray: .. code-block:: python - from dpctl_ext import tensor + from dpnp import tensor x = tensor.ones((3, 10, 7)) y = tensor.flip(x[:, 1::2], axis=1) @@ -660,7 +659,7 @@ cdef class usm_ndarray: .. code-block:: python - from dpctl_ext import tensor + from dpnp import tensor x = tensor.arange(899) x.shape = (29, 31) @@ -765,7 +764,7 @@ cdef class usm_ndarray: .. code-block:: python - from dpctl_ext import tensor + from dpnp import tensor x = tensor.zeros((20, 30)) xv = x[10:, :15] @@ -878,7 +877,7 @@ cdef class usm_ndarray: .. code-block:: python - >>> from dpctl_ext import tensor + >>> from dpnp import tensor >>> x = tensor.ones(10) >>> x.device Device(level_zero:gpu:0) @@ -929,7 +928,7 @@ cdef class usm_ndarray: .. code-block:: python - from dpctl_ext import tensor + from dpnp import tensor # Create complex array from # arrays of real and imaginary parts @@ -958,7 +957,7 @@ cdef class usm_ndarray: .. code-block:: python - from dpctl_ext import tensor + from dpnp import tensor # Reset imaginary part of complex array @@ -1050,7 +1049,7 @@ cdef class usm_ndarray: .. code-block:: python import dpctl - import dpctl_ext.tensor as dpt + import dpnp.tensor as dpt x = dpt.full(10**6, 2, dtype="int64") q_prof = dpctl.SyclQueue( @@ -1146,9 +1145,7 @@ cdef class usm_ndarray: return ( self.array_namespace_ if self.array_namespace_ is not None - # TODO: revert to `else dpctl.tensor` - # when dpnp fully migrates dpctl/tensor - else dpctl_ext.tensor + else dpnp.tensor ) def __bool__(self): @@ -1204,19 +1201,17 @@ cdef class usm_ndarray: raise IndexError("only integer arrays are valid indices") def __abs__(self): - # TODO: revert to `return dpctl.tensor...` - # when dpnp fully migrates dpctl/tensor - return dpctl_ext.tensor.abs(self) + return dpnp.tensor.abs(self) def __add__(self, other): """ Implementation for operator.add """ - return dpctl_ext.tensor.add(self, other) + return dpnp.tensor.add(self, other) def __and__(self, other): "Implementation for operator.and" - return dpctl_ext.tensor.bitwise_and(self, other) + return dpnp.tensor.bitwise_and(self, other) def __dlpack__( self, *, stream=None, max_version=None, dl_device=None, copy=None @@ -1375,24 +1370,22 @@ cdef class usm_ndarray: ) def __eq__(self, other): - # TODO: revert to `return dpctl.tensor...` - # when dpnp fully migrates dpctl/tensor - return dpctl_ext.tensor.equal(self, other) + return dpnp.tensor.equal(self, other) def __floordiv__(self, other): - return dpctl_ext.tensor.floor_divide(self, other) + return dpnp.tensor.floor_divide(self, other) def __ge__(self, other): - return dpctl_ext.tensor.greater_equal(self, other) + return dpnp.tensor.greater_equal(self, other) def __gt__(self, other): - return dpctl_ext.tensor.greater(self, other) + return dpnp.tensor.greater(self, other) def __invert__(self): - return dpctl_ext.tensor.bitwise_invert(self) + return dpnp.tensor.bitwise_invert(self) def __le__(self, other): - return dpctl_ext.tensor.less_equal(self, other) + return dpnp.tensor.less_equal(self, other) def __len__(self): if (self.nd_): @@ -1401,37 +1394,37 @@ cdef class usm_ndarray: raise TypeError("len() of unsized object") def __lshift__(self, other): - return dpctl_ext.tensor.bitwise_left_shift(self, other) + return dpnp.tensor.bitwise_left_shift(self, other) def __lt__(self, other): - return dpctl_ext.tensor.less(self, other) + return dpnp.tensor.less(self, other) def __matmul__(self, other): - return dpctl_ext.tensor.matmul(self, other) + return dpnp.tensor.matmul(self, other) def __mod__(self, other): - return dpctl_ext.tensor.remainder(self, other) + return dpnp.tensor.remainder(self, other) def __mul__(self, other): - return dpctl_ext.tensor.multiply(self, other) + return dpnp.tensor.multiply(self, other) def __ne__(self, other): - return dpctl_ext.tensor.not_equal(self, other) + return dpnp.tensor.not_equal(self, other) def __neg__(self): - return dpctl_ext.tensor.negative(self) + return dpnp.tensor.negative(self) def __or__(self, other): - return dpctl_ext.tensor.bitwise_or(self, other) + return dpnp.tensor.bitwise_or(self, other) def __pos__(self): - return dpctl_ext.tensor.positive(self) + return dpnp.tensor.positive(self) def __pow__(self, other): - return dpctl_ext.tensor.pow(self, other) + return dpnp.tensor.pow(self, other) def __rshift__(self, other): - return dpctl_ext.tensor.bitwise_right_shift(self, other) + return dpnp.tensor.bitwise_right_shift(self, other) def __setitem__(self, key, rhs): cdef tuple _meta @@ -1476,7 +1469,7 @@ cdef class usm_ndarray: _copy_from_usm_ndarray_to_usm_ndarray(Xv, rhs) else: if hasattr(rhs, "__sycl_usm_array_interface__"): - from dpctl_ext.tensor import asarray + from dpnp.tensor import asarray try: rhs_ar = asarray(rhs) _copy_from_usm_ndarray_to_usm_ndarray(Xv, rhs_ar) @@ -1524,93 +1517,91 @@ cdef class usm_ndarray: return def __sub__(self, other): - # TODO: revert to `return dpctl.tensor...` - # when dpnp fully migrates dpctl/tensor - return dpctl_ext.tensor.subtract(self, other) + return dpnp.tensor.subtract(self, other) def __truediv__(self, other): - return dpctl_ext.tensor.divide(self, other) + return dpnp.tensor.divide(self, other) def __xor__(self, other): - return dpctl_ext.tensor.bitwise_xor(self, other) + return dpnp.tensor.bitwise_xor(self, other) def __radd__(self, other): - return dpctl_ext.tensor.add(other, self) + return dpnp.tensor.add(other, self) def __rand__(self, other): - return dpctl_ext.tensor.bitwise_and(other, self) + return dpnp.tensor.bitwise_and(other, self) def __rfloordiv__(self, other): - return dpctl_ext.tensor.floor_divide(other, self) + return dpnp.tensor.floor_divide(other, self) def __rlshift__(self, other): - return dpctl_ext.tensor.bitwise_left_shift(other, self) + return dpnp.tensor.bitwise_left_shift(other, self) def __rmatmul__(self, other): - return dpctl_ext.tensor.matmul(other, self) + return dpnp.tensor.matmul(other, self) def __rmod__(self, other): - return dpctl_ext.tensor.remainder(other, self) + return dpnp.tensor.remainder(other, self) def __rmul__(self, other): - return dpctl_ext.tensor.multiply(other, self) + return dpnp.tensor.multiply(other, self) def __ror__(self, other): - return dpctl_ext.tensor.bitwise_or(other, self) + return dpnp.tensor.bitwise_or(other, self) def __rpow__(self, other): - return dpctl_ext.tensor.pow(other, self) + return dpnp.tensor.pow(other, self) def __rrshift__(self, other): - return dpctl_ext.tensor.bitwise_right_shift(other, self) + return dpnp.tensor.bitwise_right_shift(other, self) def __rsub__(self, other): - return dpctl_ext.tensor.subtract(other, self) + return dpnp.tensor.subtract(other, self) def __rtruediv__(self, other): - return dpctl_ext.tensor.divide(other, self) + return dpnp.tensor.divide(other, self) def __rxor__(self, other): - return dpctl_ext.tensor.bitwise_xor(other, self) + return dpnp.tensor.bitwise_xor(other, self) def __iadd__(self, other): - return dpctl_ext.tensor.add._inplace_op(self, other) + return dpnp.tensor.add._inplace_op(self, other) def __iand__(self, other): - return dpctl_ext.tensor.bitwise_and._inplace_op(self, other) + return dpnp.tensor.bitwise_and._inplace_op(self, other) def __ifloordiv__(self, other): - return dpctl_ext.tensor.floor_divide._inplace_op(self, other) + return dpnp.tensor.floor_divide._inplace_op(self, other) def __ilshift__(self, other): - return dpctl_ext.tensor.bitwise_left_shift._inplace_op(self, other) + return dpnp.tensor.bitwise_left_shift._inplace_op(self, other) def __imatmul__(self, other): - return dpctl_ext.tensor.matmul(self, other, out=self, dtype=self.dtype) + return dpnp.tensor.matmul(self, other, out=self, dtype=self.dtype) def __imod__(self, other): - return dpctl_ext.tensor.remainder._inplace_op(self, other) + return dpnp.tensor.remainder._inplace_op(self, other) def __imul__(self, other): - return dpctl_ext.tensor.multiply._inplace_op(self, other) + return dpnp.tensor.multiply._inplace_op(self, other) def __ior__(self, other): - return dpctl_ext.tensor.bitwise_or._inplace_op(self, other) + return dpnp.tensor.bitwise_or._inplace_op(self, other) def __ipow__(self, other): - return dpctl_ext.tensor.pow._inplace_op(self, other) + return dpnp.tensor.pow._inplace_op(self, other) def __irshift__(self, other): - return dpctl_ext.tensor.bitwise_right_shift._inplace_op(self, other) + return dpnp.tensor.bitwise_right_shift._inplace_op(self, other) def __isub__(self, other): - return dpctl_ext.tensor.subtract._inplace_op(self, other) + return dpnp.tensor.subtract._inplace_op(self, other) def __itruediv__(self, other): - return dpctl_ext.tensor.divide._inplace_op(self, other) + return dpnp.tensor.divide._inplace_op(self, other) def __ixor__(self, other): - return dpctl_ext.tensor.bitwise_xor._inplace_op(self, other) + return dpnp.tensor.bitwise_xor._inplace_op(self, other) def __str__(self): return usm_ndarray_str(self) diff --git a/dpctl_ext/tensor/_utility_functions.py b/dpnp/tensor/_utility_functions.py similarity index 98% rename from dpctl_ext/tensor/_utility_functions.py rename to dpnp/tensor/_utility_functions.py index c892d777102d..644c2ce9911f 100644 --- a/dpctl_ext/tensor/_utility_functions.py +++ b/dpnp/tensor/_utility_functions.py @@ -31,11 +31,9 @@ import dpctl.utils as du -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt -import dpctl_ext.tensor._tensor_impl as ti -import dpctl_ext.tensor._tensor_reductions_impl as tri +import dpnp.tensor as dpt +import dpnp.tensor._tensor_impl as ti +import dpnp.tensor._tensor_reductions_impl as tri from ._numpy_helper import normalize_axis_index, normalize_axis_tuple from ._scalar_utils import ( diff --git a/dpctl_ext/tensor/include/dlpack/LICENSE.third-party b/dpnp/tensor/include/dlpack/LICENSE.third-party similarity index 100% rename from dpctl_ext/tensor/include/dlpack/LICENSE.third-party rename to dpnp/tensor/include/dlpack/LICENSE.third-party diff --git a/dpctl_ext/tensor/include/dlpack/README.md b/dpnp/tensor/include/dlpack/README.md similarity index 100% rename from dpctl_ext/tensor/include/dlpack/README.md rename to dpnp/tensor/include/dlpack/README.md diff --git a/dpctl_ext/tensor/include/dlpack/dlpack.h b/dpnp/tensor/include/dlpack/dlpack.h similarity index 100% rename from dpctl_ext/tensor/include/dlpack/dlpack.h rename to dpnp/tensor/include/dlpack/dlpack.h diff --git a/dpctl_ext/tensor/libtensor/include/kernels/accumulators.hpp b/dpnp/tensor/libtensor/include/kernels/accumulators.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/accumulators.hpp rename to dpnp/tensor/libtensor/include/kernels/accumulators.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/alignment.hpp b/dpnp/tensor/libtensor/include/kernels/alignment.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/alignment.hpp rename to dpnp/tensor/libtensor/include/kernels/alignment.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/boolean_advanced_indexing.hpp b/dpnp/tensor/libtensor/include/kernels/boolean_advanced_indexing.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/boolean_advanced_indexing.hpp rename to dpnp/tensor/libtensor/include/kernels/boolean_advanced_indexing.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/clip.hpp b/dpnp/tensor/libtensor/include/kernels/clip.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/clip.hpp rename to dpnp/tensor/libtensor/include/kernels/clip.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/constructors.hpp b/dpnp/tensor/libtensor/include/kernels/constructors.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/constructors.hpp rename to dpnp/tensor/libtensor/include/kernels/constructors.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/copy_and_cast.hpp b/dpnp/tensor/libtensor/include/kernels/copy_and_cast.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/copy_and_cast.hpp rename to dpnp/tensor/libtensor/include/kernels/copy_and_cast.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/copy_as_contiguous.hpp b/dpnp/tensor/libtensor/include/kernels/copy_as_contiguous.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/copy_as_contiguous.hpp rename to dpnp/tensor/libtensor/include/kernels/copy_as_contiguous.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/dpctl_tensor_types.hpp b/dpnp/tensor/libtensor/include/kernels/dpctl_tensor_types.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/dpctl_tensor_types.hpp rename to dpnp/tensor/libtensor/include/kernels/dpctl_tensor_types.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/abs.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/acos.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/acos.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/acos.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/acos.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/acosh.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/acosh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/acosh.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/acosh.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/add.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/add.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/add.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/add.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/angle.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/angle.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/angle.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/angle.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/asin.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/asin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/asin.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/asin.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/asinh.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/asinh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/asinh.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/asinh.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/atan.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/atan.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/atan.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/atan.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/atan2.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/atan2.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/atan2.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/atan2.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/atanh.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/atanh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/atanh.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/atanh.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_and.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_and.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_and.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_and.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_invert.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_invert.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_invert.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_invert.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_left_shift.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_left_shift.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_left_shift.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_left_shift.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_or.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_or.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_or.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_or.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_right_shift.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_right_shift.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_right_shift.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_right_shift.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_xor.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_xor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/bitwise_xor.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/bitwise_xor.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cabs_impl.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/cabs_impl.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cabs_impl.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/cabs_impl.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cbrt.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/cbrt.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cbrt.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/cbrt.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/ceil.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/ceil.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/ceil.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/ceil.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/common.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/common.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/common.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/common.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/common_detail.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/common_detail.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/common_detail.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/common_detail.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/conj.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/conj.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/conj.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/conj.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/copysign.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/copysign.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/copysign.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/copysign.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cos.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/cos.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cos.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/cos.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cosh.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/cosh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/cosh.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/cosh.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/equal.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/equal.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/equal.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/exp.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/exp.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/exp.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/exp.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/exp2.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/exp2.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/exp2.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/exp2.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/expm1.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/expm1.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/expm1.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/expm1.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/floor.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/floor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/floor.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/floor.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/floor_divide.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/floor_divide.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/floor_divide.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/floor_divide.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/greater.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/greater.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/greater.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/greater.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/greater_equal.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/greater_equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/greater_equal.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/greater_equal.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/hypot.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/hypot.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/hypot.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/hypot.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/imag.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/imag.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/imag.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/imag.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/isfinite.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/isfinite.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/isfinite.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/isfinite.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/isinf.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/isinf.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/isinf.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/isinf.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/isnan.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/isnan.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/isnan.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/isnan.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/less.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/less.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/less.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/less.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/less_equal.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/less_equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/less_equal.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/less_equal.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/log.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/log.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log10.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/log10.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log10.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/log10.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log1p.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/log1p.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log1p.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/log1p.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log2.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/log2.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/log2.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/log2.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logaddexp.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/logaddexp.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logaddexp.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/logaddexp.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_and.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_and.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_and.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_and.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_not.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_not.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_not.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_not.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_or.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_or.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_or.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_or.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_xor.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_xor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/logical_xor.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/logical_xor.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/maximum.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/maximum.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/maximum.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/maximum.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/minimum.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/minimum.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/minimum.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/minimum.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/multiply.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/multiply.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/multiply.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/multiply.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/negative.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/negative.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/negative.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/negative.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/nextafter.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/nextafter.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/nextafter.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/nextafter.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/not_equal.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/not_equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/not_equal.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/not_equal.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/positive.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/positive.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/positive.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/positive.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/pow.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/pow.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/pow.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/pow.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/proj.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/proj.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/proj.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/proj.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/real.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/real.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/real.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/real.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/reciprocal.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/reciprocal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/reciprocal.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/reciprocal.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/remainder.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/remainder.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/remainder.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/remainder.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/round.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/round.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/round.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/round.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/rsqrt.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/rsqrt.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/rsqrt.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/rsqrt.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sign.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/sign.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sign.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/sign.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/signbit.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/signbit.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/signbit.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/signbit.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sin.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/sin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sin.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/sin.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sinh.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/sinh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sinh.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/sinh.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sqrt.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/sqrt.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sqrt.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/sqrt.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/square.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/square.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/square.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/square.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/subtract.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/subtract.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/subtract.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/subtract.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sycl_complex.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/sycl_complex.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/sycl_complex.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/sycl_complex.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/tan.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/tan.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/tan.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/tan.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/tanh.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/tanh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/tanh.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/tanh.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/true_divide.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/true_divide.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/true_divide.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/true_divide.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/trunc.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/trunc.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/trunc.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/trunc.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/vec_size_util.hpp b/dpnp/tensor/libtensor/include/kernels/elementwise_functions/vec_size_util.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/elementwise_functions/vec_size_util.hpp rename to dpnp/tensor/libtensor/include/kernels/elementwise_functions/vec_size_util.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/integer_advanced_indexing.hpp b/dpnp/tensor/libtensor/include/kernels/integer_advanced_indexing.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/integer_advanced_indexing.hpp rename to dpnp/tensor/libtensor/include/kernels/integer_advanced_indexing.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/linalg_functions/dot_product.hpp b/dpnp/tensor/libtensor/include/kernels/linalg_functions/dot_product.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/linalg_functions/dot_product.hpp rename to dpnp/tensor/libtensor/include/kernels/linalg_functions/dot_product.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/linalg_functions/gemm.hpp b/dpnp/tensor/libtensor/include/kernels/linalg_functions/gemm.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/linalg_functions/gemm.hpp rename to dpnp/tensor/libtensor/include/kernels/linalg_functions/gemm.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/reductions.hpp b/dpnp/tensor/libtensor/include/kernels/reductions.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/reductions.hpp rename to dpnp/tensor/libtensor/include/kernels/reductions.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/repeat.hpp b/dpnp/tensor/libtensor/include/kernels/repeat.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/repeat.hpp rename to dpnp/tensor/libtensor/include/kernels/repeat.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/isin.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/isin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/isin.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/isin.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/merge_sort.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/merge_sort.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/merge_sort.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/merge_sort.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/radix_sort.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/radix_sort.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/radix_sort.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/radix_sort.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/search_sorted_detail.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/search_sorted_detail.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/search_sorted_detail.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/search_sorted_detail.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/searchsorted.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/searchsorted.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/searchsorted.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/searchsorted.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/sort_impl_fn_ptr_t.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/sort_impl_fn_ptr_t.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/sort_impl_fn_ptr_t.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/sort_impl_fn_ptr_t.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/sort_utils.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/sort_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/sort_utils.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/sort_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/sorting/topk.hpp b/dpnp/tensor/libtensor/include/kernels/sorting/topk.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/sorting/topk.hpp rename to dpnp/tensor/libtensor/include/kernels/sorting/topk.hpp diff --git a/dpctl_ext/tensor/libtensor/include/kernels/where.hpp b/dpnp/tensor/libtensor/include/kernels/where.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/kernels/where.hpp rename to dpnp/tensor/libtensor/include/kernels/where.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/indexing_utils.hpp b/dpnp/tensor/libtensor/include/utils/indexing_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/indexing_utils.hpp rename to dpnp/tensor/libtensor/include/utils/indexing_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/math_utils.hpp b/dpnp/tensor/libtensor/include/utils/math_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/math_utils.hpp rename to dpnp/tensor/libtensor/include/utils/math_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/memory_overlap.hpp b/dpnp/tensor/libtensor/include/utils/memory_overlap.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/memory_overlap.hpp rename to dpnp/tensor/libtensor/include/utils/memory_overlap.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/offset_utils.hpp b/dpnp/tensor/libtensor/include/utils/offset_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/offset_utils.hpp rename to dpnp/tensor/libtensor/include/utils/offset_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/output_validation.hpp b/dpnp/tensor/libtensor/include/utils/output_validation.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/output_validation.hpp rename to dpnp/tensor/libtensor/include/utils/output_validation.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/rich_comparisons.hpp b/dpnp/tensor/libtensor/include/utils/rich_comparisons.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/rich_comparisons.hpp rename to dpnp/tensor/libtensor/include/utils/rich_comparisons.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/strided_iters.hpp b/dpnp/tensor/libtensor/include/utils/strided_iters.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/strided_iters.hpp rename to dpnp/tensor/libtensor/include/utils/strided_iters.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/sycl_alloc_utils.hpp b/dpnp/tensor/libtensor/include/utils/sycl_alloc_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/sycl_alloc_utils.hpp rename to dpnp/tensor/libtensor/include/utils/sycl_alloc_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/sycl_utils.hpp b/dpnp/tensor/libtensor/include/utils/sycl_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/sycl_utils.hpp rename to dpnp/tensor/libtensor/include/utils/sycl_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/type_dispatch.hpp b/dpnp/tensor/libtensor/include/utils/type_dispatch.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/type_dispatch.hpp rename to dpnp/tensor/libtensor/include/utils/type_dispatch.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/type_dispatch_building.hpp b/dpnp/tensor/libtensor/include/utils/type_dispatch_building.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/type_dispatch_building.hpp rename to dpnp/tensor/libtensor/include/utils/type_dispatch_building.hpp diff --git a/dpctl_ext/tensor/libtensor/include/utils/type_utils.hpp b/dpnp/tensor/libtensor/include/utils/type_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/include/utils/type_utils.hpp rename to dpnp/tensor/libtensor/include/utils/type_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators.cpp b/dpnp/tensor/libtensor/source/accumulators.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators.cpp rename to dpnp/tensor/libtensor/source/accumulators.cpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators.hpp b/dpnp/tensor/libtensor/source/accumulators.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators.hpp rename to dpnp/tensor/libtensor/source/accumulators.hpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/accumulate_over_axis.hpp b/dpnp/tensor/libtensor/source/accumulators/accumulate_over_axis.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/accumulate_over_axis.hpp rename to dpnp/tensor/libtensor/source/accumulators/accumulate_over_axis.hpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/accumulators_common.cpp b/dpnp/tensor/libtensor/source/accumulators/accumulators_common.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/accumulators_common.cpp rename to dpnp/tensor/libtensor/source/accumulators/accumulators_common.cpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/accumulators_common.hpp b/dpnp/tensor/libtensor/source/accumulators/accumulators_common.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/accumulators_common.hpp rename to dpnp/tensor/libtensor/source/accumulators/accumulators_common.hpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/cumulative_logsumexp.cpp b/dpnp/tensor/libtensor/source/accumulators/cumulative_logsumexp.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/cumulative_logsumexp.cpp rename to dpnp/tensor/libtensor/source/accumulators/cumulative_logsumexp.cpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/cumulative_logsumexp.hpp b/dpnp/tensor/libtensor/source/accumulators/cumulative_logsumexp.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/cumulative_logsumexp.hpp rename to dpnp/tensor/libtensor/source/accumulators/cumulative_logsumexp.hpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/cumulative_prod.cpp b/dpnp/tensor/libtensor/source/accumulators/cumulative_prod.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/cumulative_prod.cpp rename to dpnp/tensor/libtensor/source/accumulators/cumulative_prod.cpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/cumulative_prod.hpp b/dpnp/tensor/libtensor/source/accumulators/cumulative_prod.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/cumulative_prod.hpp rename to dpnp/tensor/libtensor/source/accumulators/cumulative_prod.hpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/cumulative_sum.cpp b/dpnp/tensor/libtensor/source/accumulators/cumulative_sum.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/cumulative_sum.cpp rename to dpnp/tensor/libtensor/source/accumulators/cumulative_sum.cpp diff --git a/dpctl_ext/tensor/libtensor/source/accumulators/cumulative_sum.hpp b/dpnp/tensor/libtensor/source/accumulators/cumulative_sum.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/accumulators/cumulative_sum.hpp rename to dpnp/tensor/libtensor/source/accumulators/cumulative_sum.hpp diff --git a/dpctl_ext/tensor/libtensor/source/boolean_advanced_indexing.cpp b/dpnp/tensor/libtensor/source/boolean_advanced_indexing.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/boolean_advanced_indexing.cpp rename to dpnp/tensor/libtensor/source/boolean_advanced_indexing.cpp diff --git a/dpctl_ext/tensor/libtensor/source/boolean_advanced_indexing.hpp b/dpnp/tensor/libtensor/source/boolean_advanced_indexing.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/boolean_advanced_indexing.hpp rename to dpnp/tensor/libtensor/source/boolean_advanced_indexing.hpp diff --git a/dpctl_ext/tensor/libtensor/source/clip.cpp b/dpnp/tensor/libtensor/source/clip.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/clip.cpp rename to dpnp/tensor/libtensor/source/clip.cpp diff --git a/dpctl_ext/tensor/libtensor/source/clip.hpp b/dpnp/tensor/libtensor/source/clip.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/clip.hpp rename to dpnp/tensor/libtensor/source/clip.hpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_and_cast_usm_to_usm.cpp b/dpnp/tensor/libtensor/source/copy_and_cast_usm_to_usm.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_and_cast_usm_to_usm.cpp rename to dpnp/tensor/libtensor/source/copy_and_cast_usm_to_usm.cpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_and_cast_usm_to_usm.hpp b/dpnp/tensor/libtensor/source/copy_and_cast_usm_to_usm.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_and_cast_usm_to_usm.hpp rename to dpnp/tensor/libtensor/source/copy_and_cast_usm_to_usm.hpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_as_contig.cpp b/dpnp/tensor/libtensor/source/copy_as_contig.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_as_contig.cpp rename to dpnp/tensor/libtensor/source/copy_as_contig.cpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_as_contig.hpp b/dpnp/tensor/libtensor/source/copy_as_contig.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_as_contig.hpp rename to dpnp/tensor/libtensor/source/copy_as_contig.hpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_for_reshape.cpp b/dpnp/tensor/libtensor/source/copy_for_reshape.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_for_reshape.cpp rename to dpnp/tensor/libtensor/source/copy_for_reshape.cpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_for_reshape.hpp b/dpnp/tensor/libtensor/source/copy_for_reshape.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_for_reshape.hpp rename to dpnp/tensor/libtensor/source/copy_for_reshape.hpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_for_roll.cpp b/dpnp/tensor/libtensor/source/copy_for_roll.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_for_roll.cpp rename to dpnp/tensor/libtensor/source/copy_for_roll.cpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_for_roll.hpp b/dpnp/tensor/libtensor/source/copy_for_roll.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_for_roll.hpp rename to dpnp/tensor/libtensor/source/copy_for_roll.hpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.cpp b/dpnp/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.cpp rename to dpnp/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.cpp diff --git a/dpctl_ext/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.hpp b/dpnp/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.hpp rename to dpnp/tensor/libtensor/source/copy_numpy_ndarray_into_usm_ndarray.hpp diff --git a/dpctl_ext/tensor/libtensor/source/device_support_queries.cpp b/dpnp/tensor/libtensor/source/device_support_queries.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/device_support_queries.cpp rename to dpnp/tensor/libtensor/source/device_support_queries.cpp diff --git a/dpctl_ext/tensor/libtensor/source/device_support_queries.hpp b/dpnp/tensor/libtensor/source/device_support_queries.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/device_support_queries.hpp rename to dpnp/tensor/libtensor/source/device_support_queries.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/abs.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/abs.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/abs.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/abs.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/abs.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/abs.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/abs.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/abs.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/acos.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/acos.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/acos.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/acos.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/acos.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/acos.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/acos.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/acos.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/acosh.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/acosh.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/acosh.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/acosh.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/acosh.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/acosh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/acosh.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/acosh.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/add.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/add.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/add.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/add.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/add.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/add.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/add.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/add.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/angle.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/angle.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/angle.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/angle.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/angle.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/angle.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/angle.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/angle.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/asin.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/asin.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/asin.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/asin.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/asin.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/asin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/asin.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/asin.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/asinh.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/asinh.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/asinh.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/asinh.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/asinh.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/asinh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/asinh.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/asinh.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/atan.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/atan.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/atan.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/atan.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/atan.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/atan.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/atan.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/atan.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/atan2.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/atan2.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/atan2.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/atan2.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/atan2.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/atan2.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/atan2.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/atan2.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/atanh.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/atanh.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/atanh.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/atanh.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/atanh.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/atanh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/atanh.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/atanh.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_and.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_and.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_and.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_and.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_and.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_and.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_and.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_and.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_invert.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_invert.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_invert.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_invert.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_invert.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_invert.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_invert.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_invert.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_left_shift.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_or.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_or.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_or.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_or.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_or.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_or.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_or.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_or.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_right_shift.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_xor.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_xor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_xor.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_xor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_xor.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/bitwise_xor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/bitwise_xor.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/bitwise_xor.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/cbrt.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/cbrt.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/cbrt.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/cbrt.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/cbrt.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/cbrt.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/cbrt.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/cbrt.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/ceil.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/ceil.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/ceil.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/ceil.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/ceil.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/ceil.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/ceil.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/ceil.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/conj.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/conj.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/conj.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/conj.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/conj.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/conj.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/conj.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/conj.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/copysign.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/copysign.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/copysign.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/copysign.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/copysign.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/copysign.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/copysign.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/copysign.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/cos.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/cos.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/cos.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/cos.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/cos.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/cos.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/cos.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/cos.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/cosh.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/cosh.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/cosh.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/cosh.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/cosh.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/cosh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/cosh.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/cosh.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_common.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/elementwise_common.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_common.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/elementwise_common.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_common.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/elementwise_common.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_common.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/elementwise_common.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_functions.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/elementwise_functions.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_functions.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/elementwise_functions.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/elementwise_functions_type_utils.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/equal.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/equal.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/equal.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/equal.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/equal.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/equal.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/equal.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/exp.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/exp.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/exp.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/exp.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/exp.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/exp.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/exp.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/exp.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/exp2.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/exp2.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/exp2.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/exp2.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/exp2.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/exp2.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/exp2.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/exp2.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/expm1.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/expm1.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/expm1.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/expm1.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/expm1.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/expm1.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/expm1.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/expm1.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/floor.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/floor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/floor.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/floor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/floor.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/floor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/floor.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/floor.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/floor_divide.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/floor_divide.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/floor_divide.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/floor_divide.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/floor_divide.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/floor_divide.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/floor_divide.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/floor_divide.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/greater.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/greater.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/greater.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/greater.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/greater.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/greater.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/greater.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/greater.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/greater_equal.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/greater_equal.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/greater_equal.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/greater_equal.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/greater_equal.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/greater_equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/greater_equal.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/greater_equal.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/hypot.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/hypot.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/hypot.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/hypot.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/hypot.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/hypot.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/hypot.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/hypot.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/imag.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/imag.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/imag.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/imag.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/imag.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/imag.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/imag.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/imag.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/isfinite.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/isfinite.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/isfinite.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/isfinite.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/isfinite.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/isfinite.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/isfinite.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/isfinite.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/isinf.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/isinf.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/isinf.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/isinf.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/isinf.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/isinf.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/isinf.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/isinf.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/isnan.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/isnan.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/isnan.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/isnan.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/isnan.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/isnan.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/isnan.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/isnan.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/less.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/less.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/less.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/less.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/less.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/less.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/less.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/less.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/less_equal.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/less_equal.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/less_equal.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/less_equal.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/less_equal.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/less_equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/less_equal.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/less_equal.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/log.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/log.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log10.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/log10.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log10.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log10.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log10.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/log10.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log10.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log10.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log1p.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/log1p.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log1p.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log1p.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log1p.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/log1p.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log1p.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log1p.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log2.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/log2.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log2.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log2.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/log2.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/log2.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/log2.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/log2.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logaddexp.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/logaddexp.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logaddexp.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logaddexp.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logaddexp.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/logaddexp.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logaddexp.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logaddexp.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_and.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_and.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_and.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_and.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_and.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_and.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_and.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_and.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_not.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_not.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_not.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_not.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_not.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_not.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_not.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_not.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_or.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_or.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_or.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_or.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_or.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_or.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_or.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_or.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_xor.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_xor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_xor.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_xor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_xor.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/logical_xor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/logical_xor.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/logical_xor.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/maximum.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/maximum.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/maximum.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/maximum.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/maximum.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/maximum.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/maximum.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/maximum.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/minimum.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/minimum.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/minimum.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/minimum.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/minimum.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/minimum.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/minimum.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/minimum.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/multiply.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/multiply.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/multiply.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/multiply.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/multiply.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/multiply.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/multiply.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/multiply.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/negative.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/negative.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/negative.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/negative.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/negative.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/negative.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/negative.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/negative.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/nextafter.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/nextafter.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/nextafter.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/nextafter.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/nextafter.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/nextafter.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/nextafter.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/nextafter.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/not_equal.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/not_equal.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/not_equal.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/not_equal.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/not_equal.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/not_equal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/not_equal.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/not_equal.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/positive.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/positive.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/positive.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/positive.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/positive.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/positive.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/positive.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/positive.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/pow.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/pow.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/pow.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/pow.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/pow.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/pow.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/pow.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/pow.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/proj.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/proj.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/proj.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/proj.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/proj.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/proj.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/proj.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/proj.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/real.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/real.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/real.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/real.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/real.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/real.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/real.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/real.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/reciprocal.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/reciprocal.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/reciprocal.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/reciprocal.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/reciprocal.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/reciprocal.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/reciprocal.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/reciprocal.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/remainder.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/remainder.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/remainder.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/remainder.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/remainder.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/remainder.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/remainder.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/remainder.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/round.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/round.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/round.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/round.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/round.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/round.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/round.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/round.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/rsqrt.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/rsqrt.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/rsqrt.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/rsqrt.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/rsqrt.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/rsqrt.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/rsqrt.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/rsqrt.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sign.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/sign.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sign.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sign.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sign.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/sign.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sign.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sign.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/signbit.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/signbit.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/signbit.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/signbit.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/signbit.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/signbit.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/signbit.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/signbit.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sin.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/sin.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sin.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sin.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sin.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/sin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sin.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sin.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sinh.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/sinh.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sinh.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sinh.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sinh.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/sinh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sinh.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sinh.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sqrt.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/sqrt.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sqrt.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sqrt.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/sqrt.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/sqrt.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/sqrt.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/sqrt.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/square.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/square.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/square.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/square.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/square.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/square.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/square.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/square.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/subtract.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/subtract.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/subtract.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/subtract.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/subtract.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/subtract.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/subtract.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/subtract.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/tan.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/tan.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/tan.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/tan.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/tan.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/tan.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/tan.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/tan.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/tanh.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/tanh.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/tanh.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/tanh.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/tanh.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/tanh.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/tanh.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/tanh.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/true_divide.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/true_divide.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/true_divide.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/true_divide.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/true_divide.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/true_divide.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/true_divide.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/true_divide.hpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/trunc.cpp b/dpnp/tensor/libtensor/source/elementwise_functions/trunc.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/trunc.cpp rename to dpnp/tensor/libtensor/source/elementwise_functions/trunc.cpp diff --git a/dpctl_ext/tensor/libtensor/source/elementwise_functions/trunc.hpp b/dpnp/tensor/libtensor/source/elementwise_functions/trunc.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/elementwise_functions/trunc.hpp rename to dpnp/tensor/libtensor/source/elementwise_functions/trunc.hpp diff --git a/dpctl_ext/tensor/libtensor/source/eye_ctor.cpp b/dpnp/tensor/libtensor/source/eye_ctor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/eye_ctor.cpp rename to dpnp/tensor/libtensor/source/eye_ctor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/eye_ctor.hpp b/dpnp/tensor/libtensor/source/eye_ctor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/eye_ctor.hpp rename to dpnp/tensor/libtensor/source/eye_ctor.hpp diff --git a/dpctl_ext/tensor/libtensor/source/full_ctor.cpp b/dpnp/tensor/libtensor/source/full_ctor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/full_ctor.cpp rename to dpnp/tensor/libtensor/source/full_ctor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/full_ctor.hpp b/dpnp/tensor/libtensor/source/full_ctor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/full_ctor.hpp rename to dpnp/tensor/libtensor/source/full_ctor.hpp diff --git a/dpctl_ext/tensor/libtensor/source/integer_advanced_indexing.cpp b/dpnp/tensor/libtensor/source/integer_advanced_indexing.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/integer_advanced_indexing.cpp rename to dpnp/tensor/libtensor/source/integer_advanced_indexing.cpp diff --git a/dpctl_ext/tensor/libtensor/source/integer_advanced_indexing.hpp b/dpnp/tensor/libtensor/source/integer_advanced_indexing.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/integer_advanced_indexing.hpp rename to dpnp/tensor/libtensor/source/integer_advanced_indexing.hpp diff --git a/dpctl_ext/tensor/libtensor/source/linalg_functions/dot.cpp b/dpnp/tensor/libtensor/source/linalg_functions/dot.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/linalg_functions/dot.cpp rename to dpnp/tensor/libtensor/source/linalg_functions/dot.cpp diff --git a/dpctl_ext/tensor/libtensor/source/linalg_functions/dot.hpp b/dpnp/tensor/libtensor/source/linalg_functions/dot.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/linalg_functions/dot.hpp rename to dpnp/tensor/libtensor/source/linalg_functions/dot.hpp diff --git a/dpctl_ext/tensor/libtensor/source/linalg_functions/dot_atomic_support.hpp b/dpnp/tensor/libtensor/source/linalg_functions/dot_atomic_support.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/linalg_functions/dot_atomic_support.hpp rename to dpnp/tensor/libtensor/source/linalg_functions/dot_atomic_support.hpp diff --git a/dpctl_ext/tensor/libtensor/source/linalg_functions/dot_dispatch.hpp b/dpnp/tensor/libtensor/source/linalg_functions/dot_dispatch.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/linalg_functions/dot_dispatch.hpp rename to dpnp/tensor/libtensor/source/linalg_functions/dot_dispatch.hpp diff --git a/dpctl_ext/tensor/libtensor/source/linear_sequences.cpp b/dpnp/tensor/libtensor/source/linear_sequences.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/linear_sequences.cpp rename to dpnp/tensor/libtensor/source/linear_sequences.cpp diff --git a/dpctl_ext/tensor/libtensor/source/linear_sequences.hpp b/dpnp/tensor/libtensor/source/linear_sequences.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/linear_sequences.hpp rename to dpnp/tensor/libtensor/source/linear_sequences.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/all.cpp b/dpnp/tensor/libtensor/source/reductions/all.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/all.cpp rename to dpnp/tensor/libtensor/source/reductions/all.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/all.hpp b/dpnp/tensor/libtensor/source/reductions/all.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/all.hpp rename to dpnp/tensor/libtensor/source/reductions/all.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/any.cpp b/dpnp/tensor/libtensor/source/reductions/any.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/any.cpp rename to dpnp/tensor/libtensor/source/reductions/any.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/any.hpp b/dpnp/tensor/libtensor/source/reductions/any.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/any.hpp rename to dpnp/tensor/libtensor/source/reductions/any.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/argmax.cpp b/dpnp/tensor/libtensor/source/reductions/argmax.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/argmax.cpp rename to dpnp/tensor/libtensor/source/reductions/argmax.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/argmax.hpp b/dpnp/tensor/libtensor/source/reductions/argmax.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/argmax.hpp rename to dpnp/tensor/libtensor/source/reductions/argmax.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/argmin.cpp b/dpnp/tensor/libtensor/source/reductions/argmin.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/argmin.cpp rename to dpnp/tensor/libtensor/source/reductions/argmin.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/argmin.hpp b/dpnp/tensor/libtensor/source/reductions/argmin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/argmin.hpp rename to dpnp/tensor/libtensor/source/reductions/argmin.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/logsumexp.cpp b/dpnp/tensor/libtensor/source/reductions/logsumexp.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/logsumexp.cpp rename to dpnp/tensor/libtensor/source/reductions/logsumexp.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/logsumexp.hpp b/dpnp/tensor/libtensor/source/reductions/logsumexp.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/logsumexp.hpp rename to dpnp/tensor/libtensor/source/reductions/logsumexp.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/max.cpp b/dpnp/tensor/libtensor/source/reductions/max.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/max.cpp rename to dpnp/tensor/libtensor/source/reductions/max.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/max.hpp b/dpnp/tensor/libtensor/source/reductions/max.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/max.hpp rename to dpnp/tensor/libtensor/source/reductions/max.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/min.cpp b/dpnp/tensor/libtensor/source/reductions/min.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/min.cpp rename to dpnp/tensor/libtensor/source/reductions/min.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/min.hpp b/dpnp/tensor/libtensor/source/reductions/min.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/min.hpp rename to dpnp/tensor/libtensor/source/reductions/min.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/prod.cpp b/dpnp/tensor/libtensor/source/reductions/prod.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/prod.cpp rename to dpnp/tensor/libtensor/source/reductions/prod.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/prod.hpp b/dpnp/tensor/libtensor/source/reductions/prod.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/prod.hpp rename to dpnp/tensor/libtensor/source/reductions/prod.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/reduce_hypot.cpp b/dpnp/tensor/libtensor/source/reductions/reduce_hypot.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/reduce_hypot.cpp rename to dpnp/tensor/libtensor/source/reductions/reduce_hypot.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/reduce_hypot.hpp b/dpnp/tensor/libtensor/source/reductions/reduce_hypot.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/reduce_hypot.hpp rename to dpnp/tensor/libtensor/source/reductions/reduce_hypot.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/reduction_atomic_support.hpp b/dpnp/tensor/libtensor/source/reductions/reduction_atomic_support.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/reduction_atomic_support.hpp rename to dpnp/tensor/libtensor/source/reductions/reduction_atomic_support.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/reduction_common.cpp b/dpnp/tensor/libtensor/source/reductions/reduction_common.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/reduction_common.cpp rename to dpnp/tensor/libtensor/source/reductions/reduction_common.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/reduction_common.hpp b/dpnp/tensor/libtensor/source/reductions/reduction_common.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/reduction_common.hpp rename to dpnp/tensor/libtensor/source/reductions/reduction_common.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/reduction_over_axis.hpp b/dpnp/tensor/libtensor/source/reductions/reduction_over_axis.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/reduction_over_axis.hpp rename to dpnp/tensor/libtensor/source/reductions/reduction_over_axis.hpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/sum.cpp b/dpnp/tensor/libtensor/source/reductions/sum.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/sum.cpp rename to dpnp/tensor/libtensor/source/reductions/sum.cpp diff --git a/dpctl_ext/tensor/libtensor/source/reductions/sum.hpp b/dpnp/tensor/libtensor/source/reductions/sum.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/reductions/sum.hpp rename to dpnp/tensor/libtensor/source/reductions/sum.hpp diff --git a/dpctl_ext/tensor/libtensor/source/repeat.cpp b/dpnp/tensor/libtensor/source/repeat.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/repeat.cpp rename to dpnp/tensor/libtensor/source/repeat.cpp diff --git a/dpctl_ext/tensor/libtensor/source/repeat.hpp b/dpnp/tensor/libtensor/source/repeat.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/repeat.hpp rename to dpnp/tensor/libtensor/source/repeat.hpp diff --git a/dpctl_ext/tensor/libtensor/source/simplify_iteration_space.cpp b/dpnp/tensor/libtensor/source/simplify_iteration_space.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/simplify_iteration_space.cpp rename to dpnp/tensor/libtensor/source/simplify_iteration_space.cpp diff --git a/dpctl_ext/tensor/libtensor/source/simplify_iteration_space.hpp b/dpnp/tensor/libtensor/source/simplify_iteration_space.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/simplify_iteration_space.hpp rename to dpnp/tensor/libtensor/source/simplify_iteration_space.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/isin.cpp b/dpnp/tensor/libtensor/source/sorting/isin.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/isin.cpp rename to dpnp/tensor/libtensor/source/sorting/isin.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/isin.hpp b/dpnp/tensor/libtensor/source/sorting/isin.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/isin.hpp rename to dpnp/tensor/libtensor/source/sorting/isin.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/merge_argsort.cpp b/dpnp/tensor/libtensor/source/sorting/merge_argsort.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/merge_argsort.cpp rename to dpnp/tensor/libtensor/source/sorting/merge_argsort.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/merge_argsort.hpp b/dpnp/tensor/libtensor/source/sorting/merge_argsort.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/merge_argsort.hpp rename to dpnp/tensor/libtensor/source/sorting/merge_argsort.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/merge_sort.cpp b/dpnp/tensor/libtensor/source/sorting/merge_sort.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/merge_sort.cpp rename to dpnp/tensor/libtensor/source/sorting/merge_sort.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/merge_sort.hpp b/dpnp/tensor/libtensor/source/sorting/merge_sort.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/merge_sort.hpp rename to dpnp/tensor/libtensor/source/sorting/merge_sort.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/py_argsort_common.hpp b/dpnp/tensor/libtensor/source/sorting/py_argsort_common.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/py_argsort_common.hpp rename to dpnp/tensor/libtensor/source/sorting/py_argsort_common.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/py_sort_common.hpp b/dpnp/tensor/libtensor/source/sorting/py_sort_common.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/py_sort_common.hpp rename to dpnp/tensor/libtensor/source/sorting/py_sort_common.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/radix_argsort.cpp b/dpnp/tensor/libtensor/source/sorting/radix_argsort.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/radix_argsort.cpp rename to dpnp/tensor/libtensor/source/sorting/radix_argsort.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/radix_argsort.hpp b/dpnp/tensor/libtensor/source/sorting/radix_argsort.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/radix_argsort.hpp rename to dpnp/tensor/libtensor/source/sorting/radix_argsort.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/radix_sort.cpp b/dpnp/tensor/libtensor/source/sorting/radix_sort.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/radix_sort.cpp rename to dpnp/tensor/libtensor/source/sorting/radix_sort.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/radix_sort.hpp b/dpnp/tensor/libtensor/source/sorting/radix_sort.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/radix_sort.hpp rename to dpnp/tensor/libtensor/source/sorting/radix_sort.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/radix_sort_support.hpp b/dpnp/tensor/libtensor/source/sorting/radix_sort_support.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/radix_sort_support.hpp rename to dpnp/tensor/libtensor/source/sorting/radix_sort_support.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/searchsorted.cpp b/dpnp/tensor/libtensor/source/sorting/searchsorted.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/searchsorted.cpp rename to dpnp/tensor/libtensor/source/sorting/searchsorted.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/searchsorted.hpp b/dpnp/tensor/libtensor/source/sorting/searchsorted.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/searchsorted.hpp rename to dpnp/tensor/libtensor/source/sorting/searchsorted.hpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/topk.cpp b/dpnp/tensor/libtensor/source/sorting/topk.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/topk.cpp rename to dpnp/tensor/libtensor/source/sorting/topk.cpp diff --git a/dpctl_ext/tensor/libtensor/source/sorting/topk.hpp b/dpnp/tensor/libtensor/source/sorting/topk.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/sorting/topk.hpp rename to dpnp/tensor/libtensor/source/sorting/topk.hpp diff --git a/dpctl_ext/tensor/libtensor/source/tensor_accumulation.cpp b/dpnp/tensor/libtensor/source/tensor_accumulation.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/tensor_accumulation.cpp rename to dpnp/tensor/libtensor/source/tensor_accumulation.cpp diff --git a/dpctl_ext/tensor/libtensor/source/tensor_ctors.cpp b/dpnp/tensor/libtensor/source/tensor_ctors.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/tensor_ctors.cpp rename to dpnp/tensor/libtensor/source/tensor_ctors.cpp diff --git a/dpctl_ext/tensor/libtensor/source/tensor_elementwise.cpp b/dpnp/tensor/libtensor/source/tensor_elementwise.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/tensor_elementwise.cpp rename to dpnp/tensor/libtensor/source/tensor_elementwise.cpp diff --git a/dpctl_ext/tensor/libtensor/source/tensor_linalg.cpp b/dpnp/tensor/libtensor/source/tensor_linalg.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/tensor_linalg.cpp rename to dpnp/tensor/libtensor/source/tensor_linalg.cpp diff --git a/dpctl_ext/tensor/libtensor/source/tensor_reductions.cpp b/dpnp/tensor/libtensor/source/tensor_reductions.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/tensor_reductions.cpp rename to dpnp/tensor/libtensor/source/tensor_reductions.cpp diff --git a/dpctl_ext/tensor/libtensor/source/tensor_sorting.cpp b/dpnp/tensor/libtensor/source/tensor_sorting.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/tensor_sorting.cpp rename to dpnp/tensor/libtensor/source/tensor_sorting.cpp diff --git a/dpctl_ext/tensor/libtensor/source/triul_ctor.cpp b/dpnp/tensor/libtensor/source/triul_ctor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/triul_ctor.cpp rename to dpnp/tensor/libtensor/source/triul_ctor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/triul_ctor.hpp b/dpnp/tensor/libtensor/source/triul_ctor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/triul_ctor.hpp rename to dpnp/tensor/libtensor/source/triul_ctor.hpp diff --git a/dpctl_ext/tensor/libtensor/source/where.cpp b/dpnp/tensor/libtensor/source/where.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/where.cpp rename to dpnp/tensor/libtensor/source/where.cpp diff --git a/dpctl_ext/tensor/libtensor/source/where.hpp b/dpnp/tensor/libtensor/source/where.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/where.hpp rename to dpnp/tensor/libtensor/source/where.hpp diff --git a/dpctl_ext/tensor/libtensor/source/zeros_ctor.cpp b/dpnp/tensor/libtensor/source/zeros_ctor.cpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/zeros_ctor.cpp rename to dpnp/tensor/libtensor/source/zeros_ctor.cpp diff --git a/dpctl_ext/tensor/libtensor/source/zeros_ctor.hpp b/dpnp/tensor/libtensor/source/zeros_ctor.hpp similarity index 100% rename from dpctl_ext/tensor/libtensor/source/zeros_ctor.hpp rename to dpnp/tensor/libtensor/source/zeros_ctor.hpp diff --git a/dpnp/tests/test_array_api_info.py b/dpnp/tests/test_array_api_info.py index 32730c8724dc..81141f9dab00 100644 --- a/dpnp/tests/test_array_api_info.py +++ b/dpnp/tests/test_array_api_info.py @@ -2,10 +2,7 @@ from dpctl import SyclDeviceCreationError, get_devices, select_default_device import dpnp - -# TODO: revert to `from dpctl.tensor....` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._tensor_impl import default_device_complex_type +from dpnp.tensor._tensor_impl import default_device_complex_type from dpnp.tests.helper import ( has_support_aspect64, is_win_platform, diff --git a/dpnp/tests/test_arraycreation.py b/dpnp/tests/test_arraycreation.py index 8d89f2a42ca8..b195c0484105 100644 --- a/dpnp/tests/test_arraycreation.py +++ b/dpnp/tests/test_arraycreation.py @@ -12,10 +12,8 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_arraymanipulation.py b/dpnp/tests/test_arraymanipulation.py index f7df6387caf6..970e0b12318d 100644 --- a/dpnp/tests/test_arraymanipulation.py +++ b/dpnp/tests/test_arraymanipulation.py @@ -2,14 +2,9 @@ import pytest from numpy.testing import assert_array_equal, assert_equal, assert_raises -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +import dpnp.tensor as dpt +from dpnp.tensor._numpy_helper import AxisError from .helper import get_all_dtypes, get_float_complex_dtypes from .third_party.cupy import testing diff --git a/dpnp/tests/test_counting.py b/dpnp/tests/test_counting.py index 9210e7c1b3dd..e729b98af756 100644 --- a/dpnp/tests/test_counting.py +++ b/dpnp/tests/test_counting.py @@ -7,10 +7,7 @@ ) import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from .helper import ( get_all_dtypes, diff --git a/dpnp/tests/test_fft.py b/dpnp/tests/test_fft.py index 3a19a2cf3668..c39303f32c1a 100644 --- a/dpnp/tests/test_fft.py +++ b/dpnp/tests/test_fft.py @@ -4,10 +4,8 @@ from dpctl.utils import ExecutionPlacementError from numpy.testing import assert_raises -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from dpnp.dpnp_utils import map_dtype_to_device from .helper import ( diff --git a/dpnp/tests/test_flipping.py b/dpnp/tests/test_flipping.py index cd55846e3668..5bb3cd85bf79 100644 --- a/dpnp/tests/test_flipping.py +++ b/dpnp/tests/test_flipping.py @@ -7,10 +7,7 @@ ) import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from .helper import ( get_all_dtypes, diff --git a/dpnp/tests/test_indexing.py b/dpnp/tests/test_indexing.py index d8822d77080b..3bdd5449d223 100644 --- a/dpnp/tests/test_indexing.py +++ b/dpnp/tests/test_indexing.py @@ -12,13 +12,11 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp -from dpctl_ext.tensor._numpy_helper import AxisError -from dpctl_ext.tensor._type_utils import _to_device_supported_dtype +import dpnp.tensor as dpt from dpnp.dpnp_array import dpnp_array +from dpnp.tensor._numpy_helper import AxisError +from dpnp.tensor._type_utils import _to_device_supported_dtype from .helper import ( get_abs_array, diff --git a/dpnp/tests/test_linalg.py b/dpnp/tests/test_linalg.py index dfd6e21c2a95..d32237c04aad 100644 --- a/dpnp/tests/test_linalg.py +++ b/dpnp/tests/test_linalg.py @@ -12,14 +12,9 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +import dpnp.tensor as dpt +from dpnp.tensor._numpy_helper import AxisError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_manipulation.py b/dpnp/tests/test_manipulation.py index d30c08a65f1e..672fce699f14 100644 --- a/dpnp/tests/test_manipulation.py +++ b/dpnp/tests/test_manipulation.py @@ -8,14 +8,9 @@ assert_raises, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +import dpnp.tensor as dpt +from dpnp.tensor._numpy_helper import AxisError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_mathematical.py b/dpnp/tests/test_mathematical.py index 155f4cdb06fb..ae273ffa8c03 100644 --- a/dpnp/tests/test_mathematical.py +++ b/dpnp/tests/test_mathematical.py @@ -10,19 +10,14 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import ( +import dpnp.tensor as dpt +from dpnp.dpnp_array import dpnp_array +from dpnp.dpnp_utils import map_dtype_to_device +from dpnp.tensor._numpy_helper import ( AxisError, normalize_axis_index, ) -from dpnp.dpnp_array import dpnp_array -from dpnp.dpnp_utils import map_dtype_to_device from .helper import ( LTS_VERSION, diff --git a/dpnp/tests/test_memory.py b/dpnp/tests/test_memory.py index dd87a993e1dc..c2601ab092f7 100644 --- a/dpnp/tests/test_memory.py +++ b/dpnp/tests/test_memory.py @@ -1,11 +1,9 @@ import numpy import pytest -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp import dpnp.memory as dpm +import dpnp.tensor as dpt class IntUsmData(dpt.usm_ndarray): diff --git a/dpnp/tests/test_nanfunctions.py b/dpnp/tests/test_nanfunctions.py index 2cb70df5954a..3c5ea5b61989 100644 --- a/dpnp/tests/test_nanfunctions.py +++ b/dpnp/tests/test_nanfunctions.py @@ -11,10 +11,8 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_ndarray.py b/dpnp/tests/test_ndarray.py index 8944043d90a0..a16ccd9f5bf3 100644 --- a/dpnp/tests/test_ndarray.py +++ b/dpnp/tests/test_ndarray.py @@ -8,10 +8,8 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from .helper import ( generate_random_numpy_array, diff --git a/dpnp/tests/test_product.py b/dpnp/tests/test_product.py index 9c2bc54e30b5..cd71b07352da 100644 --- a/dpnp/tests/test_product.py +++ b/dpnp/tests/test_product.py @@ -5,11 +5,8 @@ from numpy.testing import assert_allclose, assert_array_equal, assert_raises import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError from dpnp.dpnp_utils import map_dtype_to_device +from dpnp.tensor._numpy_helper import AxisError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_search.py b/dpnp/tests/test_search.py index 36e0032ccff1..75ce9bdeed20 100644 --- a/dpnp/tests/test_search.py +++ b/dpnp/tests/test_search.py @@ -2,10 +2,8 @@ import pytest from numpy.testing import assert_array_equal, assert_equal, assert_raises -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from .helper import ( generate_random_numpy_array, diff --git a/dpnp/tests/test_sort.py b/dpnp/tests/test_sort.py index 73eac4064892..9d893a858fc1 100644 --- a/dpnp/tests/test_sort.py +++ b/dpnp/tests/test_sort.py @@ -3,10 +3,7 @@ from numpy.testing import assert_array_equal, assert_equal, assert_raises import dpnp - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_statistics.py b/dpnp/tests/test_statistics.py index fe8848b6c858..a02adfac2ecb 100644 --- a/dpnp/tests/test_statistics.py +++ b/dpnp/tests/test_statistics.py @@ -8,10 +8,8 @@ assert_raises_regex, ) -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_sycl_queue.py b/dpnp/tests/test_sycl_queue.py index 4485d79b2213..f1678bd28da3 100644 --- a/dpnp/tests/test_sycl_queue.py +++ b/dpnp/tests/test_sycl_queue.py @@ -7,11 +7,9 @@ from dpctl.utils import ExecutionPlacementError from numpy.testing import assert_array_equal, assert_raises -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp import dpnp.linalg +import dpnp.tensor as dpt from dpnp.dpnp_array import dpnp_array from dpnp.dpnp_utils import get_usm_allocations diff --git a/dpnp/tests/test_usm_type.py b/dpnp/tests/test_usm_type.py index 8f8efd1cdd10..a0cfe6d24979 100644 --- a/dpnp/tests/test_usm_type.py +++ b/dpnp/tests/test_usm_type.py @@ -6,10 +6,8 @@ import numpy import pytest -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt from dpnp.dpnp_utils import get_usm_allocations from .helper import generate_random_numpy_array diff --git a/dpnp/tests/test_utils.py b/dpnp/tests/test_utils.py index ddbd267c2108..aef6abba8726 100644 --- a/dpnp/tests/test_utils.py +++ b/dpnp/tests/test_utils.py @@ -1,10 +1,8 @@ import numpy import pytest -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor as dpt import dpnp +import dpnp.tensor as dpt class TestIsSupportedArrayOrScalar: diff --git a/dpnp/tests/third_party/cupy/core_tests/test_dlpack.py b/dpnp/tests/third_party/cupy/core_tests/test_dlpack.py index e44f51f09b20..eb9e958fad0b 100644 --- a/dpnp/tests/third_party/cupy/core_tests/test_dlpack.py +++ b/dpnp/tests/third_party/cupy/core_tests/test_dlpack.py @@ -4,10 +4,8 @@ import numpy import pytest -# TODO: revert to `import dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -import dpctl_ext.tensor._dlpack as dlp import dpnp as cupy +import dpnp.tensor._dlpack as dlp from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py b/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py index 085261317ead..2cff78627368 100644 --- a/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py +++ b/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py @@ -11,10 +11,7 @@ # from cupy_backends.cuda.api import runtime # from cupy_backends.cuda import stream as stream_module import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError # from cupy import _util # from cupy import _core diff --git a/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py b/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py index a1309f3ed83d..51fe5f1ca68e 100644 --- a/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py +++ b/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py @@ -4,10 +4,7 @@ import pytest import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests.helper import has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py b/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py index 8944a6b944c9..7391ed9b0f88 100644 --- a/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py +++ b/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py @@ -4,10 +4,7 @@ import pytest import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py b/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py index 0f6bed1c2ced..145b84027201 100644 --- a/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py +++ b/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py @@ -4,10 +4,7 @@ import pytest import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py b/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py index cb7200c1b13b..acd5d882f61f 100644 --- a/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py +++ b/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py @@ -4,10 +4,7 @@ import pytest import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests.helper import ( has_support_aspect16, has_support_aspect64, diff --git a/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py b/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py index 8359ba580a25..209b264c0fc5 100644 --- a/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py +++ b/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py @@ -6,10 +6,7 @@ import pytest import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests.helper import has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py b/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py index d355d18985f2..70b1392a37af 100644 --- a/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py +++ b/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py @@ -4,10 +4,7 @@ import pytest import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests.helper import has_support_aspect16, has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/testing/_loops.py b/dpnp/tests/third_party/cupy/testing/_loops.py index 66c243a3d7f7..bd1d178e1a66 100644 --- a/dpnp/tests/third_party/cupy/testing/_loops.py +++ b/dpnp/tests/third_party/cupy/testing/_loops.py @@ -12,10 +12,7 @@ from dpctl import select_default_device import dpnp as cupy - -# TODO: revert to `from dpctl.tensor...` -# when dpnp fully migrates dpctl/tensor -from dpctl_ext.tensor._numpy_helper import AxisError +from dpnp.tensor._numpy_helper import AxisError from dpnp.tests import config from dpnp.tests.third_party.cupy.testing import _array, _parameterized from dpnp.tests.third_party.cupy.testing._pytest_impl import is_available diff --git a/scripts/gen_coverage.py b/scripts/gen_coverage.py index 588345d91b2e..99bb1b0dccca 100644 --- a/scripts/gen_coverage.py +++ b/scripts/gen_coverage.py @@ -119,6 +119,14 @@ def parse_args(): action="store_true", help="Remove build dir before rebuild (default: False)", ) + p.add_argument( + "--build-step", + choices=["tensor", "skip-tensor", "both"], + default="both", + help="Which build step to run: tensor (only tensor to generate headers), " + "skip-tensor (everything except tensor, assumes tensor headers exist), " + "or both (default: both)", + ) return p.parse_args() @@ -192,17 +200,37 @@ def main(): log_cmake_args(cmake_args, "gen_coverage") - build_extension( - setup_dir, - env, - cmake_args, - cmake_executable=args.cmake_executable, - generator=args.generator, - build_type="Coverage", - ) - install_editable(setup_dir, env) + if args.build_step in ["tensor", "both"]: + # Build tensor only to generate Cython headers + tensor_cmake_args = cmake_args.copy() + tensor_cmake_args.append("-DDPNP_BUILD_COMPONENTS=TENSOR_ONLY") + + build_extension( + setup_dir, + env, + tensor_cmake_args, + cmake_executable=args.cmake_executable, + generator=args.generator, + build_type="Coverage", + ) - if args.run_pytest: + if args.build_step in ["skip-tensor", "both"]: + # Build everything except tensor (assumes tensor headers already exist) + skip_tensor_cmake_args = cmake_args.copy() + skip_tensor_cmake_args.append("-DDPNP_BUILD_COMPONENTS=SKIP_TENSOR") + + build_extension( + setup_dir, + env, + skip_tensor_cmake_args, + cmake_executable=args.cmake_executable, + generator=args.generator, + build_type="Coverage", + ) + install_editable(setup_dir, env) + + # Only run tests when we have a complete build (skip-tensor or both) + if args.run_pytest and args.build_step in ["skip-tensor", "both"]: env["LLVM_PROFILE_FILE"] = "dpnp_pytest.profraw" pytest_cmd = [ "pytest", @@ -269,10 +297,13 @@ def find_objects(): ) print("[gen_coverage] Coverage export is completed") + elif args.build_step == "tensor": + print( + "[gen_coverage] Skipping pytest (tensor-only build, tests will run after skip-tensor build)" + ) else: print( - "[gen_coverage] Skipping pytest and coverage collection " - "(--skip-pytest)" + "[gen_coverage] Skipping pytest and coverage collection (--skip-pytest)" ) print("[gen_coverage] Done") diff --git a/setup.py b/setup.py index 7ffef3bed9d8..86899c27ca65 100644 --- a/setup.py +++ b/setup.py @@ -34,6 +34,7 @@ cmdclass=versioneer.get_cmdclass(), packages=[ "dpnp", + "dpnp.tensor", "dpnp.dpnp_algo", "dpnp.dpnp_utils", "dpnp.exceptions", @@ -44,9 +45,6 @@ "dpnp.scipy", "dpnp.scipy.linalg", "dpnp.scipy.special", - # TODO: replace with dpctl; dpctl.tensor - "dpctl_ext", - "dpctl_ext.tensor", ], package_data={ "dpnp": [