Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SoA Proxy, main branch (2024.09.25.) #296

Merged
merged 5 commits into from
Sep 30, 2024
Merged

SoA Proxy, main branch (2024.09.25.) #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c7c5af
Introduced a concatenation constructor for vecmem::tuple.
krasznaa Sep 25, 2024
233b532
Introduced vecmem::edm::proxy for host containers.
krasznaa Sep 25, 2024
95f8a9d
Added "proxy functionality" to vecmem::edm::device as well.
krasznaa Sep 25, 2024
9095440
Tweaked the new code and its documentation a little.
krasznaa Sep 25, 2024
78c80c1
Switched to references with the const proxies.
krasznaa Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ if( VECMEM_BUILD_DOCS )
"${CMAKE_CURRENT_SOURCE_DIR}/cuda/include"
"${CMAKE_CURRENT_SOURCE_DIR}/hip/include"
"${CMAKE_CURRENT_SOURCE_DIR}/sycl/include" )
set( DOXYGEN_PREDEFINED
"__cplusplus=201700L" )
set( DOXYGEN_EXCLUDE
"${CMAKE_CURRENT_SOURCE_DIR}/tests"
"${CMAKE_CURRENT_SOURCE_DIR}/benchmarks"
Expand Down
4 changes: 2 additions & 2 deletions core/include/vecmem/containers/device_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace vecmem {

// Forward declaration(s).
namespace edm {
template <typename T>
template <typename T, template <typename> class I>
class device;
}

Expand All @@ -36,7 +36,7 @@ template <typename TYPE>
class device_vector {

// Make @c vecmem::edm::device a friend of this class.
template <typename T>
template <typename T, template <typename> class I>
friend class edm::device;

public:
Expand Down
9 changes: 5 additions & 4 deletions core/include/vecmem/edm/container.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* VecMem project, part of the ACTS project (R&D line)
*
* (c) 2023 CERN for the benefit of the ACTS project
* (c) 2023-2024 CERN for the benefit of the ACTS project
*
* Mozilla Public License Version 2.0
*/
Expand Down Expand Up @@ -40,7 +40,7 @@ struct container {

#if __cplusplus >= 201700L
/// Host container type
using host = interface_type<vecmem::edm::host<schema_type> >;
using host = interface_type<vecmem::edm::host<schema_type, interface_type>>;

/// (Non-const) Data type
using data = vecmem::edm::data<schema_type>;
Expand All @@ -52,10 +52,11 @@ struct container {
#endif // __cplusplus >= 201700L

/// (Non-const) Device container type
using device = interface_type<vecmem::edm::device<schema_type> >;
using device =
interface_type<vecmem::edm::device<schema_type, interface_type>>;
/// (Const) Device container type
using const_device =
interface_type<vecmem::edm::device<const_schema_type> >;
interface_type<vecmem::edm::device<const_schema_type, interface_type>>;

/// (Non-const) View type
using view = vecmem::edm::view<schema_type>;
Expand Down
Loading
Loading