Simplify vecmem/alpaka interaction #670
+160
−89
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /** | ||
| * traccc library, part of the ACTS project (R&D line) | ||
| * | ||
| * (c) 2024 CERN for the benefit of the ACTS project | ||
| * | ||
| * Mozilla Public License Version 2.0 | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| // VecMem include(s). | ||
| #ifdef ALPAKA_ACC_GPU_CUDA_ENABLED | ||
|
There was a problem hiding this comment. I'm not sure what the exact logic should be here... 🤔 Generally, I think I'd try to organise this code like: // define the generic host_device_types trait
#ifdef TRACCC_HAVE_VECMEM_CUDA
#include <vecmem/memory/cuda/device_memory_resource.hpp>
...
template <>
struct host_device_types<::alpaka::TagGpuCudaRt> {
using device_memory_resource = ::vecmem::cuda::host_memory_resource;
...
#endif
#ifdef TRACCC_HAVE_VECMEM_SYCL
#include <vecmem/memory/sycl/device_memory_resource.hpp>
...
#endifI.e. we should just depend on all the headers/libraries in this header that are available to us during the build. And declare the trait specializations for all the available types / environments. The decision about which environment is being chosen for the Alpaka build, should be a separate one. That choice should be able to select between all the available options, presented by this header. And yes, the |
||
| #include <vecmem/memory/cuda/device_memory_resource.hpp> | ||
| #include <vecmem/memory/cuda/host_memory_resource.hpp> | ||
| #include <vecmem/memory/cuda/managed_memory_resource.hpp> | ||
| #include <vecmem/utils/cuda/copy.hpp> | ||
|
|
||
| #elif defined(ALPAKA_ACC_GPU_HIP_ENABLED) | ||
| #include <vecmem/memory/hip/device_memory_resource.hpp> | ||
| #include <vecmem/memory/hip/host_memory_resource.hpp> | ||
| #include <vecmem/memory/hip/managed_memory_resource.hpp> | ||
| #include <vecmem/utils/hip/copy.hpp> | ||
|
|
||
| #elif defined(ALPAKA_ACC_SYCL_ENABLED) | ||
| #include <vecmem/memory/sycl/device_memory_resource.hpp> | ||
| #include <vecmem/memory/sycl/host_memory_resource.hpp> | ||
| #include <vecmem/utils/sycl/copy.hpp> | ||
|
|
||
| #else | ||
| #include <vecmem/memory/memory_resource.hpp> | ||
| #include <vecmem/utils/copy.hpp> | ||
| #endif | ||
|
|
||
| #include <alpaka/alpaka.hpp> | ||
|
|
||
| // Forward declarations so we can compile the types below | ||
| namespace vecmem { | ||
| class host_memory_resource; | ||
| class copy; | ||
| namespace cuda { | ||
| class host_memory_resource; | ||
| class device_memory_resource; | ||
| class managed_memory_resource; | ||
| class copy; | ||
| } // namespace cuda | ||
| namespace hip { | ||
| class host_memory_resource; | ||
| class device_memory_resource; | ||
| class managed_memory_resource; | ||
| class copy; | ||
| } // namespace hip | ||
| namespace sycl { | ||
| class host_memory_resource; | ||
| class device_memory_resource; | ||
| class managed_memory_resource; | ||
| class copy; | ||
| } // namespace sycl | ||
| } // namespace vecmem | ||
|
|
||
| namespace traccc::alpaka::vecmem { | ||
| // For all CPU accelerators (except SYCL), just use host | ||
| template <typename T> | ||
| struct host_device_types { | ||
| using device_memory_resource = ::vecmem::host_memory_resource; | ||
| using host_memory_resource = ::vecmem::host_memory_resource; | ||
| using managed_memory_resource = ::vecmem::host_memory_resource; | ||
| using device_copy = ::vecmem::copy; | ||
| }; | ||
| template <> | ||
| struct host_device_types<::alpaka::TagGpuCudaRt> { | ||
| using device_memory_resource = ::vecmem::cuda::host_memory_resource; | ||
| using host_memory_resource = ::vecmem::cuda::host_memory_resource; | ||
| using managed_memory_resource = ::vecmem::cuda::managed_memory_resource; | ||
| using device_copy = ::vecmem::cuda::copy; | ||
| }; | ||
| template <> | ||
| struct host_device_types<::alpaka::TagGpuHipRt> { | ||
| using device_memory_resource = ::vecmem::hip::device_memory_resource; | ||
| using host_memory_resource = ::vecmem::hip::host_memory_resource; | ||
| using managed_memory_resource = ::vecmem::hip::managed_memory_resource; | ||
| using device_copy = ::vecmem::hip::copy; | ||
| }; | ||
| template <> | ||
| struct host_device_types<::alpaka::TagCpuSycl> { | ||
| using device_memory_resource = ::vecmem::sycl::device_memory_resource; | ||
| using host_memory_resource = ::vecmem::sycl::host_memory_resource; | ||
| using managed_memory_resource = ::vecmem::sycl::host_memory_resource; | ||
| using device_copy = ::vecmem::sycl::copy; | ||
| }; | ||
| template <> | ||
| struct host_device_types<::alpaka::TagFpgaSyclIntel> { | ||
| using device_memory_resource = ::vecmem::sycl::device_memory_resource; | ||
| using host_memory_resource = ::vecmem::sycl::host_memory_resource; | ||
| using managed_memory_resource = ::vecmem::sycl::host_memory_resource; | ||
| using device_copy = ::vecmem::sycl::copy; | ||
| }; | ||
| template <> | ||
| struct host_device_types<::alpaka::TagGpuSyclIntel> { | ||
| using device_memory_resource = ::vecmem::sycl::device_memory_resource; | ||
| using host_memory_resource = ::vecmem::sycl::host_memory_resource; | ||
| using device_copy = ::vecmem::sycl::copy; | ||
| }; | ||
| } // namespace traccc::alpaka::vecmem | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not absolutely necessary to do it in this PR, but this header should eventually be in the
src/directory. Generally we'll have to avoid any public dependence on the Alpaka headers in this library. Just like how we avoid any public CUDA or SYCL dependence in those libraries. (Not counting some coding mishaps, that still appear in some places...)