From b87767f23a0ee7abe5d837f20ef081d0772444dd Mon Sep 17 00:00:00 2001 From: AuroraPerego Date: Tue, 28 Jan 2025 09:57:57 +0100 Subject: [PATCH] adapt python part to changes --- CLUEstering/BindingModules/binding_cpu.cpp | 20 +++++++++---------- .../BindingModules/binding_cpu_tbb.cpp | 20 +++++++++---------- .../BindingModules/binding_gpu_cuda.cpp | 20 +++++++++---------- .../BindingModules/binding_gpu_hip.cpp | 20 +++++++++---------- benchmark/dataset_size/main.cpp | 2 +- benchmark/profiling/main.cpp | 2 +- .../DataFormats/test/TestPoints.cpp | 2 +- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/CLUEstering/BindingModules/binding_cpu.cpp b/CLUEstering/BindingModules/binding_cpu.cpp index 74511b2b..8b48c961 100644 --- a/CLUEstering/BindingModules/binding_cpu.cpp +++ b/CLUEstering/BindingModules/binding_cpu.cpp @@ -57,7 +57,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<1>{n_points}, + PointInfo<1>{n_points, {0}}, kernel, queue_, block_size); @@ -68,7 +68,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<2>{n_points}, + PointInfo<2>{n_points, {0, 0}}, kernel, queue_, block_size); @@ -79,7 +79,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<3>{n_points}, + PointInfo<3>{n_points, {0, 0, 0}}, kernel, queue_, block_size); @@ -90,7 +90,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<4>{n_points}, + PointInfo<4>{n_points, {0, 0, 0, 0}}, kernel, queue_, block_size); @@ -101,7 +101,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<5>{n_points}, + PointInfo<5>{n_points, {0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -112,7 +112,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<6>{n_points}, + PointInfo<6>{n_points, {0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -123,7 +123,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<7>{n_points}, + PointInfo<7>{n_points, {0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -134,7 +134,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<8>{n_points}, + PointInfo<8>{n_points, {0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -145,7 +145,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<9>{n_points}, + PointInfo<9>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -156,7 +156,7 @@ namespace alpaka_serial_sync { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<10>{n_points}, + PointInfo<10>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); diff --git a/CLUEstering/BindingModules/binding_cpu_tbb.cpp b/CLUEstering/BindingModules/binding_cpu_tbb.cpp index b284e4e3..64c6d2c4 100644 --- a/CLUEstering/BindingModules/binding_cpu_tbb.cpp +++ b/CLUEstering/BindingModules/binding_cpu_tbb.cpp @@ -57,7 +57,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<1>{n_points}, + PointInfo<1>{n_points, {0}}, kernel, queue_, block_size); @@ -68,7 +68,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<2>{n_points}, + PointInfo<2>{n_points, {0, 0}}, kernel, queue_, block_size); @@ -79,7 +79,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<3>{n_points}, + PointInfo<3>{n_points, {0, 0, 0}}, kernel, queue_, block_size); @@ -90,7 +90,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<4>{n_points}, + PointInfo<4>{n_points, {0, 0, 0, 0}}, kernel, queue_, block_size); @@ -101,7 +101,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<5>{n_points}, + PointInfo<5>{n_points, {0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -112,7 +112,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<6>{n_points}, + PointInfo<6>{n_points, {0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -123,7 +123,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<7>{n_points}, + PointInfo<7>{n_points, {0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -134,7 +134,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<8>{n_points}, + PointInfo<8>{n_points, {0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -145,7 +145,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<9>{n_points}, + PointInfo<9>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -156,7 +156,7 @@ namespace alpaka_tbb_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<10>{n_points}, + PointInfo<10>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); diff --git a/CLUEstering/BindingModules/binding_gpu_cuda.cpp b/CLUEstering/BindingModules/binding_gpu_cuda.cpp index f5cdabbd..ff4d09b7 100644 --- a/CLUEstering/BindingModules/binding_gpu_cuda.cpp +++ b/CLUEstering/BindingModules/binding_gpu_cuda.cpp @@ -56,7 +56,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<1>{n_points}, + PointInfo<1>{n_points, {0}}, kernel, queue_, block_size); @@ -67,7 +67,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<2>{n_points}, + PointInfo<2>{n_points, {0, 0}}, kernel, queue_, block_size); @@ -78,7 +78,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<3>{n_points}, + PointInfo<3>{n_points, {0, 0, 0}}, kernel, queue_, block_size); @@ -89,7 +89,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<4>{n_points}, + PointInfo<4>{n_points, {0, 0, 0, 0}}, kernel, queue_, block_size); @@ -100,7 +100,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<5>{n_points}, + PointInfo<5>{n_points, {0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -111,7 +111,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<6>{n_points}, + PointInfo<6>{n_points, {0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -122,7 +122,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<7>{n_points}, + PointInfo<7>{n_points, {0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -133,7 +133,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<8>{n_points}, + PointInfo<8>{n_points, {0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -144,7 +144,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<9>{n_points}, + PointInfo<9>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -155,7 +155,7 @@ namespace alpaka_cuda_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<10>{n_points}, + PointInfo<10>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); diff --git a/CLUEstering/BindingModules/binding_gpu_hip.cpp b/CLUEstering/BindingModules/binding_gpu_hip.cpp index fd8bff7a..b3c22eaf 100644 --- a/CLUEstering/BindingModules/binding_gpu_hip.cpp +++ b/CLUEstering/BindingModules/binding_gpu_hip.cpp @@ -54,7 +54,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<1>{n_points}, + PointInfo<1>{n_points, {0}}, kernel, queue_, block_size); @@ -65,7 +65,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<2>{n_points}, + PointInfo<2>{n_points, {0, 0}}, kernel, queue_, block_size); @@ -76,7 +76,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<3>{n_points}, + PointInfo<3>{n_points, {0, 0, 0}}, kernel, queue_, block_size); @@ -87,7 +87,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<4>{n_points}, + PointInfo<4>{n_points, {0, 0, 0, 0}}, kernel, queue_, block_size); @@ -98,7 +98,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<5>{n_points}, + PointInfo<5>{n_points, {0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -109,7 +109,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<6>{n_points}, + PointInfo<6>{n_points, {0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -120,7 +120,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<7>{n_points}, + PointInfo<7>{n_points, {0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -131,7 +131,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<8>{n_points}, + PointInfo<8>{n_points, {0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -142,7 +142,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<9>{n_points}, + PointInfo<9>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); @@ -153,7 +153,7 @@ namespace alpaka_rocm_async { dm, pPBin, std::make_tuple(pData, pResults), - PointShape<10>{n_points}, + PointInfo<10>{n_points, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, kernel, queue_, block_size); diff --git a/benchmark/dataset_size/main.cpp b/benchmark/dataset_size/main.cpp index aa74d33f..9b4a280f 100644 --- a/benchmark/dataset_size/main.cpp +++ b/benchmark/dataset_size/main.cpp @@ -91,7 +91,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE { const auto dev_acc = alpaka::getDevByIdx(alpaka::Platform{}, 0u); Queue queue_(dev_acc); - PointsSoA<2> h_points(coords.data(), results.data(), PointShape<2>{n_points}); + PointsSoA<2> h_points(coords.data(), results.data(), PointInfo<2>{n_points, {0, 0}}); PointsAlpaka<2> d_points(queue_, n_points); const float dc{1.5f}, rhoc{10.f}, outlier{1.5f}; diff --git a/benchmark/profiling/main.cpp b/benchmark/profiling/main.cpp index 32c68a9e..82e116e6 100644 --- a/benchmark/profiling/main.cpp +++ b/benchmark/profiling/main.cpp @@ -19,7 +19,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE { const auto dev_acc = alpaka::getDevByIdx(alpaka::Platform{}, 0u); Queue queue_(dev_acc); - PointsSoA<2> h_points(coords.data(), results.data(), PointShape<2>{n_points}); + PointsSoA<2> h_points(coords.data(), results.data(), PointInfo<2>{n_points, {0, 0}}); PointsAlpaka<2> d_points(queue_, n_points); const float dc{1.5f}, rhoc{10.f}, outlier{1.5f}; diff --git a/include/CLUEstering/DataFormats/test/TestPoints.cpp b/include/CLUEstering/DataFormats/test/TestPoints.cpp index eb461350..c584ba7f 100644 --- a/include/CLUEstering/DataFormats/test/TestPoints.cpp +++ b/include/CLUEstering/DataFormats/test/TestPoints.cpp @@ -12,7 +12,7 @@ TEST_CASE("Test implementation of Points SoA") { const auto ndim = 2; std::vector floatBuffer(3 * n); std::vector intBuffer(2 * n); - PointsSoA<2> points(floatBuffer.data(), intBuffer.data(), PointShape<2>{n}); + PointsSoA<2> points(floatBuffer.data(), intBuffer.data(), PointInfo<2>{n, {0, 0}}); SUBCASE("Check that the content of the SoA is the same as the buffer") { CHECK(std::equal(floatBuffer.begin(), floatBuffer.end(), points.coords()));