Skip to content

Commit

Permalink
adapt python part to changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@AuroraPerego
AuroraPerego committed Jan 28, 2025
1 parent 62a3592 commit b87767f
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 43 deletions.
20 changes: 10 additions & 10 deletions CLUEstering/BindingModules/binding_cpu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions CLUEstering/BindingModules/binding_cpu_tbb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions CLUEstering/BindingModules/binding_gpu_cuda.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions CLUEstering/BindingModules/binding_gpu_hip.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion benchmark/dataset_size/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
const auto dev_acc = alpaka::getDevByIdx(alpaka::Platform<Acc1D>{}, 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}});

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
PointsAlpaka<2> d_points(queue_, n_points);

const float dc{1.5f}, rhoc{10.f}, outlier{1.5f};
Expand Down
2 changes: 1 addition & 1 deletion benchmark/profiling/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
const auto dev_acc = alpaka::getDevByIdx(alpaka::Platform<Acc1D>{}, 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}});

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule
PointsAlpaka<2> d_points(queue_, n_points);

const float dc{1.5f}, rhoc{10.f}, outlier{1.5f};
Expand Down
2 changes: 1 addition & 1 deletion include/CLUEstering/DataFormats/test/TestPoints.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ TEST_CASE("Test implementation of Points SoA") {
const auto ndim = 2;
std::vector<float> floatBuffer(3 * n);
std::vector<int> 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}});

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note test

MISRA 12.3 rule

SUBCASE("Check that the content of the SoA is the same as the buffer") {
CHECK(std::equal(floatBuffer.begin(), floatBuffer.end(), points.coords()));
Expand Down

0 comments on commit b87767f

Please sign in to comment.