Fixed Sycl compilation issues to to recursive use

4 files changed, 14 insertions, 14 deletions

diff --git a/modules/remote-sycl/benchmarks/kernel_mixed_precision.cpp b/modules/remote-sycl/benchmarks/kernel_mixed_precision.cpp
index 83705f6..2c87714 100644
--- a/modules/remote-sycl/benchmarks/kernel_mixed_precision.cpp
+++ b/modules/remote-sycl/benchmarks/kernel_mixed_precision.cpp
@@ -6,12 +6,12 @@ saw::interface<sch::MixedPrecisionBenchmarkInterface, saw::encode::Sycl<saw::enc
 		 * Mixed
 		 */
 		[&](saw::data<sch::MixedArray, saw::encode::Sycl<saw::encode::Native>>& in, cl::sycl::queue* cmd) -> saw::error_or<void> {
-			uint64_t in_size = in.size();
+			auto in_size = in.size();
 
 			mixed_ev = cmd->submit([&](cl::sycl::handler& h){
 				auto acc_buff = in.template access<cl::sycl::access::mode::read_write>(h);
 
-				h.parallel_for(cl::sycl::range<1>(in_size), [=] (cl::sycl::id<1> it){
+				h.parallel_for(cl::sycl::range<1>(in_size.get()), [=] (cl::sycl::id<1> it){
 					
 					saw::data<sch::Float64> foo = {acc_buff[0u].at(it[0u]).get()};
 					for(uint64_t i = 0; i < arithmetic_intensity; ++i){
@@ -26,11 +26,11 @@ saw::interface<sch::MixedPrecisionBenchmarkInterface, saw::encode::Sycl<saw::enc
 			return saw::void_t{};
 		},
 		[&](saw::data<sch::Float64Array, saw::encode::Sycl<saw::encode::Native>>& in, cl::sycl::queue* cmd) -> saw::error_or<void> {
-			uint64_t in_size = in.size();
+			auto in_size = in.size();
 			float64_ev = cmd->submit([&](cl::sycl::handler& h){
 				auto acc_buff = in.template access<cl::sycl::access::mode::read_write>(h);
 
-				h.parallel_for(cl::sycl::range<1>(in_size), [=] (cl::sycl::id<1> it){
+				h.parallel_for(cl::sycl::range<1>(in_size.get()), [=] (cl::sycl::id<1> it){
 					saw::data<sch::Float64> foo = {acc_buff[0u].at(it[0u]).get()};
 					for(uint64_t i = 0; i < arithmetic_intensity; ++i){
 						if( foo == saw::data<sch::Float64>{1.1e12} ){
@@ -44,11 +44,11 @@ saw::interface<sch::MixedPrecisionBenchmarkInterface, saw::encode::Sycl<saw::enc
 			return saw::void_t{};
 		},
 		[&](saw::data<sch::Float32Array, saw::encode::Sycl<saw::encode::Native>>& in, cl::sycl::queue* cmd) -> saw::error_or<void> {
-			uint64_t in_size = in.size();
+			auto in_size = in.size();
 			float32_ev = cmd->submit([&](cl::sycl::handler& h){
 				auto acc_buff = in.template access<cl::sycl::access::mode::read_write>(h);
 
-				h.parallel_for(cl::sycl::range<1>(in_size), [=] (cl::sycl::id<1> it){
+				h.parallel_for(cl::sycl::range<1>(in_size.get()), [=] (cl::sycl::id<1> it){
 					saw::data<sch::Float32> foo = {acc_buff[0u].at(it[0u]).get()};
 					for(uint64_t i = 0; i < arithmetic_intensity; ++i){
 						if( foo == saw::data<sch::Float32>{1.1e12f} ){
diff --git a/modules/remote-sycl/c++/data.hpp b/modules/remote-sycl/c++/data.hpp
index f50d10a..7763952 100644
--- a/modules/remote-sycl/c++/data.hpp
+++ b/modules/remote-sycl/c++/data.hpp
@@ -12,7 +12,7 @@ template<typename Schema>
 class data<Schema, encode::Sycl<encode::Native>> {
 private:
 	cl::sycl::buffer<data<Schema, encode::Native>> data_;
-	data<schema::UInt64, encode::Sycl<encode::Native>> size_;
+	data<schema::UInt64, encode::Native> size_;
 public:
 	data(const data<Schema, encode::Native>& data__):
 		data_{&data__, 1u},
@@ -27,7 +27,7 @@ public:
 		return data_;
 	}
 
-	data<schema::UInt64, encode::Sycl<encode::Native>> size() const {
+	data<schema::UInt64, encode::Native> size() const {
 		return size_;
 	}
 
diff --git a/modules/remote-sycl/tests/data.cpp b/modules/remote-sycl/tests/data.cpp
index 027f277..798b7a5 100644
--- a/modules/remote-sycl/tests/data.cpp
+++ b/modules/remote-sycl/tests/data.cpp
@@ -24,8 +24,8 @@ SAW_TEST("SYCL Data Management"){
 	bra = 123;
 	auto& baz = host_data.template get<"baz">();
 	baz = {1024};
-	for(uint64_t i = 0; i < baz.size(); ++i){
-		baz.at(i) = static_cast<double>(i*3);
+	for(data<schema::UInt64> i = 0; i < baz.size(); ++i){
+		baz.at(i) = static_cast<double>(i.get()*3);
 	}
 
 	saw::event_loop loop;
@@ -86,9 +86,9 @@ SAW_TEST("SYCL Data Management"){
 		if(baz.size() != baz_b.size()){
 			expected_values = false;
 			err_msg = "baz not equal. ";
-			err_msg += std::to_string(baz.size());
+			err_msg += std::to_string(baz.size().get());
 			err_msg += " - ";
-			err_msg += std::to_string(baz_b.size());
+			err_msg += std::to_string(baz_b.size().get());
 			return;
 		}
 	}, [&](auto err){
diff --git a/modules/remote-sycl/tests/sycl_basics.cpp b/modules/remote-sycl/tests/sycl_basics.cpp
index 7d0bdb2..4ad3cf7 100644
--- a/modules/remote-sycl/tests/sycl_basics.cpp
+++ b/modules/remote-sycl/tests/sycl_basics.cpp
@@ -48,9 +48,9 @@ SAW_TEST("SYCL Test Setup"){
 
 				auto acc_buff = in.template access<cl::sycl::access::mode::write>(h);
 
-				uint64_t si = host_data.template get<"doubles">().size();
+				auto si = host_data.template get<"doubles">().size();
 
-				h.parallel_for(cl::sycl::range<1>(si), [=] (cl::sycl::id<1> it){
+				h.parallel_for(cl::sycl::range<1>(si.get()), [=] (cl::sycl::id<1> it){
 					acc_buff[0u].template get<"foo">() = acc_buff[0u].template get<"doubles">().size();
 					auto& dbls = acc_buff[0u].template get<"doubles">();
 					dbls.at(it[0u]) = it[0u] * 2.0;