Skip to content

Change descending from template parameter to an argument #1883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Change descending from template parameter to an argument #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbe1019
Change to pass sorting direction as call argument, not template param…
oleksandr-pavlyk Oct 29, 2024
ec6a930
Moved radix sort Python API to dedicated module, _tensor_sorting_radi…
oleksandr-pavlyk Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions dpctl/tensor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@ set(_reduction_sources
set(_sorting_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/sort.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/argsort.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/searchsorted.cpp
)
set(_sorting_radix_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/radix_sort.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/radix_argsort.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sorting/searchsorted.cpp
)
set(_static_lib_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/simplify_iteration_space.cpp
Expand Down Expand Up @@ -153,6 +155,10 @@ set(_tensor_sorting_impl_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/tensor_sorting.cpp
${_sorting_sources}
)
set(_tensor_sorting_radix_impl_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/tensor_sorting_radix.cpp
${_sorting_radix_sources}
)
set(_linalg_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/elementwise_functions/elementwise_functions_type_utils.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/linalg_functions/dot.cpp
Expand All @@ -162,10 +168,10 @@ set(_tensor_linalg_impl_sources
${_linalg_sources}
)
set(_accumulator_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/accumulators_common.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/cumulative_logsumexp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/cumulative_prod.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/cumulative_sum.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/accumulators_common.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/cumulative_logsumexp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/cumulative_prod.cpp
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/accumulators/cumulative_sum.cpp
)
set(_tensor_accumulation_impl_sources
${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/tensor_accumulation.cpp
Expand Down Expand Up @@ -207,6 +213,12 @@ add_sycl_to_target(TARGET ${python_module_name} SOURCES ${_tensor_sorting_impl_s
target_link_libraries(${python_module_name} PRIVATE ${_static_lib_trgt})
list(APPEND _py_trgts ${python_module_name})

set(python_module_name _tensor_sorting_radix_impl)
pybind11_add_module(${python_module_name} MODULE ${_tensor_sorting_radix_impl_sources})
add_sycl_to_target(TARGET ${python_module_name} SOURCES ${_tensor_sorting_radix_impl_sources})
target_link_libraries(${python_module_name} PRIVATE ${_static_lib_trgt})
list(APPEND _py_trgts ${python_module_name})

set(python_module_name _tensor_linalg_impl)
pybind11_add_module(${python_module_name} MODULE ${_tensor_linalg_impl_sources})
add_sycl_to_target(TARGET ${python_module_name} SOURCES ${_tensor_linalg_impl_sources})
Expand Down
6 changes: 4 additions & 2 deletions dpctl/tensor/_sorting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@
from ._tensor_sorting_impl import (
_argsort_ascending,
_argsort_descending,
_sort_ascending,
_sort_descending,
)
from ._tensor_sorting_radix_impl import (
_radix_argsort_ascending,
_radix_argsort_descending,
_radix_sort_ascending,
_radix_sort_descending,
_radix_sort_dtype_supported,
_sort_ascending,
_sort_descending,
)

__all__ = ["sort", "argsort"]
Expand Down
3 changes: 1 addition & 2 deletions dpctl/tensor/libtensor/include/kernels/sorting/merge_sort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,8 +807,7 @@ sycl::event stable_argsort_axis1_contig_impl(
const IndexComp<IndexTy, argTy, ValueComp> index_comp{arg_tp, ValueComp{}};

static constexpr size_t determine_automatically = 0;
size_t sorted_block_size =
(sort_nelems >= 512) ? 512 : determine_automatically;
size_t sorted_block_size = determine_automatically;

const size_t total_nelems = iter_nelems * sort_nelems;

Expand Down
Loading
Loading