From c59aeef2e0c86ec3f0f34ce77c205f3ef0b034cc Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sun, 8 Nov 2026 22:04:06 +0100 Subject: Abstract move. Forstio independence --- modules/sycl/c++/data.hpp | 352 ++++++++++++++++++++++---------------------- modules/sycl/c++/index.hpp | 4 +- modules/sycl/tests/data.cpp | 14 +- 3 files changed, 186 insertions(+), 184 deletions(-) (limited to 'modules/sycl') diff --git a/modules/sycl/c++/data.hpp b/modules/sycl/c++/data.hpp index ec0fccf..dce9f55 100644 --- a/modules/sycl/c++/data.hpp +++ b/modules/sycl/c++/data.hpp @@ -18,57 +18,58 @@ struct struct_has_only_equal_dimension_array{}; } } -namespace saw { +namespace kel { +namespace lbm { template -class data, kel::lbm::encode::Sycl> final { +class data, kel::lbm::encode::Sycl> final { public: - using Schema = schema::FixedArray; + using Schema = sch::FixedArray; private: acpp::sycl::queue* q_; data* values_; - SAW_FORBID_COPY(data); - SAW_FORBID_MOVE(data); + KEL_FORBID_COPY(data); + KEL_FORBID_MOVE(data); public: data(const data::MetaSchema>& meta__, acpp::sycl::queue& q__): q_{&q__}, values_{nullptr} { (void) meta__; - SAW_ASSERT(q_); + KEL_ASSERT(q_); values_ = acpp::sycl::malloc_device>(ct_multiply::value,*q_); - SAW_ASSERT(values_); + KEL_ASSERT(values_); } data(acpp::sycl::queue& q__): q_{&q__}, values_{nullptr} { - SAW_ASSERT(q_); + KEL_ASSERT(q_); values_ = acpp::sycl::malloc_device>(ct_multiply::value,*q_); - SAW_ASSERT(values_); + KEL_ASSERT(values_); } ~data(){ if(not values_){ return; } - SAW_ASSERT(q_); + KEL_ASSERT(q_); acpp::sycl::free(values_,*q_); values_ = nullptr; } - static constexpr data> get_dims() { - return saw::data>{{Dims...}}; + static constexpr data> get_dims() { + return kel::lbm::data>{{Dims...}}; } - constexpr data& at(const data>& index){ - return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; + constexpr data& at(const data>& index){ + return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; } - constexpr data& at(const data>& index) const{ - return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; + constexpr data& at(const data>& index) const{ + return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; } constexpr data* flat_data() const { @@ -77,21 +78,21 @@ public: }; template -class data>, kel::lbm::encode::Sycl> final { +class data>, kel::lbm::encode::Sycl> final { public: - using Schema = schema::Ptr>; + using Schema = sch::Ptr>; private: data* values_; public: - SAW_DEFAULT_COPY(data); - SAW_DEFAULT_MOVE(data); + KEL_DEFAULT_COPY(data); + KEL_DEFAULT_MOVE(data); data(): values_{nullptr} {} - data(data, kel::lbm::encode::Sycl>& values__): + data(data, kel::lbm::encode::Sycl>& values__): values_{values__.flat_data()} {} @@ -99,20 +100,20 @@ public: values_{values__} {} - static constexpr data> get_dims() { - return saw::data>{{Dims...}}; + static constexpr data> get_dims() { + return kel::lbm::data>{{Dims...}}; } - static constexpr data> meta() { - return saw::data>{{Dims...}}; + static constexpr data> meta() { + return kel::lbm::data>{{Dims...}}; } - constexpr data& at(const data>& index){ - return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; + constexpr data& at(const data>& index){ + return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; } - constexpr data& at(const data>& index) const{ - return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; + constexpr data& at(const data>& index) const{ + return values_[kel::lbm::flatten_index::apply(index,get_dims()).get()]; } constexpr data* flat_data() const { @@ -121,27 +122,27 @@ public: }; template -class data, kel::lbm::encode::Sycl> final { +class data, kel::lbm::encode::Sycl> final { public: - using Schema = schema::Array; + using Schema = sch::Array; private: static_assert(Dims > 0u, "Zero Dim Arrays make no sense here. If you meant to use this for math style approaches then use Tensor instead of Array"); data* values_; - data,Encode> meta_; + data,Encode> meta_; acpp::sycl::queue* q_; - SAW_FORBID_COPY(data); - SAW_FORBID_MOVE(data); + KEL_FORBID_COPY(data); + KEL_FORBID_MOVE(data); public: data(const data::MetaSchema>& meta__, acpp::sycl::queue& q__): values_{nullptr}, meta_{meta__}, q_{&q__} { - SAW_ASSERT(q_); + KEL_ASSERT(q_); values_ = acpp::sycl::malloc_device>(flat_size().get(),*q_); - SAW_ASSERT(values_); + KEL_ASSERT(values_); } data(acpp::sycl::queue& q__): @@ -149,40 +150,40 @@ public: meta_{}, q_{&q__} { - SAW_ASSERT(q_); + KEL_ASSERT(q_); } ~data(){ if(not values_){ return; } - SAW_ASSERT(q_); + KEL_ASSERT(q_); acpp::sycl::free(values_,*q_); values_ = nullptr; } - constexpr data, Encode> meta() const { + constexpr data, Encode> meta() const { return meta_; } - constexpr data& at(const data, Encode>& index){ - return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; + constexpr data& at(const data, Encode>& index){ + return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; } - constexpr data& at(const data, Encode>& index) const{ - return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; + constexpr data& at(const data, Encode>& index) const{ + return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; } constexpr error_or reset_to(const data::MetaSchema>& meta_arg){ - SAW_ASSERT(q_); + KEL_ASSERT(q_); meta_ = meta_arg; if(values_){ acpp::sycl::free(values_,*q_); } values_ = acpp::sycl::malloc_device>(flat_size().get(),*q_); - SAW_ASSERT(q_); + KEL_ASSERT(q_); return make_void(); } @@ -191,8 +192,8 @@ public: return values_; } - constexpr data flat_size() const { - data mult{1u}; + constexpr data flat_size() const { + data mult{1u}; for(uint64_t i{0u}; i < Dims; ++i){ mult = mult * meta_.at({i}); @@ -203,46 +204,46 @@ public: }; template -class data>, kel::lbm::encode::Sycl> final { +class data>, kel::lbm::encode::Sycl> final { public: - using Schema = schema::Ptr>; + using Schema = sch::Ptr>; private: static_assert(Dims > 0u, "Zero Dim Arrays make no sense here. If you meant to use this for math style approaches then use Tensor instead of Array"); data* values_; - data,Encode> meta_; + data,Encode> meta_; public: - SAW_DEFAULT_COPY(data); - SAW_DEFAULT_MOVE(data); + KEL_DEFAULT_COPY(data); + KEL_DEFAULT_MOVE(data); data(): values_{nullptr} {} - data(const data, kel::lbm::encode::Sycl>& values__): + data(const data, kel::lbm::encode::Sycl>& values__): values_{values__.flat_data()}, meta_{values__.meta()} {} - constexpr data, Encode> meta() const { + constexpr data, Encode> meta() const { return meta_; } - constexpr data& at(const data, Encode>& index){ - return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; + constexpr data& at(const data, Encode>& index){ + return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; } - constexpr data& at(const data, Encode>& index) const{ - return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; + constexpr data& at(const data, Encode>& index) const{ + return values_[kel::lbm::flatten_index::apply(index,meta()).get()]; } constexpr data* flat_data() const { return values_; } - constexpr data flat_size() const { - data mult{1u}; + constexpr data flat_size() const { + data mult{1u}; for(uint64_t i{0u}; i < Dims; ++i){ mult = mult * meta_.at({i}); @@ -270,11 +271,11 @@ public: values_{q__} {} - constexpr data& ghost_at(const data>& index){ + constexpr data& ghost_at(const data>& index){ return values_.at(index); } - constexpr data& ghost_at(const data>& index) const { + constexpr data& ghost_at(const data>& index) const { return values_.at(index); } @@ -286,7 +287,7 @@ public: return data>::meta(); } - data& at(const data>& index){ + data& at(const data>& index){ std::decay_t ind; for(uint64_t i = 0u; i < sizeof...(Sides); ++i){ ind.at({i}) = index.at({i}) + Ghost; @@ -294,7 +295,7 @@ public: return values_.at(ind); } - data& at(const data>& index) const { + data& at(const data>& index) const { std::decay_t ind; for(uint64_t i = 0u; i < sizeof...(Sides); ++i){ ind.at({i}) = index.at({i}) + Ghost; @@ -303,11 +304,11 @@ public: } static constexpr auto get_dims(){ - return data,Encode>{{Sides...}}; + return data,Encode>{{Sides...}}; } static constexpr auto meta(){ - return data,Encode>{{Sides...}}; + return data,Encode>{{Sides...}}; } auto flat_data() const { @@ -320,18 +321,18 @@ public: }; template -class data>,kel::lbm::encode::Sycl> final { +class data>,kel::lbm::encode::Sycl> final { public: - using Schema = schema::Ptr>; + using Schema = sch::Ptr>; private: using InnerSchema = typename kel::lbm::sch::Chunk::InnerSchema; using ValueSchema = typename InnerSchema::ValueType; - data,kel::lbm::encode::Sycl> values_; + data,kel::lbm::encode::Sycl> values_; public: - SAW_DEFAULT_MOVE(data); - SAW_DEFAULT_COPY(data); + KEL_DEFAULT_MOVE(data); + KEL_DEFAULT_COPY(data); data(): values_{nullptr} @@ -345,11 +346,11 @@ public: values_{values__} {} - constexpr data& ghost_at(const data>& index){ + constexpr data& ghost_at(const data>& index){ return values_.at(index); } - constexpr data& ghost_at(const data>& index) const { + constexpr data& ghost_at(const data>& index) const { return values_.at(index); } @@ -361,7 +362,7 @@ public: return data>::meta(); } - data& at(const data>& index){ + data& at(const data>& index){ std::decay_t ind; for(uint64_t i = 0u; i < sizeof...(Sides); ++i){ ind.at({i}) = index.at({i}) + Ghost; @@ -369,7 +370,7 @@ public: return values_.at(ind); } - data& at(const data>& index) const { + data& at(const data>& index) const { std::decay_t ind; for(uint64_t i = 0u; i < sizeof...(Sides); ++i){ ind.at({i}) = index.at({i}) + Ghost; @@ -378,11 +379,11 @@ public: } static constexpr auto meta(){ - return data,Encode>{{Sides...}}; + return data,Encode>{{Sides...}}; } static constexpr auto get_dims(){ - return data,Encode>{{Sides...}}; + return data,Encode>{{Sides...}}; } auto flat_data() const { @@ -395,10 +396,10 @@ public: }; template -struct data, kel::lbm::encode::Sycl> final { +struct data, kel::lbm::encode::Sycl> final { public: using StorageT = std::tuple>...>; - using Schema = schema::Tuple; + using Schema = sch::Tuple; private: StorageT members_; @@ -434,10 +435,10 @@ public: }; template -struct data>, kel::lbm::encode::Sycl> final { +struct data>, kel::lbm::encode::Sycl> final { public: - using StorageT = std::tuple,kel::lbm::encode::Sycl>...>; - using Schema = schema::Tuple; + using StorageT = std::tuple,kel::lbm::encode::Sycl>...>; + using Schema = sch::Tuple; private: StorageT members_; @@ -459,10 +460,10 @@ public: }; template -class data, kel::lbm::encode::Sycl > final { +class data, kel::lbm::encode::Sycl > final { public: using StorageT = std::tuple>...>; - using Schema = schema::Struct; + using Schema = sch::Struct; private: /** * @todo Check by static assert that the members all have the same dimensions. Alternatively @@ -494,22 +495,22 @@ public: return std::get(members_); } - template + template auto& get(){ return std::get::value>(members_); } - template + template auto& get() const { return std::get::value>(members_); } }; -template -class data...>>, kel::lbm::encode::Sycl > final { +template +class data...>>, kel::lbm::encode::Sycl > final { public: - using StorageT = std::tuple,kel::lbm::encode::Sycl>...>; - using Schema = schema::Struct,Keys>...>; + using StorageT = std::tuple,kel::lbm::encode::Sycl>...>; + using Schema = sch::Struct,Keys>...>; private: /** * @todo Check by static assert that the members all have the same dimensions. Alternatively @@ -529,17 +530,18 @@ public: return std::get(members_); } - template + template auto& get(){ return std::get::value>(members_); } - template + template auto& get() const { return std::get::value>(members_); } }; } +} namespace kel { namespace lbm { @@ -552,9 +554,9 @@ struct sycl_copy_helper, Encode> final { using Schema = sch::Struct; template - static saw::error_or copy_to_device_member(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device_member(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ if constexpr (i < sizeof...(Members)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto& host_member_data = host_data.template get(); auto& sycl_member_data = sycl_data.template get(); @@ -566,18 +568,18 @@ struct sycl_copy_helper, Encode> final { return copy_to_device_member(host_data,sycl_data,q); } - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ return copy_to_device_member<0u>(host_data, sycl_data, q); } template - static saw::error_or copy_to_host_member(saw::data>& sycl_data, saw::data& host_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_host_member(kel::lbm::data>& sycl_data, kel::lbm::data& host_data, sycl::queue& q){ if constexpr (i < sizeof...(Members)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto& host_member_data = host_data.template get(); auto& sycl_member_data = sycl_data.template get(); @@ -589,19 +591,19 @@ struct sycl_copy_helper, Encode> final { return copy_to_host_member(sycl_data,host_data,q); } - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_host(saw::data>& sycl_data, saw::data& host_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_host(kel::lbm::data>& sycl_data, kel::lbm::data& host_data, sycl::queue& q){ return copy_to_host_member<0u>(sycl_data, host_data, q); } template - static saw::error_or malloc_on_device_member(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or malloc_on_device_member(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ if constexpr (i < sizeof...(Members)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto& host_member_data = host_data.template get(); auto& sycl_member_data = sycl_data.template get(); @@ -613,10 +615,10 @@ struct sycl_copy_helper, Encode> final { return malloc_on_device_member(host_data,sycl_data,q); } - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or malloc_on_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or malloc_on_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ return malloc_on_device_member<0u>(host_data,sycl_data,q); } }; @@ -626,9 +628,9 @@ struct sycl_copy_helper, Encode> final { using Schema = sch::Tuple; template - static saw::error_or copy_to_device_member(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device_member(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ if constexpr (i < sizeof...(Members)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto& host_member_data = host_data.template get(); auto& sycl_member_data = sycl_data.template get(); @@ -640,17 +642,17 @@ struct sycl_copy_helper, Encode> final { return copy_to_device_member(host_data,sycl_data,q); } - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ return copy_to_device_member<0u>(host_data, sycl_data, q); } template - static saw::error_or copy_to_host_member(saw::data>& sycl_data, saw::data& host_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_host_member(kel::lbm::data>& sycl_data, kel::lbm::data& host_data, sycl::queue& q){ if constexpr (i < sizeof...(Members)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto& host_member_data = host_data.template get(); auto& sycl_member_data = sycl_data.template get(); @@ -663,23 +665,23 @@ struct sycl_copy_helper, Encode> final { return copy_to_host_member(sycl_data,host_data,q); } - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_host( - saw::data& host_data, - saw::data>& sycl_data, + static kel::lbm::error_or copy_to_host( + kel::lbm::data& host_data, + kel::lbm::data>& sycl_data, sycl::queue& q ){ return copy_to_host_member<0u>(sycl_data, host_data, q); } template - static saw::error_or malloc_on_device_member(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or malloc_on_device_member(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ if constexpr (i < sizeof...(Members)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto& host_member_data = host_data.template get(); auto& sycl_member_data = sycl_data.template get(); @@ -691,10 +693,10 @@ struct sycl_copy_helper, Encode> final { return malloc_on_device_member(host_data,sycl_data,q); } - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or malloc_on_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or malloc_on_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ return malloc_on_device_member<0u>(host_data,sycl_data,q); } }; @@ -703,35 +705,35 @@ template struct sycl_copy_helper, Encode> final { using Schema = sch::FixedArray; - static saw::error_or copy_to_host(saw::data>& sycl_data, saw::data& host_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_host(kel::lbm::data>& sycl_data, kel::lbm::data& host_data, sycl::queue& q){ auto host_ptr = host_data.flat_data(); auto sycl_ptr = sycl_data.flat_data(); static_assert(sizeof(std::decay_t) == sizeof(std::decay_t), "Unequal size"); q.submit([&](acpp::sycl::handler& h){ - h.copy(sycl_ptr,host_ptr, saw::ct_multiply::value); + h.copy(sycl_ptr,host_ptr, kel::lbm::ct_multiply::value); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ auto host_ptr = host_data.flat_data(); auto sycl_ptr = sycl_data.flat_data(); static_assert(sizeof(std::decay_t) == sizeof(std::decay_t), "Unequal size"); q.submit([&](acpp::sycl::handler& h){ - h.copy(host_ptr,sycl_ptr, saw::ct_multiply::value); + h.copy(host_ptr,sycl_ptr, kel::lbm::ct_multiply::value); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or malloc_on_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or malloc_on_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ (void) host_data; (void) sycl_data; (void) q; - return saw::make_void(); + return kel::lbm::make_void(); } }; @@ -739,7 +741,7 @@ template struct sycl_copy_helper, Encode> final { using Schema = sch::Chunk; - static saw::error_or copy_to_host(saw::data>& sycl_data, saw::data& host_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_host(kel::lbm::data>& sycl_data, kel::lbm::data& host_data, sycl::queue& q){ auto host_ptr = host_data.flat_data(); auto sycl_ptr = sycl_data.flat_data(); @@ -750,10 +752,10 @@ struct sycl_copy_helper, Encode> final { q.submit([&](acpp::sycl::handler& h){ h.copy(sycl_ptr,host_ptr, flat_size.get()); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ auto host_ptr = host_data.flat_data(); auto sycl_ptr = sycl_data.flat_data(); @@ -764,7 +766,7 @@ struct sycl_copy_helper, Encode> final { q.submit([&](acpp::sycl::handler& h){ h.copy(host_ptr,sycl_ptr, flat_size.get()); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } }; @@ -772,20 +774,20 @@ template struct sycl_copy_helper, Encode> final { using Schema = sch::Array; - static saw::error_or copy_to_host(saw::data>& sycl_data, saw::data& host_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_host(kel::lbm::data>& sycl_data, kel::lbm::data& host_data, sycl::queue& q){ auto host_ptr = host_data.flat_data(); auto sycl_ptr = sycl_data.flat_data(); static_assert(sizeof(std::decay_t) == sizeof(std::decay_t), "Unequal size"); - SAW_ASSERT(host_data.flat_size() == sycl_data.flat_size()); + KEL_ASSERT(host_data.flat_size() == sycl_data.flat_size()); q.submit([&](acpp::sycl::handler& h){ h.copy(sycl_ptr,host_ptr, host_data.flat_size().get()); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or copy_to_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or copy_to_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ { auto hm = host_data.meta(); @@ -807,12 +809,12 @@ struct sycl_copy_helper, Encode> final { h.copy(host_ptr,sycl_ptr, host_data.flat_size().get()); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } - static saw::error_or malloc_on_device(saw::data& host_data, saw::data>& sycl_data, sycl::queue& q){ + static kel::lbm::error_or malloc_on_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data, sycl::queue& q){ sycl_data = {host_data.meta(),q}; - return saw::make_void(); + return kel::lbm::make_void(); } }; @@ -823,49 +825,49 @@ struct make_view_helper; template struct make_view_helper, encode::Sycl> { public: -static saw::error_or apply( - saw::data, encode::Sycl>& dat, - saw::data>, encode::Sycl>& dat_view +static kel::lbm::error_or apply( + kel::lbm::data, encode::Sycl>& dat, + kel::lbm::data>, encode::Sycl>& dat_view ){ dat_view = {dat}; - return saw::make_void(); + return kel::lbm::make_void(); } }; template struct make_view_helper, encode::Sycl> { public: - static saw::error_or apply( - saw::data, encode::Sycl>& dat, - saw::data>, encode::Sycl>& dat_view + static kel::lbm::error_or apply( + kel::lbm::data, encode::Sycl>& dat, + kel::lbm::data>, encode::Sycl>& dat_view ){ dat_view = {dat}; - return saw::make_void(); + return kel::lbm::make_void(); } }; template struct make_view_helper, encode::Sycl> { public: - static saw::error_or apply( - saw::data, encode::Sycl>& dat, - saw::data>, encode::Sycl>& dat_view + static kel::lbm::error_or apply( + kel::lbm::data, encode::Sycl>& dat, + kel::lbm::data>, encode::Sycl>& dat_view ){ dat_view = {dat}; - return saw::make_void(); + return kel::lbm::make_void(); } }; -template +template struct make_view_helper...>, encode::Sycl> { private: template -static saw::error_or apply_i( - saw::data...>, encode::Sycl>& dat, - saw::data...>>, encode::Sycl>& dat_view +static kel::lbm::error_or apply_i( + kel::lbm::data...>, encode::Sycl>& dat, + kel::lbm::data...>>, encode::Sycl>& dat_view ){ if constexpr (i < sizeof...(Sch)){ - using M = typename saw::parameter_pack_type...>::type; + using M = typename kel::lbm::parameter_pack_type...>::type; auto eov = make_view_helper>::apply(dat.template get(),dat_view.template get()); if(eov.is_error()){ @@ -875,12 +877,12 @@ static saw::error_or apply_i( return apply_i(dat,dat_view); } - return saw::make_void(); + return kel::lbm::make_void(); } public: -static saw::error_or apply( - saw::data...>, encode::Sycl>& dat, - saw::data...>>, encode::Sycl>& dat_view +static kel::lbm::error_or apply( + kel::lbm::data...>, encode::Sycl>& dat, + kel::lbm::data...>>, encode::Sycl>& dat_view ){ return apply_i<0u>(dat,dat_view); } @@ -890,12 +892,12 @@ template struct make_view_helper, encode::Sycl> { private: template - static saw::error_or apply_i( - saw::data, encode::Sycl>& dat, - saw::data>, encode::Sycl>& dat_view + static kel::lbm::error_or apply_i( + kel::lbm::data, encode::Sycl>& dat, + kel::lbm::data>, encode::Sycl>& dat_view ){ if constexpr (i < sizeof...(Sch)){ - using M = typename saw::parameter_pack_type::type; + using M = typename kel::lbm::parameter_pack_type::type; auto eov = make_view_helper>::apply(dat.template get(), dat_view.template get()); if(eov.is_error()){ @@ -905,12 +907,12 @@ private: return apply_i(dat,dat_view); } - return saw::make_void(); + return kel::lbm::make_void(); } public: - static saw::error_or apply( - saw::data, encode::Sycl>& dat, - saw::data>, encode::Sycl> dat_view + static kel::lbm::error_or apply( + kel::lbm::data, encode::Sycl>& dat, + kel::lbm::data>, encode::Sycl> dat_view ){ return apply_i<0u>(dat,dat_view); } @@ -919,8 +921,8 @@ public: // Ptr => Ptr>> => Ptr template -auto make_view(saw::data& dat){ - saw::data,Encode> dat_view; +auto make_view(kel::lbm::data& dat){ + kel::lbm::data,Encode> dat_view; auto eov = impl::make_view_helper::apply(dat,dat_view); (void) eov; @@ -931,26 +933,26 @@ class device final { private: sycl::queue q_; - SAW_FORBID_COPY(device); - SAW_FORBID_MOVE(device); + KEL_FORBID_COPY(device); + KEL_FORBID_MOVE(device); public: device() = default; ~device() = default; template - saw::error_or copy_to_device(saw::data& host_data, saw::data>& sycl_data){ + kel::lbm::error_or copy_to_device(kel::lbm::data& host_data, kel::lbm::data>& sycl_data){ return impl::sycl_copy_helper::copy_to_device(host_data, sycl_data, q_); } template - saw::error_or copy_to_host(saw::data>& sycl_data, saw::data& host_data){ + kel::lbm::error_or copy_to_host(kel::lbm::data>& sycl_data, kel::lbm::data& host_data){ return impl::sycl_copy_helper::copy_to_host(sycl_data, host_data, q_); } template - saw::error_or malloc_on_device( - saw::data& host_data, - saw::data>& sycl_data + kel::lbm::error_or malloc_on_device( + kel::lbm::data& host_data, + kel::lbm::data>& sycl_data ){ auto eov = impl::sycl_copy_helper::malloc_on_device(host_data, sycl_data, q_); q_.wait(); diff --git a/modules/sycl/c++/index.hpp b/modules/sycl/c++/index.hpp index 0d2c035..cf6a4af 100644 --- a/modules/sycl/c++/index.hpp +++ b/modules/sycl/c++/index.hpp @@ -5,8 +5,8 @@ namespace kel { namespace lbm { template -saw::data> sycl_to_saw_index(const acpp::sycl::id& idx){ - saw::data> trans_index; +kel::lbm::data> sycl_to_saw_index(const acpp::sycl::id& idx){ + kel::lbm::data> trans_index; for(uint64_t i{0u}; i < D; ++i){ trans_index.at({{i}}).set(idx[i]); diff --git a/modules/sycl/tests/data.cpp b/modules/sycl/tests/data.cpp index 4321a0d..448129a 100644 --- a/modules/sycl/tests/data.cpp +++ b/modules/sycl/tests/data.cpp @@ -22,14 +22,14 @@ using TestObjSchema = Tuple< SAW_TEST("Sycl Data Compilation"){ acpp::sycl::queue q; - saw::data< - saw::schema::Struct< - saw::schema::Member< - kel::lbm::sch::Chunk, + kel::lbm::data< + kel::lbm::sch::Struct< + kel::lbm::sch::Member< + kel::lbm::sch::Chunk, "test" > >, - kel::lbm::encode::Sycl + kel::lbm::encode::Sycl > dat{q}; auto& test_f = dat.template get<"test">(); @@ -41,14 +41,14 @@ SAW_TEST("Sycl Data Compilation"){ SAW_TEST("Sycl Data Array of Struct"){ acpp::sycl::queue q; - saw::data, kel::lbm::encode::Sycl> a{{{2u}},q}; + kel::lbm::data, kel::lbm::encode::Sycl> a{{{2u}},q}; } /* SAW_TEST("Sycl Data Compilation for Particle Similacrum"){ acpp::sycl::queue q; - saw::data< + kel::lbm::data< sch::TestObjSchema > a; } -- cgit v1.3.1