From 383e094386990ea737d76c8068863a1110aac4ae Mon Sep 17 00:00:00 2001 From: Dmitriy Sobolev Date: Thu, 17 Oct 2024 08:46:01 -0500 Subject: [PATCH 1/2] [KT] Remove deprecated namespace Signed-off-by: Dmitriy Sobolev --- .../oneapi/dpl/experimental/kt/esimd_radix_sort.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/include/oneapi/dpl/experimental/kt/esimd_radix_sort.h b/include/oneapi/dpl/experimental/kt/esimd_radix_sort.h index 6d12e300990..526270c0cdd 100644 --- a/include/oneapi/dpl/experimental/kt/esimd_radix_sort.h +++ b/include/oneapi/dpl/experimental/kt/esimd_radix_sort.h @@ -172,18 +172,4 @@ radix_sort_by_key(sycl::queue __q, _KeysIterator1 __keys_first, _KeysIterator1 _ } // namespace oneapi::dpl::experimental::kt::gpu::esimd -namespace oneapi::dpl::experimental::kt -{ -namespace esimd -#if !defined(__SYCL_DEVICE_ONLY__) - [[deprecated("Use of oneapi::dpl::experimental::kt::esimd namespace is deprecated " - "and will be removed in a future release. " - "Use oneapi::dpl::experimental::kt::gpu::esimd instead")]] -#endif -{ -using oneapi::dpl::experimental::kt::gpu::esimd::radix_sort; -using oneapi::dpl::experimental::kt::gpu::esimd::radix_sort_by_key; -} // namespace oneapi::dpl::experimental::kt::esimd -} // namespace oneapi::dpl::experimental::kt - #endif // _ONEDPL_KT_ESIMD_RADIX_SORT_H From ca54ed119cad32439e904db139ffae3d546ff84f Mon Sep 17 00:00:00 2001 From: Dmitriy Sobolev Date: Thu, 17 Oct 2024 08:47:52 -0500 Subject: [PATCH 2/2] Remove namespace usage in a test Signed-off-by: Dmitriy Sobolev --- test/kt/esimd_radix_sort.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/test/kt/esimd_radix_sort.cpp b/test/kt/esimd_radix_sort.cpp index ecc1a18d6ce..19e5736c4ca 100755 --- a/test/kt/esimd_radix_sort.cpp +++ b/test/kt/esimd_radix_sort.cpp @@ -123,18 +123,9 @@ test_sycl_iterators(sycl::queue q, std::size_t size, KernelParam param) std::stable_sort(std::begin(ref), std::end(ref), Compare{}); { sycl::buffer buf(input.data(), input.size()); - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#endif - // Deprecated namespace is used deliberatelly to make sure the functionality is still available - oneapi::dpl::experimental::kt::esimd::radix_sort(q, oneapi::dpl::begin(buf), oneapi::dpl::end(buf), - param) + oneapi::dpl::experimental::kt::gpu::esimd::radix_sort(q, oneapi::dpl::begin(buf), oneapi::dpl::end(buf), + param) .wait(); -#ifdef __clang__ -#pragma clang diagnostic pop -#endif } std::string msg = "wrong results with oneapi::dpl::begin/end, n: " + std::to_string(size);