From 20e46825069b3974d5cc883163d7e37b4836b2af Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Mon, 13 Apr 2026 19:26:57 +0200
Subject: Progress?

---
 lib/core/c++/particle/particle.hpp |  26 +---
 lib/sycl/c++/data.hpp              | 300 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 300 insertions(+), 26 deletions(-)

(limited to 'lib')

diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp
index c0d115f..e48cf08 100644
--- a/lib/core/c++/particle/particle.hpp
+++ b/lib/core/c++/particle/particle.hpp
@@ -55,14 +55,13 @@ using Particle = Struct<
 template<typename T, uint64_t D, typename CollisionType = ParticleCollisionSpheroid<T>>
 using ParticleGroup = Struct<
 	Member<Array<T,D>, "mask">,
-	Member<CollisionType, "collision">,
-	Member<Scalar<T>, "mass">,
+	Member<FixedArray<Scalar<T>,1u>, "density">,
 	Member<Array<Particle<T,D>>, "particles">
 >;
 }
 
-template<typename T, uint64_t D>
-saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T>>> create_spheroid_particle_group(
+template<typename T, uint64_t D, T radius>
+saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> create_spheroid_particle_group(
 		saw::data<sch::Scalar<T>> rad_p,
 		saw::data<sch::Scalar<T>> density_p,
 		const saw::data<sch::UInt64>& mask_resolution
@@ -71,23 +70,10 @@ saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T>>> create_sph
 
 	auto& mask = part.template get<"mask">();
 	auto& collision = part.template get<"collision">();
-	auto& mass = part.template get<"mass">();
+	auto& density = part.template get<"density">().at({{0u}});
 
-	if constexpr ( D == 1u ){
-		saw::data<sch::Scalar<T>> c;
-		c.at({}).set(2.0);
-		mass = rad_p * c * density_p;
-	} else if constexpr ( D == 2u){
-		saw::data<sch::Scalar<T>> pi;
-		pi.at({}).set(3.14159);
-		mass = rad_p * rad_p * pi * density_p;
-	} else if constexpr ( D == 3u ){
-		saw::data<sch::Scalar<T>> c;
-		c.at({}).set(3.14159 * 4.0 / 3.0);
-		mass = rad_p * rad_p * rad_p * c * density_p;
-	} else {
-		static_assert(D == 0u or D > 3u, "Dimensions only supported for Dim 1,2 & 3.");
-	}
+	static_assert(D == 0u or D > 3u, "Dimensions only supported for Dim 1,2 & 3.");
+	density = density_p;
 
 	saw::data<sch::FixedArray<sch::UInt64,D>> mask_dims;
 	for(uint64_t i = 0u; i < D; ++i){
diff --git a/lib/sycl/c++/data.hpp b/lib/sycl/c++/data.hpp
index 50adb4f..661c313 100644
--- a/lib/sycl/c++/data.hpp
+++ b/lib/sycl/c++/data.hpp
@@ -29,13 +29,15 @@ private:
 
 	SAW_FORBID_COPY(data);
 	SAW_FORBID_MOVE(data);
+
 public:
 	data(acpp::sycl::queue& q__):
 		q_{&q__},
 		values_{nullptr}
 	{
+		SAW_ASSERT(q_);
 		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(ct_multiply<uint64_t,Dims...>::value,*q_);
-		SAW_ASSERT(values_ and q_);
+		SAW_ASSERT(values_);
 	}
 
 	~data(){
@@ -63,6 +65,7 @@ public:
 	constexpr data<Sch,Encode>* flat_data() {
 		return values_;
 	}
+
 };
 
 template<typename Sch, uint64_t... Dims, typename Encode>
@@ -81,7 +84,7 @@ public:
 	{}
 
 	data(data<schema::FixedArray<Sch,Dims...>, kel::lbm::encode::Sycl<Encode>>& values__):
-		values_{&values__.at({})}
+		values_{values__.flat_data()}
 	{}
 
 	data(data<Sch,Encode>* values__):
@@ -105,6 +108,113 @@ public:
 	}
 };
 
+template<typename Sch, uint64_t Dims, typename Encode>
+class data<schema::Array<Sch,Dims>, kel::lbm::encode::Sycl<Encode>> final {
+public:
+	using Schema = schema::Array<Sch,Dims>;
+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<Sch,Encode>* values_;
+	data<schema::FixedArray<schema::UInt64,Dims>,Encode> meta_;
+	acpp::sycl::queue* q_;
+
+	SAW_FORBID_COPY(data);
+	SAW_FORBID_MOVE(data);
+public:
+	data(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& meta__,acpp::sycl::queue& q__):
+		values_{nullptr},
+		meta_{meta__},
+		q_{&q__}
+	{
+		SAW_ASSERT(q_);
+		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(flat_size().get(),*q_);
+		SAW_ASSERT(values_);
+	}
+
+	~data(){
+		if(not values_){
+			return;
+		}
+		SAW_ASSERT(q_);
+
+		acpp::sycl::free(values_,*q_);
+		values_ = nullptr;
+	}
+
+	constexpr data<schema::FixedArray<schema::UInt64, Dims>, Encode> meta() const {
+		return meta_;
+	}
+
+	constexpr data<Sch,Encode>& at(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& index){
+		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
+	}
+
+	constexpr data<Sch,Encode>& at(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& index) const{
+		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
+	}
+
+	constexpr data<Sch,Encode>* flat_data() {
+		return values_;
+	}
+
+	constexpr data<schema::UInt64,Encode> flat_size() const {
+		data<schema::UInt64> mult{1u};
+
+		for(uint64_t i{0u}; i < Dims; ++i){
+			mult = mult * meta_.at({i});
+		}
+
+		return mult;
+	}
+};
+
+template<typename Sch, uint64_t Dims, typename Encode>
+class data<schema::Ptr<schema::Array<Sch,Dims>>, kel::lbm::encode::Sycl<Encode>> final {
+public:
+	using Schema = schema::Ptr<schema::Array<Sch,Dims>>;
+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<Sch,Encode>* values_;
+	data<schema::FixedArray<schema::UInt64,Dims>,Encode> meta_;
+
+	SAW_FORBID_COPY(data);
+	SAW_FORBID_MOVE(data);
+public:
+	data(const data<schema::Array<Sch,Dims>, kel::lbm::encode::Sycl<Encode>>& values__):
+		values_{values__.flat_data()},
+		meta_{values__.meta()}
+	{
+	}
+
+	constexpr data<schema::FixedArray<schema::UInt64, Dims>, Encode> meta() const {
+		return meta_;
+	}
+
+	constexpr data<Sch,Encode>& at(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& index){
+		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
+	}
+
+	constexpr data<Sch,Encode>& at(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& index) const{
+		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
+	}
+
+	constexpr data<Sch,Encode>* flat_data() {
+		return values_;
+	}
+
+	constexpr data<schema::UInt64,Encode> flat_size() const {
+		data<schema::UInt64> mult{1u};
+
+		for(uint64_t i{0u}; i < Dims; ++i){
+			mult = mult * meta_.at({i});
+		}
+
+		return mult;
+	}
+};
+
 template<typename Sch, uint64_t Ghost, uint64_t... Sides, typename Encode>
 class data<kel::lbm::sch::Chunk<Sch,Ghost,Sides...>,kel::lbm::encode::Sycl<Encode>> final {
 public:
@@ -223,6 +333,64 @@ public:
 	}
 };
 
+template<typename... Members, typename Encode>
+struct data<schema::Tuple<Members...>, kel::lbm::encode::Sycl<Encode>> final {
+public:
+	using StorageT = std::tuple<data<Members,kel::lbm::encode::Sycl<Encode>>...>;
+	using Schema = schema::Tuple<Members...>;
+private:
+	StorageT members_;
+
+	/**
+	 * A helper constructor to forward the sycl queue to the inner "default" constructors
+	 */
+	template<std::size_t... Is>
+	constexpr data(acpp::sycl::queue& q, std::index_sequence<Is...>):
+		members_{(static_cast<void>(Is), q)...}
+	{}
+public:
+	data(acpp::sycl::queue& q__):
+		data{q__, std::make_index_sequence<sizeof...(Members)>{}}
+	{
+		q__.wait();
+	}
+
+	template<size_t i>
+	auto& get(){
+		return std::get<i>(members_);
+	}
+
+	template<size_t i>
+	const auto& get() const {
+		return std::get<i>(members_);
+	}
+};
+
+template<typename... Members, typename Encode>
+struct data<schema::Ptr<schema::Tuple<Members...>>, kel::lbm::encode::Sycl<Encode>> final {
+public:
+	using StorageT = std::tuple<data<schema::Ptr<Members>,kel::lbm::encode::Sycl<Encode>>...>;
+	using Schema = schema::Tuple<Members...>;
+private:
+	StorageT members_;
+
+	/**
+	 * A helper constructor to forward the sycl queue to the inner "default" constructors
+	 */
+public:
+	data() = default;
+
+	template<size_t i>
+	auto& get(){
+		return std::get<i>(members_);
+	}
+
+	template<size_t i>
+	const auto& get() const {
+		return std::get<i>(members_);
+	}
+};
+
 template<typename... Members, typename Encode>
 class data<schema::Struct<Members...>, kel::lbm::encode::Sycl<Encode> > final {
 public:
@@ -235,6 +403,9 @@ private:
 	 */
 	StorageT members_;
 
+	/**
+	 * A helper constructor to forward the sycl queue to the inner "default" constructors
+	 */
 	template<std::size_t... Is>
 	constexpr data(acpp::sycl::queue& q, std::index_sequence<Is...>):
 		members_{(static_cast<void>(Is), q)...}
@@ -246,6 +417,16 @@ public:
 		q__.wait();
 	}
 
+	template<size_t i>
+	auto& get(){
+		return std::get<i>(members_);
+	}
+
+	template<size_t i>
+	const auto& get() const {
+		return std::get<i>(members_);
+	}
+
 	template<saw::string_literal K>
 	auto& get(){
 		return std::get<parameter_key_pack_index<K, Members::KeyLiteral...>::value>(members_);
@@ -347,6 +528,60 @@ struct sycl_copy_helper<sch::Struct<Members...>, Encode> final {
 	}
 };
 
+template<typename... Members, typename Encode>
+struct sycl_copy_helper<sch::Tuple<Members...>, Encode> final {
+	using Schema = sch::Tuple<Members...>;
+
+	template<uint64_t i>
+	static saw::error_or<void> copy_to_device_member(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+		if constexpr (i < sizeof...(Members)){
+			auto& host_member_data = host_data.template get<i>();
+			auto& sycl_member_data = sycl_data.template get<i>();
+
+			auto host_ptr = host_member_data.flat_data();
+			auto sycl_ptr = sycl_member_data.flat_data();
+
+			static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
+
+			q.submit([&](acpp::sycl::handler& h){
+				h.copy(host_ptr,sycl_ptr, host_member_data.flat_size().get());
+			}).wait();
+
+			return copy_to_device_member<i+1u>(host_data,sycl_data,q);
+		}
+
+		return saw::make_void();
+	}
+
+	static saw::error_or<void> copy_to_device(saw::data<Schema,Encode>& host_data, saw::data<Schema, encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+		return copy_to_device_member<0u>(host_data, sycl_data, q);
+	}
+
+	template<uint64_t i>
+	static saw::error_or<void> copy_to_host_member(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& host_data, sycl::queue& q){
+		if constexpr (i < sizeof...(Members)){
+			auto& host_member_data = host_data.template get<i>();
+			auto& sycl_member_data = sycl_data.template get<i>();
+
+			auto host_ptr = host_member_data.flat_data();
+			auto sycl_ptr = sycl_member_data.flat_data();
+
+			q.submit([&](acpp::sycl::handler& h){
+				h.copy(sycl_ptr,host_ptr, host_member_data.flat_size().get());
+			}).wait();
+
+			return copy_to_host_member<i+1u>(sycl_data,host_data,q);
+		}
+
+		return saw::make_void();
+	}
+
+
+	static saw::error_or<void> copy_to_host(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& host_data, sycl::queue& q){
+		return copy_to_host_member<0u>(sycl_data, host_data, q);
+	}
+};
+
 template<typename Sch, uint64_t... Dims, typename Encode>
 struct sycl_copy_helper<sch::FixedArray<Sch,Dims...>, Encode> final {
 	using Schema = sch::FixedArray<Sch,Dims...>;
@@ -376,12 +611,41 @@ struct sycl_copy_helper<sch::FixedArray<Sch,Dims...>, Encode> final {
 	}
 };
 
+template<typename Sch, uint64_t Dims, typename Encode>
+struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
+	using Schema = sch::Array<Sch,Dims>;
+
+	static saw::error_or<void> copy_to_host(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& 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<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
+
+		q.submit([&](acpp::sycl::handler& h){
+			h.copy(sycl_ptr,host_ptr, host_data.flat_size());
+		}).wait();
+		return saw::make_void();
+	}
+
+	static saw::error_or<void> copy_to_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& 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<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
+
+		q.submit([&](acpp::sycl::handler& h){
+			h.copy(host_ptr,sycl_ptr, host_data.flat_size());
+		}).wait();
+		return saw::make_void();
+	}
+};
+
 
 template<typename Schema, typename Encode>
-struct make_chunk_struct_view_helper;
+struct make_view_helper;
 
 template<typename... Sch, saw::string_literal... Keys, typename Encode>
-struct make_chunk_struct_view_helper<sch::Struct<sch::Member<Sch,Keys>...>, encode::Sycl<Encode>> {
+struct make_view_helper<sch::Struct<sch::Member<Sch,Keys>...>, encode::Sycl<Encode>> {
 private:
 	template<uint64_t i>
 	static void apply_i(
@@ -405,12 +669,36 @@ public:
 		return str_view;
 	}
 };
+
+template<typename... Sch, typename Encode>
+struct make_view_helper<sch::Tuple<Sch...>, encode::Sycl<Encode>> {
+private:
+	template<uint64_t i>
+	static void apply_i(
+		saw::data<sch::Tuple<Sch...>, encode::Sycl<Encode>>& dat,
+		saw::data<sch::Ptr<sch::Tuple<Sch...>>, encode::Sycl<Encode>>& dat_view)
+	{
+		if constexpr (i < sizeof...(Sch)){
+			dat_view.template get<i>() = {dat.template get<i>().flat_data()};
+
+			apply_i<i+1u>(dat,dat_view);
+		}
+	}
+public:
+	static auto apply(saw::data<sch::Tuple<Sch...>, encode::Sycl<Encode>>& dat){
+		saw::data<sch::Ptr<sch::Tuple<Sch...>>, encode::Sycl<Encode>> str_view;
+
+		apply_i<0u>(dat,str_view);
+
+		return str_view;
+	}
+};
 }
 
 // Ptr => Ptr<Chunk<T,Ghost,Dims...>>> => Ptr<FixedArray<T,Dims+Ghost...>
 template<typename Schema,typename Encode>
-auto make_chunk_struct_view(saw::data<Schema,Encode>& dat){
-	return impl::make_chunk_struct_view_helper<Schema,Encode>::apply(dat);
+auto make_view(saw::data<Schema,Encode>& dat){
+	return impl::make_view_helper<Schema,Encode>::apply(dat);
 }
 
 class device final {
-- 
cgit v1.2.3


From ebc2e26a1b3498363bb7522c241de2925bb7f627 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 14 Apr 2026 15:33:11 +0200
Subject: Fixed compilation issues with make_view for sycl

---
 lib/core/c++/particle/particle.hpp |  13 +--
 lib/sycl/c++/data.hpp              | 232 ++++++++++++++++++++++++++-----------
 2 files changed, 169 insertions(+), 76 deletions(-)

(limited to 'lib')

diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp
index e48cf08..7af43dc 100644
--- a/lib/core/c++/particle/particle.hpp
+++ b/lib/core/c++/particle/particle.hpp
@@ -40,9 +40,8 @@ using ParticleRigidBody = Struct<
 	Member<typename impl::rotation_type_helper<T,D>::Schema, "angular_acceleration">
 >;
 
-template<typename T>
+template<typename T, typename saw::native_data_type<T>::type radius = 1.0f>
 using ParticleCollisionSpheroid = Struct<
-	Member<Scalar<T>, "radius">
 >;
 
 template<typename T, uint64_t D>
@@ -52,7 +51,7 @@ using Particle = Struct<
 	// Member<Array<Float64,D>, "mask">, 
 >;
 
-template<typename T, uint64_t D, typename CollisionType = ParticleCollisionSpheroid<T>>
+template<typename T, uint64_t D, typename CollisionType = ParticleCollisionSpheroid<T,2.0f>>
 using ParticleGroup = Struct<
 	Member<Array<T,D>, "mask">,
 	Member<FixedArray<Scalar<T>,1u>, "density">,
@@ -60,19 +59,17 @@ using ParticleGroup = Struct<
 >;
 }
 
-template<typename T, uint64_t D, T radius>
+template<typename T, uint64_t D, typename saw::native_data_type<T>::type radius>
 saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> create_spheroid_particle_group(
-		saw::data<sch::Scalar<T>> rad_p,
 		saw::data<sch::Scalar<T>> density_p,
 		const saw::data<sch::UInt64>& mask_resolution
 ){
-	saw::data<sch::ParticleGroup<T,D,sch::ParticleCollisionSpheroid<T>>> part;
+	saw::data<sch::ParticleGroup<T,D,sch::ParticleCollisionSpheroid<T,2.0f>>> part;
 
 	auto& mask = part.template get<"mask">();
-	auto& collision = part.template get<"collision">();
 	auto& density = part.template get<"density">().at({{0u}});
 
-	static_assert(D == 0u or D > 3u, "Dimensions only supported for Dim 1,2 & 3.");
+	static_assert(D >= 1u and D <= 3u, "Dimensions only supported for Dim 1,2 & 3.");
 	density = density_p;
 
 	saw::data<sch::FixedArray<sch::UInt64,D>> mask_dims;
diff --git a/lib/sycl/c++/data.hpp b/lib/sycl/c++/data.hpp
index 661c313..4e5129b 100644
--- a/lib/sycl/c++/data.hpp
+++ b/lib/sycl/c++/data.hpp
@@ -62,7 +62,7 @@ public:
 		return values_[kel::lbm::flatten_index<schema::UInt64,sizeof...(Dims)>::apply(index,get_dims()).get()];
 	}
 
-	constexpr data<Sch,Encode>* flat_data() {
+	constexpr data<Sch,Encode>* flat_data() const {
 		return values_;
 	}
 
@@ -103,7 +103,7 @@ public:
 		return values_[kel::lbm::flatten_index<schema::UInt64,sizeof...(Dims)>::apply(index,get_dims()).get()];
 	}
 
-	constexpr data<Sch,Encode>* flat_data() {
+	constexpr data<Sch,Encode>* flat_data() const {
 		return values_;
 	}
 };
@@ -122,6 +122,14 @@ private:
 	SAW_FORBID_COPY(data);
 	SAW_FORBID_MOVE(data);
 public:
+	data(acpp::sycl::queue& q__):
+		values_{nullptr},
+		meta_{},
+		q_{&q__}
+	{
+		SAW_ASSERT(q_);
+	}
+
 	data(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& meta__,acpp::sycl::queue& q__):
 		values_{nullptr},
 		meta_{meta__},
@@ -154,7 +162,7 @@ public:
 		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
 	}
 
-	constexpr data<Sch,Encode>* flat_data() {
+	constexpr data<Sch,Encode>* flat_data() const {
 		return values_;
 	}
 
@@ -179,9 +187,14 @@ private:
 	data<Sch,Encode>* values_;
 	data<schema::FixedArray<schema::UInt64,Dims>,Encode> meta_;
 
-	SAW_FORBID_COPY(data);
-	SAW_FORBID_MOVE(data);
 public:
+	SAW_DEFAULT_COPY(data);
+	SAW_DEFAULT_MOVE(data);
+
+	data():
+		values_{nullptr}
+	{}
+
 	data(const data<schema::Array<Sch,Dims>, kel::lbm::encode::Sycl<Encode>>& values__):
 		values_{values__.flat_data()},
 		meta_{values__.meta()}
@@ -200,7 +213,7 @@ public:
 		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
 	}
 
-	constexpr data<Sch,Encode>* flat_data() {
+	constexpr data<Sch,Encode>* flat_data() const {
 		return values_;
 	}
 
@@ -261,7 +274,7 @@ public:
 		return data<schema::FixedArray<schema::UInt64, sizeof...(Sides)>,Encode>{{Sides...}};
 	}
 
-	auto flat_data(){
+	auto flat_data() const {
 		return values_.flat_data();
 	}
 
@@ -288,6 +301,10 @@ public:
 		values_{nullptr}
 	{}
 
+	data(const data<kel::lbm::sch::Chunk<Sch,Ghost,Sides...>, kel::lbm::encode::Sycl<Encode>>& values__):
+		values_{values__.flat_data()}
+	{}
+
 	data(data<Sch,Encode>* values__):
 		values_{values__}
 	{}
@@ -361,7 +378,7 @@ public:
 	}
 
 	template<size_t i>
-	const auto& get() const {
+	auto& get() const {
 		return std::get<i>(members_);
 	}
 };
@@ -423,7 +440,7 @@ public:
 	}
 
 	template<size_t i>
-	const auto& get() const {
+	auto& get() const {
 		return std::get<i>(members_);
 	}
 
@@ -433,7 +450,7 @@ public:
 	}
 	
 	template<saw::string_literal K>
-	const auto& get() const {
+	auto& get() const {
 		return std::get<parameter_key_pack_index<K, Members::KeyLiteral...>::value>(members_);
 	}
 };
@@ -449,17 +466,26 @@ private:
 	 * Do it here by specializing.
 	 */
 	StorageT members_;
-
 public:
 	data() = default;
 
+	template<size_t i>
+	auto& get(){
+		return std::get<i>(members_);
+	}
+
+	template<size_t i>
+	auto& get() const {
+		return std::get<i>(members_);
+	}
+
 	template<saw::string_literal K>
 	auto& get(){
 		return std::get<parameter_key_pack_index<K, Keys...>::value>(members_);
 	}
 	
 	template<saw::string_literal K>
-	const auto& get() const {
+	auto& get() const {
 		return std::get<parameter_key_pack_index<K, Keys...>::value>(members_);
 	}
 };
@@ -482,14 +508,10 @@ struct sycl_copy_helper<sch::Struct<Members...>, Encode> final {
 			auto& host_member_data = host_data.template get<M::KeyLiteral>();
 			auto& sycl_member_data = sycl_data.template get<M::KeyLiteral>();
 
-			auto host_ptr = host_member_data.flat_data();
-			auto sycl_ptr = sycl_member_data.flat_data();
-
-			static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
-
-			q.submit([&](acpp::sycl::handler& h){
-				h.copy(host_ptr,sycl_ptr, host_member_data.flat_size().get());
-			}).wait();
+			auto eov = sycl_copy_helper<typename M::ValueType,Encode>::copy_to_device(host_member_data,sycl_member_data,q);
+			if(eov.is_error()){
+				return eov;
+			}
 
 			return copy_to_device_member<i+1u>(host_data,sycl_data,q);
 		}
@@ -509,12 +531,10 @@ struct sycl_copy_helper<sch::Struct<Members...>, Encode> final {
 			auto& host_member_data = host_data.template get<M::KeyLiteral>();
 			auto& sycl_member_data = sycl_data.template get<M::KeyLiteral>();
 
-			auto host_ptr = host_member_data.flat_data();
-			auto sycl_ptr = sycl_member_data.flat_data();
-
-			q.submit([&](acpp::sycl::handler& h){
-				h.copy(sycl_ptr,host_ptr, host_member_data.flat_size().get());
-			}).wait();
+			auto eov = sycl_copy_helper<typename M::ValueType,Encode>::copy_to_host(sycl_member_data,host_member_data,q);
+			if(eov.is_error()){
+				return eov;
+			}
 
 			return copy_to_host_member<i+1u>(sycl_data,host_data,q);
 		}
@@ -535,17 +555,14 @@ struct sycl_copy_helper<sch::Tuple<Members...>, Encode> final {
 	template<uint64_t i>
 	static saw::error_or<void> copy_to_device_member(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
 		if constexpr (i < sizeof...(Members)){
+			using M = typename saw::parameter_pack_type<i,Members...>::type;
 			auto& host_member_data = host_data.template get<i>();
 			auto& sycl_member_data = sycl_data.template get<i>();
 
-			auto host_ptr = host_member_data.flat_data();
-			auto sycl_ptr = sycl_member_data.flat_data();
-
-			static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
-
-			q.submit([&](acpp::sycl::handler& h){
-				h.copy(host_ptr,sycl_ptr, host_member_data.flat_size().get());
-			}).wait();
+			auto eov = sycl_copy_helper<M,Encode>::copy_to_device(host_member_data,sycl_member_data,q);
+			if(eov.is_error()){
+				return eov;
+			}
 
 			return copy_to_device_member<i+1u>(host_data,sycl_data,q);
 		}
@@ -560,15 +577,15 @@ struct sycl_copy_helper<sch::Tuple<Members...>, Encode> final {
 	template<uint64_t i>
 	static saw::error_or<void> copy_to_host_member(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& host_data, sycl::queue& q){
 		if constexpr (i < sizeof...(Members)){
+			using M = typename saw::parameter_pack_type<i,Members...>::type;
+
 			auto& host_member_data = host_data.template get<i>();
 			auto& sycl_member_data = sycl_data.template get<i>();
 
-			auto host_ptr = host_member_data.flat_data();
-			auto sycl_ptr = sycl_member_data.flat_data();
-
-			q.submit([&](acpp::sycl::handler& h){
-				h.copy(sycl_ptr,host_ptr, host_member_data.flat_size().get());
-			}).wait();
+			auto eov = sycl_copy_helper<M,Encode>::copy_to_host(sycl_member_data,host_member_data,q);
+			if(eov.is_error()){
+				return eov;
+			}
 
 			return copy_to_host_member<i+1u>(sycl_data,host_data,q);
 		}
@@ -611,6 +628,35 @@ struct sycl_copy_helper<sch::FixedArray<Sch,Dims...>, Encode> final {
 	}
 };
 
+template<typename Sch, uint64_t Ghost, uint64_t... Dims, typename Encode>
+struct sycl_copy_helper<sch::Chunk<Sch,Ghost,Dims...>, Encode> final {
+	using Schema = sch::Chunk<Sch,Ghost,Dims...>;
+
+	static saw::error_or<void> copy_to_host(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& 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<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
+
+		q.submit([&](acpp::sycl::handler& h){
+			h.copy(sycl_ptr,host_ptr, saw::ct_multiply<uint64_t,Dims...>::value);
+		}).wait();
+		return saw::make_void();
+	}
+
+	static saw::error_or<void> copy_to_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& 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<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
+
+		q.submit([&](acpp::sycl::handler& h){
+			h.copy(host_ptr,sycl_ptr, saw::ct_multiply<uint64_t,Dims...>::value);
+		}).wait();
+		return saw::make_void();
+	}
+};
+
 template<typename Sch, uint64_t Dims, typename Encode>
 struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 	using Schema = sch::Array<Sch,Dims>;
@@ -622,7 +668,7 @@ struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 		static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
 
 		q.submit([&](acpp::sycl::handler& h){
-			h.copy(sycl_ptr,host_ptr, host_data.flat_size());
+			h.copy(sycl_ptr,host_ptr, host_data.flat_size().get());
 		}).wait();
 		return saw::make_void();
 	}
@@ -634,7 +680,7 @@ struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 		static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
 
 		q.submit([&](acpp::sycl::handler& h){
-			h.copy(host_ptr,sycl_ptr, host_data.flat_size());
+			h.copy(host_ptr,sycl_ptr, host_data.flat_size().get());
 		}).wait();
 		return saw::make_void();
 	}
@@ -644,53 +690,99 @@ struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 template<typename Schema, typename Encode>
 struct make_view_helper;
 
+template<typename Sch, uint64_t Dims, typename Encode>
+struct make_view_helper<sch::Array<Sch,Dims>, encode::Sycl<Encode>> {
+public:
+static saw::error_or<void> apply(
+	saw::data<sch::Array<Sch,Dims>, encode::Sycl<Encode>>& dat,
+	saw::data<sch::Ptr<sch::Array<Sch,Dims>>, encode::Sycl<Encode>>& dat_view
+){
+	dat_view = {dat};
+	return saw::make_void();
+}
+};
+
+template<typename Sch, uint64_t... Dims, typename Encode>
+struct make_view_helper<sch::FixedArray<Sch,Dims...>, encode::Sycl<Encode>> {
+public:
+	static saw::error_or<void> apply(
+		saw::data<sch::FixedArray<Sch,Dims...>, encode::Sycl<Encode>>& dat,
+		saw::data<sch::Ptr<sch::FixedArray<Sch,Dims...>>, encode::Sycl<Encode>>& dat_view
+	){
+		dat_view = {dat};
+		return saw::make_void();
+	}
+};
+
+template<typename Sch, uint64_t Ghost, uint64_t... Dims, typename Encode>
+struct make_view_helper<sch::Chunk<Sch,Ghost,Dims...>, encode::Sycl<Encode>> {
+public:
+	static saw::error_or<void> apply(
+		saw::data<sch::Chunk<Sch,Ghost,Dims...>, encode::Sycl<Encode>>& dat,
+		saw::data<sch::Ptr<sch::Chunk<Sch,Ghost,Dims...>>, encode::Sycl<Encode>>& dat_view
+	){
+		dat_view = {dat};
+		return saw::make_void();
+	}
+};
+
 template<typename... Sch, saw::string_literal... Keys, typename Encode>
 struct make_view_helper<sch::Struct<sch::Member<Sch,Keys>...>, encode::Sycl<Encode>> {
 private:
-	template<uint64_t i>
-	static void apply_i(
+template<uint64_t i>
+static saw::error_or<void> apply_i(
 		saw::data<sch::Struct<sch::Member<Sch,Keys>...>, encode::Sycl<Encode>>& dat,
-		saw::data<sch::Ptr<sch::Struct<sch::Member<Sch,Keys>...>>, encode::Sycl<Encode>>& dat_view)
-	{
+		saw::data<sch::Ptr<sch::Struct<sch::Member<Sch,Keys>...>>, encode::Sycl<Encode>>& dat_view
+	){
 		if constexpr (i < sizeof...(Sch)){
 			using M = typename saw::parameter_pack_type<i,sch::Member<Sch,Keys>...>::type;
-			
-			dat_view.template get<M::KeyLiteral>() = {dat.template get<M::KeyLiteral>().flat_data()};
 
-			apply_i<i+1u>(dat,dat_view);
-		}
-	}
-public:
-	static auto apply(saw::data<sch::Struct<sch::Member<Sch,Keys>...>, encode::Sycl<Encode>>& dat){
-		saw::data<sch::Ptr<sch::Struct<sch::Member<Sch,Keys>...>>, encode::Sycl<Encode>> str_view;
+			auto eov = make_view_helper<typename M::ValueType,encode::Sycl<Encode>>::apply(dat.template get<M::KeyLiteral>(),dat_view.template get<M::KeyLiteral>());
+			if(eov.is_error()){
+				return eov;
+			}
 
-		apply_i<0u>(dat,str_view);
+			return apply_i<i+1u>(dat,dat_view);
+		}
 
-		return str_view;
+		return saw::make_void();
 	}
+public:
+static saw::error_or<void> apply(
+	saw::data<sch::Struct<sch::Member<Sch,Keys>...>, encode::Sycl<Encode>>& dat,
+	saw::data<sch::Ptr<sch::Struct<sch::Member<Sch,Keys>...>>, encode::Sycl<Encode>>& dat_view
+){
+	return apply_i<0u>(dat,dat_view);
+}
 };
 
 template<typename... Sch, typename Encode>
 struct make_view_helper<sch::Tuple<Sch...>, encode::Sycl<Encode>> {
 private:
 	template<uint64_t i>
-	static void apply_i(
+	static saw::error_or<void> apply_i(
 		saw::data<sch::Tuple<Sch...>, encode::Sycl<Encode>>& dat,
-		saw::data<sch::Ptr<sch::Tuple<Sch...>>, encode::Sycl<Encode>>& dat_view)
-	{
+		saw::data<sch::Ptr<sch::Tuple<Sch...>>, encode::Sycl<Encode>>& dat_view
+	){
 		if constexpr (i < sizeof...(Sch)){
-			dat_view.template get<i>() = {dat.template get<i>().flat_data()};
+			using M = typename saw::parameter_pack_type<i,Sch...>::type;
+
+			auto eov = make_view_helper<M,encode::Sycl<Encode>>::apply(dat.template get<i>(), dat_view.template get<i>());
+			if(eov.is_error()){
+				return eov;
+			}
 
-			apply_i<i+1u>(dat,dat_view);
+			return apply_i<i+1u>(dat,dat_view);
 		}
+
+		return saw::make_void();
 	}
 public:
-	static auto apply(saw::data<sch::Tuple<Sch...>, encode::Sycl<Encode>>& dat){
-		saw::data<sch::Ptr<sch::Tuple<Sch...>>, encode::Sycl<Encode>> str_view;
-
-		apply_i<0u>(dat,str_view);
-
-		return str_view;
+	static saw::error_or<void> apply(
+		saw::data<sch::Tuple<Sch...>, encode::Sycl<Encode>>& dat,
+		saw::data<sch::Ptr<sch::Tuple<Sch...>>, encode::Sycl<Encode>> dat_view
+	){
+		return apply_i<0u>(dat,dat_view);
 	}
 };
 }
@@ -698,7 +790,11 @@ public:
 // Ptr => Ptr<Chunk<T,Ghost,Dims...>>> => Ptr<FixedArray<T,Dims+Ghost...>
 template<typename Schema,typename Encode>
 auto make_view(saw::data<Schema,Encode>& dat){
-	return impl::make_view_helper<Schema,Encode>::apply(dat);
+	saw::data<sch::Ptr<Schema>,Encode> dat_view;
+	auto eov = impl::make_view_helper<Schema,Encode>::apply(dat,dat_view);
+	(void) eov;
+
+	return dat_view;
 }
 
 class device final {
-- 
cgit v1.2.3


From c61ba8f8eb86f66915a54551fcc39dfbeab1fad9 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 14 Apr 2026 21:09:42 +0200
Subject: Working on meta schema instantiation, because I'm stupid

---
 lib/core/c++/abstract/data.hpp |  26 ++++++++--
 lib/sycl/c++/data.hpp          | 112 +++++++++++++++++++++++++++++++++++++++--
 lib/sycl/tests/data.cpp        |  27 ++++++++++
 3 files changed, 157 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/core/c++/abstract/data.hpp b/lib/core/c++/abstract/data.hpp
index e8f1757..0075718 100644
--- a/lib/core/c++/abstract/data.hpp
+++ b/lib/core/c++/abstract/data.hpp
@@ -4,28 +4,48 @@
 
 namespace kel {
 namespace sch {
+struct Void {};
+
 struct UnsignedInteger {};
 struct SignedInteger {};
 struct FloatingPoint {};
 
 template<typename StorageT, typename InterfaceT>
 struct MixedPrecision {
+	using Meta = Void;
 	using StorageType = StorageT;
 	using InterfaceType = InterfaceT;
 };
 
 template<typename PrimType, uint64_t N>
 struct Primitive {
-	using PrimitiveType = PrimType;
+	using Meta = Void;
+	using Type = PrimType;
 	static constexpr uint64_t Bytes = N;
 };
 
 template<typename T, uint64_t... Dims>
-struct Array {
-	using InnerType = T;
+struct FixedArray {
+	using Meta = Void;
+	using Inner = T;
 	static constexpr std::array<uint64_t,sizeof...(Dims)> Dimensions{Dims...};
 };
 
+template<typename T, uint64_t Dims>
+struct Array {
+	using Meta = FixedArray<UInt64,Dims>;
+	using Inner = T;
+	static constexpr std::array<uint64_t,sizeof...(Dims)> Dimensions{Dims};
+};
+
+template<typename... T>
+struct Tuple {
+};
 
 }
+
+template<typename Sch>
+struct schema {
+	using Type = Sch;
+};
 }
diff --git a/lib/sycl/c++/data.hpp b/lib/sycl/c++/data.hpp
index 4e5129b..3ac51e0 100644
--- a/lib/sycl/c++/data.hpp
+++ b/lib/sycl/c++/data.hpp
@@ -29,8 +29,17 @@ private:
 
 	SAW_FORBID_COPY(data);
 	SAW_FORBID_MOVE(data);
-
 public:
+	data(const data<typename meta_schema<Schema>::MetaSchema>& meta__, acpp::sycl::queue& q__):
+		q_{&q__},
+		values_{nullptr}
+	{
+		(void) meta__;
+		SAW_ASSERT(q_);
+		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(ct_multiply<uint64_t,Dims...>::value,*q_);
+		SAW_ASSERT(values_);
+	}
+
 	data(acpp::sycl::queue& q__):
 		q_{&q__},
 		values_{nullptr}
@@ -65,7 +74,6 @@ public:
 	constexpr data<Sch,Encode>* flat_data() const {
 		return values_;
 	}
-
 };
 
 template<typename Sch, uint64_t... Dims, typename Encode>
@@ -122,6 +130,20 @@ private:
 	SAW_FORBID_COPY(data);
 	SAW_FORBID_MOVE(data);
 public:
+	data(const data<typename meta_schema<Schema>::MetaSchema>& meta__, acpp::sycl::queue& q__):
+		q_{&q__},
+		values_{nullptr}
+	{
+		SAW_ASSERT(q_);
+		/// TODO use meta
+		data<schema::UInt64> m{1u};
+		for(uint64_t i = 0u; i < Dims; ++i){
+			m = m * meta__.at({i});
+		}
+		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(m.get(),*q_);
+		SAW_ASSERT(values_);
+	}
+
 	data(acpp::sycl::queue& q__):
 		values_{nullptr},
 		meta_{},
@@ -198,8 +220,7 @@ public:
 	data(const data<schema::Array<Sch,Dims>, kel::lbm::encode::Sycl<Encode>>& values__):
 		values_{values__.flat_data()},
 		meta_{values__.meta()}
-	{
-	}
+	{}
 
 	constexpr data<schema::FixedArray<schema::UInt64, Dims>, Encode> meta() const {
 		return meta_;
@@ -238,6 +259,10 @@ private:
 
 	data<InnerSchema, kel::lbm::encode::Sycl<Encode>> values_;
 public:
+	data(const data<typename meta_schema<Schema>::MetaSchema>& meta__, acpp::sycl::queue& q__):
+		values_{meta__,q__}
+	{}
+
 	data(acpp::sycl::queue& q__):
 		values_{q__}
 	{}
@@ -366,6 +391,11 @@ private:
 		members_{(static_cast<void>(Is), q)...}
 	{}
 public:
+	data(data<typename meta_schema<Schema>::MetaSchema>& meta__, acpp::sycl::queue& q__):
+		data{q__, std::make_index_sequence<sizeof...(Members)>{}}
+	{
+	}
+
 	data(acpp::sycl::queue& q__):
 		data{q__, std::make_index_sequence<sizeof...(Members)>{}}
 	{
@@ -546,6 +576,29 @@ struct sycl_copy_helper<sch::Struct<Members...>, Encode> final {
 	static saw::error_or<void> copy_to_host(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& host_data, sycl::queue& q){
 		return copy_to_host_member<0u>(sycl_data, host_data, q);
 	}
+
+	template<uint64_t i>
+	static saw::error_or<void> malloc_on_device_member(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+
+		if constexpr (i < sizeof...(Members)){
+			using M = typename saw::parameter_pack_type<i,Members...>::type;
+			auto& host_member_data = host_data.template get<i>();
+			auto& sycl_member_data = sycl_data.template get<i>();
+
+			auto eov = sycl_copy_helper<typename M::ValueType,Encode>::malloc_on_device(host_member_data,sycl_member_data,q);
+			if(eov.is_error()){
+				return eov;
+			}
+
+			return malloc_on_device_member<i+1u>(host_data,sycl_data,q);
+		}
+
+		return saw::make_void();
+	}
+
+	static saw::error_or<void> malloc_on_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+		return malloc_on_device_member<0u>(host_data,sycl_data,q);
+	}
 };
 
 template<typename... Members, typename Encode>
@@ -594,9 +647,36 @@ struct sycl_copy_helper<sch::Tuple<Members...>, Encode> final {
 	}
 
 
-	static saw::error_or<void> copy_to_host(saw::data<Schema,encode::Sycl<Encode>>& sycl_data, saw::data<Schema,Encode>& host_data, sycl::queue& q){
+	static saw::error_or<void> copy_to_host(
+		saw::data<Schema,Encode>& host_data,
+		saw::data<Schema,encode::Sycl<Encode>>& sycl_data,
+		sycl::queue& q
+	){
 		return copy_to_host_member<0u>(sycl_data, host_data, q);
 	}
+
+	template<uint64_t i>
+	static saw::error_or<void> malloc_on_device_member(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+
+		if constexpr (i < sizeof...(Members)){
+			using M = typename saw::parameter_pack_type<i,Members...>::type;
+			auto& host_member_data = host_data.template get<i>();
+			auto& sycl_member_data = sycl_data.template get<i>();
+
+			auto eov = sycl_copy_helper<M,Encode>::malloc_on_device(host_member_data,sycl_member_data,q);
+			if(eov.is_error()){
+				return eov;
+			}
+
+			return malloc_on_device_member<i+1u>(host_data,sycl_data,q);
+		}
+
+		return saw::make_void();
+	}
+
+	static saw::error_or<void> malloc_on_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+		return malloc_on_device_member<0u>(host_data,sycl_data,q);
+	}
 };
 
 template<typename Sch, uint64_t... Dims, typename Encode>
@@ -626,6 +706,13 @@ struct sycl_copy_helper<sch::FixedArray<Sch,Dims...>, Encode> final {
 		}).wait();
 		return saw::make_void();
 	}
+
+	static saw::error_or<void> malloc_on_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+		(void) host_data;
+		(void) sycl_data;
+		(void) q;
+		return saw::make_void();
+	}
 };
 
 template<typename Sch, uint64_t Ghost, uint64_t... Dims, typename Encode>
@@ -684,6 +771,11 @@ struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 		}).wait();
 		return saw::make_void();
 	}
+
+	static saw::error_or<void> malloc_on_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+		sycl_data = {host_data.meta(),q};
+		return saw::make_void();
+	}
 };
 
 
@@ -817,6 +909,16 @@ public:
 		return impl::sycl_copy_helper<Sch,Encode>::copy_to_host(sycl_data, host_data, q_);
 	}
 
+	template<typename Sch, typename Encode>
+	saw::error_or<void> malloc_on_device(
+			saw::data<Sch,Encode>& host_data,
+			saw::data<Sch,encode::Sycl<Encode>>& sycl_data
+			){
+		auto eov = impl::sycl_copy_helper<Sch,Encode>::malloc_on_device(host_data, sycl_data, q_);
+		q_.wait();
+		return eov;
+	}
+
 	auto& get_handle(){
 		return q_;
 	}
diff --git a/lib/sycl/tests/data.cpp b/lib/sycl/tests/data.cpp
index 3073a22..6b17622 100644
--- a/lib/sycl/tests/data.cpp
+++ b/lib/sycl/tests/data.cpp
@@ -2,6 +2,24 @@
 
 #include "../c++/lbm.hpp"
 
+namespace {
+
+namespace sch {
+using namespace kel::lbm::sch;
+using TestObjSchema = Tuple<
+	Member<FixedArray<UInt64,2u,2u>, "foo">,
+	Member<Array<Float32>, "bar">,
+	Member<
+		Array<
+			Struct<
+				Member<FixedArray<Float32,2u>,"pos">
+			>
+		>,
+		"baz"
+	>
+>;
+}
+
 SAW_TEST("Sycl Data Compilation"){
 	acpp::sycl::queue q;
 	saw::data<
@@ -19,3 +37,12 @@ SAW_TEST("Sycl Data Compilation"){
 	// test_f.at({}).set(1);
 	// SAW_EXPECT(test_f.at({}).get() == 1, "Value check failed");
 }
+
+SAW_TEST("Sycl Data Compilation for Particle Similacrum"){
+	acpp::sycl::queue q;
+
+	saw::data<
+		sch::TestObjSchema
+	> a;
+}
+}
-- 
cgit v1.2.3


From 30ff1caf073b4341fd0614e0974c67a8588c8931 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Wed, 15 Apr 2026 19:11:21 +0200
Subject: Feierabend

---
 lib/sycl/c++/data.hpp   | 56 ++++++++++++++++++++++++++++++-------------------
 lib/sycl/tests/data.cpp |  8 +++++++
 2 files changed, 43 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/sycl/c++/data.hpp b/lib/sycl/c++/data.hpp
index 3ac51e0..0206833 100644
--- a/lib/sycl/c++/data.hpp
+++ b/lib/sycl/c++/data.hpp
@@ -131,16 +131,12 @@ private:
 	SAW_FORBID_MOVE(data);
 public:
 	data(const data<typename meta_schema<Schema>::MetaSchema>& meta__, acpp::sycl::queue& q__):
-		q_{&q__},
-		values_{nullptr}
+		values_{nullptr},
+		meta_{meta__},
+		q_{&q__}
 	{
 		SAW_ASSERT(q_);
-		/// TODO use meta
-		data<schema::UInt64> m{1u};
-		for(uint64_t i = 0u; i < Dims; ++i){
-			m = m * meta__.at({i});
-		}
-		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(m.get(),*q_);
+		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(flat_size().get(),*q_);
 		SAW_ASSERT(values_);
 	}
 
@@ -152,16 +148,6 @@ public:
 		SAW_ASSERT(q_);
 	}
 
-	data(const data<schema::FixedArray<schema::UInt64,Dims>, Encode>& meta__,acpp::sycl::queue& q__):
-		values_{nullptr},
-		meta_{meta__},
-		q_{&q__}
-	{
-		SAW_ASSERT(q_);
-		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(flat_size().get(),*q_);
-		SAW_ASSERT(values_);
-	}
-
 	~data(){
 		if(not values_){
 			return;
@@ -184,6 +170,19 @@ public:
 		return values_[kel::lbm::flatten_index<schema::UInt64,Dims>::apply(index,meta()).get()];
 	}
 
+	constexpr error_or<void> reset_to(const data<typename meta_schema<Schema>::MetaSchema>& meta_arg){
+		SAW_ASSERT(q_);
+		meta_ = meta_arg;
+
+		if(values_){
+			acpp::sycl::free(values_,*q_);
+		}
+		values_ = acpp::sycl::malloc_device<data<Sch,Encode>>(flat_size().get(),*q_);
+		SAW_ASSERT(q_);
+
+		return make_void();
+	}
+
 	constexpr data<Sch,Encode>* flat_data() const {
 		return values_;
 	}
@@ -391,10 +390,11 @@ private:
 		members_{(static_cast<void>(Is), q)...}
 	{}
 public:
+	/*
 	data(data<typename meta_schema<Schema>::MetaSchema>& meta__, acpp::sycl::queue& q__):
 		data{q__, std::make_index_sequence<sizeof...(Members)>{}}
-	{
-	}
+	{}
+	*/
 
 	data(acpp::sycl::queue& q__):
 		data{q__, std::make_index_sequence<sizeof...(Members)>{}}
@@ -754,6 +754,7 @@ struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 
 		static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
 
+		SAW_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();
@@ -761,14 +762,27 @@ struct sycl_copy_helper<sch::Array<Sch,Dims>, Encode> final {
 	}
 
 	static saw::error_or<void> copy_to_device(saw::data<Schema,Encode>& host_data, saw::data<Schema,encode::Sycl<Encode>>& sycl_data, sycl::queue& q){
+
+		{
+			auto hm = host_data.meta();
+			auto sm = sycl_data.meta();
+			bool equ{true};
+			for(uint64_t i{0u}; i < Dims; ++i){
+				equ &= (hm.at({i}).get() == sm.at({i}).get());
+			}
+			if(not equ){
+				sycl_data.reset_to(hm);
+			}
+		}
+
 		auto host_ptr = host_data.flat_data();
 		auto sycl_ptr = sycl_data.flat_data();
-
 		static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
 
 		q.submit([&](acpp::sycl::handler& h){
 			h.copy(host_ptr,sycl_ptr, host_data.flat_size().get());
 		}).wait();
+
 		return saw::make_void();
 	}
 
diff --git a/lib/sycl/tests/data.cpp b/lib/sycl/tests/data.cpp
index 6b17622..4321a0d 100644
--- a/lib/sycl/tests/data.cpp
+++ b/lib/sycl/tests/data.cpp
@@ -38,6 +38,13 @@ SAW_TEST("Sycl Data Compilation"){
 	// SAW_EXPECT(test_f.at({}).get() == 1, "Value check failed");
 }
 
+SAW_TEST("Sycl Data Array of Struct"){
+	acpp::sycl::queue q;
+
+	saw::data<sch::Array<sch::Float64>, kel::lbm::encode::Sycl<saw::encode::Native>> a{{{2u}},q};
+}
+
+/*
 SAW_TEST("Sycl Data Compilation for Particle Similacrum"){
 	acpp::sycl::queue q;
 
@@ -45,4 +52,5 @@ SAW_TEST("Sycl Data Compilation for Particle Similacrum"){
 		sch::TestObjSchema
 	> a;
 }
+*/
 }
-- 
cgit v1.2.3


From d01f8faadcec62593e0af5304bcc2db3d22ed0c5 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Thu, 16 Apr 2026 16:20:23 +0200
Subject: Brain fried

---
 lib/core/c++/particle.hpp |  5 +++++
 lib/sycl/c++/data.hpp     | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

(limited to 'lib')

diff --git a/lib/core/c++/particle.hpp b/lib/core/c++/particle.hpp
index b098ecc..691a74b 100644
--- a/lib/core/c++/particle.hpp
+++ b/lib/core/c++/particle.hpp
@@ -11,7 +11,12 @@ struct Particle {};
 
 template<typename T, typename Descriptor, typename Encode>
 class component<T, Descriptor, cmpt::Particle, Encode> {
+private:
+	saw::data<sch::Scalar<T>> dt_;
 public:
+	component(saw::data<sch::Scalar<T>> dt__):
+		dt_{dt__}
+	{}
 
 	template<typename ParticleSchema, typename MacroFieldSchema>
 	void apply(const saw::data<ParticleSchema, Encode>& particles, const saw::data<MacroFieldSchema,Encode>& macros, saw::data<sch::UInt64> index, saw::data<sch::UInt64> time_step) const {
diff --git a/lib/sycl/c++/data.hpp b/lib/sycl/c++/data.hpp
index 0206833..71627de 100644
--- a/lib/sycl/c++/data.hpp
+++ b/lib/sycl/c++/data.hpp
@@ -278,6 +278,10 @@ public:
 		return data<InnerSchema,kel::lbm::encode::Sycl<Encode>>::get_dims();
 	}
 
+	static constexpr auto ghost_meta() {
+		return data<InnerSchema,kel::lbm::encode::Sycl<Encode>>::meta();
+	}
+
 	data<ValueSchema, Encode>& at(const data<schema::FixedArray<schema::UInt64,sizeof...(Sides)>>& index){
 		std::decay_t<decltype(index)> ind;
 		for(uint64_t i = 0u; i < sizeof...(Sides); ++i){
@@ -298,6 +302,10 @@ public:
 		return data<schema::FixedArray<schema::UInt64, sizeof...(Sides)>,Encode>{{Sides...}};
 	}
 
+	static constexpr auto meta(){
+		return data<schema::FixedArray<schema::UInt64, sizeof...(Sides)>,Encode>{{Sides...}};
+	}
+
 	auto flat_data() const {
 		return values_.flat_data();
 	}
@@ -345,6 +353,10 @@ public:
 		return data<InnerSchema,kel::lbm::encode::Sycl<Encode>>::get_dims();
 	}
 
+	static constexpr auto ghost_meta() {
+		return data<InnerSchema,kel::lbm::encode::Sycl<Encode>>::meta();
+	}
+
 	data<ValueSchema, Encode>& at(const data<schema::FixedArray<schema::UInt64,sizeof...(Sides)>>& index){
 		std::decay_t<decltype(index)> ind;
 		for(uint64_t i = 0u; i < sizeof...(Sides); ++i){
@@ -361,6 +373,10 @@ public:
 		return values_.at(ind);
 	}
 
+	static constexpr auto meta(){
+		return data<schema::FixedArray<schema::UInt64, sizeof...(Sides)>,Encode>{{Sides...}};
+	}
+
 	static constexpr auto get_dims(){
 		return data<schema::FixedArray<schema::UInt64, sizeof...(Sides)>,Encode>{{Sides...}};
 	}
-- 
cgit v1.2.3


From 45ebf7411d687ab5530431ab1bcc74edb0499c69 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Wed, 22 Apr 2026 16:48:50 +0200
Subject: Working on equalizing poiseulle_particle channel methods

---
 lib/core/c++/write_vtk.hpp |  4 ++--
 lib/sycl/c++/data.hpp      | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/core/c++/write_vtk.hpp b/lib/core/c++/write_vtk.hpp
index f925361..e852172 100644
--- a/lib/core/c++/write_vtk.hpp
+++ b/lib/core/c++/write_vtk.hpp
@@ -136,7 +136,7 @@ struct lbm_vtk_writer<sch::Vector<T,D>> {
 template<typename T>
 struct lbm_vtk_writer<sch::Scalar<T>> {
 	static saw::error_or<void> apply_header(std::ostream& vtk_file, std::string_view name){
-		vtk_file<<"SCALARS "<<name<<" float\n";
+		vtk_file<<"SCALARS "<<name<<" float 1\n";
 		vtk_file<<"LOOKUP_TABLE default\n";
 		return saw::make_void();
 	}
@@ -206,7 +206,7 @@ struct lbm_vtk_writer<sch::Struct<sch::Member<sch::Chunk<MemberT,Ghost,Dims...>,
 		if constexpr (sizeof...(MemberT) > 0u){
 			// POINT DATA
 			{
-				vtk_file << "POINT_DATA " << pd_size.get() <<"\n";
+				vtk_file << "\nPOINT_DATA " << pd_size.get() <<"\n";
 			}
 
 			// HEADER TO BODY
diff --git a/lib/sycl/c++/data.hpp b/lib/sycl/c++/data.hpp
index 71627de..9f43848 100644
--- a/lib/sycl/c++/data.hpp
+++ b/lib/sycl/c++/data.hpp
@@ -381,7 +381,7 @@ public:
 		return data<schema::FixedArray<schema::UInt64, sizeof...(Sides)>,Encode>{{Sides...}};
 	}
 
-	auto flat_data(){
+	auto flat_data() const {
 		return values_.flat_data();
 	}
 
@@ -741,8 +741,10 @@ struct sycl_copy_helper<sch::Chunk<Sch,Ghost,Dims...>, Encode> final {
 
 		static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
 
+		auto flat_size = host_data.flat_size();
+
 		q.submit([&](acpp::sycl::handler& h){
-			h.copy(sycl_ptr,host_ptr, saw::ct_multiply<uint64_t,Dims...>::value);
+			h.copy(sycl_ptr,host_ptr, flat_size.get());
 		}).wait();
 		return saw::make_void();
 	}
@@ -753,8 +755,10 @@ struct sycl_copy_helper<sch::Chunk<Sch,Ghost,Dims...>, Encode> final {
 
 		static_assert(sizeof(std::decay_t<decltype(sycl_ptr)>) == sizeof(std::decay_t<decltype(host_ptr)>), "Unequal size");
 
+		auto flat_size = host_data.flat_size();
+
 		q.submit([&](acpp::sycl::handler& h){
-			h.copy(host_ptr,sycl_ptr, saw::ct_multiply<uint64_t,Dims...>::value);
+			h.copy(host_ptr,sycl_ptr, flat_size.get());
 		}).wait();
 		return saw::make_void();
 	}
-- 
cgit v1.2.3