diff --git a/examples/run/alpaka/seeding_example_alpaka.cpp b/examples/run/alpaka/seeding_example_alpaka.cpp index 2423e9899..682b15c62 100644 --- a/examples/run/alpaka/seeding_example_alpaka.cpp +++ b/examples/run/alpaka/seeding_example_alpaka.cpp @@ -42,7 +42,6 @@ #include "detray/navigation/navigator.hpp" #include "detray/propagator/propagator.hpp" #include "detray/propagator/rk_stepper.hpp" - #include "traccc/alpaka/utils/vecmem_types.hpp" #ifdef ALPAKA_ACC_SYCL_ENABLED #include @@ -68,15 +67,15 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts, using Idx = uint32_t; using Acc = ::alpaka::ExampleDefaultAcc; - #ifdef ALPAKA_ACC_SYCL_ENABLED - ::sycl::queue q; - vecmem::sycl::queue_wrapper qw{&q}; +#ifdef ALPAKA_ACC_SYCL_ENABLED + ::sycl::queue q; + vecmem::sycl::queue_wrapper qw{&q}; traccc::alpaka::vecmem::host_device_types< ::alpaka::trait::AccToTag::type>::device_copy copy(qw); - #else - traccc::alpaka::vecmem::host_device_types< - ::alpaka::trait::AccToTag::type>::device_copy copy; - #endif +#else + traccc::alpaka::vecmem::host_device_types< + ::alpaka::trait::AccToTag::type>::device_copy copy; +#endif traccc::alpaka::vecmem::host_device_types< ::alpaka::trait::AccToTag::type>::host_memory_resource host_mr; traccc::alpaka::vecmem::host_device_types< diff --git a/examples/run/alpaka/seq_example_alpaka.cpp b/examples/run/alpaka/seq_example_alpaka.cpp index 94006a7d7..96630293a 100644 --- a/examples/run/alpaka/seq_example_alpaka.cpp +++ b/examples/run/alpaka/seq_example_alpaka.cpp @@ -12,7 +12,6 @@ #include "traccc/alpaka/seeding/seeding_algorithm.hpp" #include "traccc/alpaka/seeding/spacepoint_formation_algorithm.hpp" #include "traccc/alpaka/seeding/track_params_estimation.hpp" - #include "traccc/alpaka/utils/vecmem_types.hpp" #ifdef ALPAKA_ACC_SYCL_ENABLED #include @@ -73,15 +72,15 @@ int seq_run(const traccc::opts::detector& detector_opts, // Memory resources used by the application. traccc::alpaka::vecmem::host_device_types< alpaka::trait::AccToTag::type>::host_memory_resource host_mr; - #ifdef ALPAKA_ACC_SYCL_ENABLED - ::sycl::queue q; - vecmem::sycl::queue_wrapper qw{&q}; +#ifdef ALPAKA_ACC_SYCL_ENABLED + ::sycl::queue q; + vecmem::sycl::queue_wrapper qw{&q}; traccc::alpaka::vecmem::host_device_types< alpaka::trait::AccToTag::type>::device_copy copy(qw); - #else - traccc::alpaka::vecmem::host_device_types< - alpaka::trait::AccToTag::type>::device_copy copy; - #endif +#else + traccc::alpaka::vecmem::host_device_types< + alpaka::trait::AccToTag::type>::device_copy copy; +#endif traccc::alpaka::vecmem::host_device_types< alpaka::trait::AccToTag::type>::device_memory_resource device_mr; traccc::memory_resource mr{device_mr, &host_mr}; diff --git a/tests/alpaka/alpaka_basic.cpp b/tests/alpaka/alpaka_basic.cpp index d259205f7..7e7d828dc 100644 --- a/tests/alpaka/alpaka_basic.cpp +++ b/tests/alpaka/alpaka_basic.cpp @@ -136,15 +136,15 @@ GTEST_TEST(AlpakaBasic, VecMemOp) { using WorkDiv = WorkDivMembers; auto workDiv = WorkDiv{blocksPerGrid, threadsPerBlock, elementsPerThread}; - #ifdef ALPAKA_ACC_SYCL_ENABLED - ::sycl::queue q; - vecmem::sycl::queue_wrapper qw{&q}; +#ifdef ALPAKA_ACC_SYCL_ENABLED + ::sycl::queue q; + vecmem::sycl::queue_wrapper qw{&q}; traccc::alpaka::vecmem::host_device_types< alpaka::trait::AccToTag::type>::device_copy vm_copy(qw); - #else - traccc::alpaka::vecmem::host_device_types< - alpaka::trait::AccToTag::type>::device_copy vm_copy; - #endif +#else + traccc::alpaka::vecmem::host_device_types< + alpaka::trait::AccToTag::type>::device_copy vm_copy; +#endif traccc::alpaka::vecmem::host_device_types< alpaka::trait::AccToTag::type>::host_memory_resource host_mr; diff --git a/tests/alpaka/test_cca.cpp b/tests/alpaka/test_cca.cpp index cf14142bf..a56d4e673 100644 --- a/tests/alpaka/test_cca.cpp +++ b/tests/alpaka/test_cca.cpp @@ -42,10 +42,10 @@ cca_function_t get_f_with(traccc::clustering_config cfg) { ::sycl::queue q; vecmem::sycl::queue_wrapper qw{&q}; traccc::alpaka::vecmem::host_device_types< - alpaka::trait::AccToTag::type>::device_copy copy(qw); + alpaka::trait::AccToTag::type>::device_copy copy(qw); #else traccc::alpaka::vecmem::host_device_types< - alpaka::trait::AccToTag::type>::device_copy copy; + alpaka::trait::AccToTag::type>::device_copy copy; #endif traccc::alpaka::vecmem::host_device_types< alpaka::trait::AccToTag::type>::device_memory_resource