It works? What? Managed to move sycl implementation to more sane data

handling variant

2 files changed, 14 insertions, 8 deletions

diff --git a/modules/remote-sycl/tests/mixed_precision.cpp b/modules/remote-sycl/tests/mixed_precision.cpp
index 7f5a78d..42563fd 100644
--- a/modules/remote-sycl/tests/mixed_precision.cpp
+++ b/modules/remote-sycl/tests/mixed_precision.cpp
@@ -1,6 +1,7 @@
 #include <forstio/test/suite.hpp>
 
 #include "../c++/data.hpp"
+#include "../c++/device.hpp"
 #include "../c++/remote.hpp"
 
 #include <random>
@@ -126,7 +127,7 @@ SAW_TEST("SYCL Float Test"){
 
 	cl::sycl::event ev;
 
-	interface<schema::FloatFoo, encode::Native,rmt::Sycl, cl::sycl::queue*> cl_iface {
+	interface<schema::FloatFoo, encode::Sycl<encode::Native>, cl::sycl::queue*> cl_iface {
 [&](data<schema::TestFloatArray, encode::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
 	
 			ev = cmd->submit([&](cl::sycl::handler& h){
@@ -140,7 +141,8 @@ SAW_TEST("SYCL Float Test"){
 			return saw::void_t{};
 		}
 	};
-	auto& device = rmt_addr->get_device();
+	auto our_device = share<device<rmt::Sycl>>();
+	auto& device = *our_device;
 	
 	cl_iface.template call <"foo">(device_data, &(device.get_handle()));
 	device.get_handle().wait();
@@ -184,7 +186,7 @@ SAW_TEST("SYCL Double Test"){
 	
 	cl::sycl::event ev;
 
-	interface<schema::DoubleFoo, encode::Native,rmt::Sycl, cl::sycl::queue*> cl_iface {
+	interface<schema::DoubleFoo, encode::Sycl<encode::Native>, cl::sycl::queue*> cl_iface {
 [&](data<schema::TestDoubleArray, encode::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
 	
 			ev = cmd->submit([&](cl::sycl::handler& h){
@@ -198,7 +200,8 @@ SAW_TEST("SYCL Double Test"){
 			return saw::void_t{};
 		}
 	};
-	auto& device = rmt_addr->get_device();
+	auto our_device = share<device<rmt::Sycl>>();
+	auto& device = *our_device;
 	
 	cl_iface.template call <"foo">(device_data, &(device.get_handle()));
 	device.get_handle().wait();
diff --git a/modules/remote-sycl/tests/sycl_basics.cpp b/modules/remote-sycl/tests/sycl_basics.cpp
index f6e62b4..7d0bdb2 100644
--- a/modules/remote-sycl/tests/sycl_basics.cpp
+++ b/modules/remote-sycl/tests/sycl_basics.cpp
@@ -1,5 +1,7 @@
 #include <forstio/test/suite.hpp>
 
+#include "../c++/device.hpp"
+#include "../c++/data.hpp"
 #include "../c++/remote.hpp"
 
 namespace {
@@ -37,10 +39,10 @@ SAW_TEST("SYCL Test Setup"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote Address class hasn't been filled");
 
-	data<schema::TestStruct, rmt::Sycl<encode::Native>> device_data{host_data};
+	data<schema::TestStruct, encode::Sycl<encode::Native>> device_data{host_data};
 
-	interface<schema::Foo, rmt::Sycl<encode::Native>,rmt::Sycl, cl::sycl::queue*> cl_iface {
-[&](data<schema::TestStruct, rmt::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
+	interface<schema::Foo, encode::Sycl<encode::Native>,cl::sycl::queue*> cl_iface {
+[&](data<schema::TestStruct, encode::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
 	
 			cmd->submit([&](cl::sycl::handler& h){
 
@@ -69,7 +71,8 @@ SAW_TEST("SYCL Test Setup"){
 			return saw::void_t{};
 		}
 	};
-	auto& device = rmt_addr->get_device();
+	auto our_device = share<device<rmt::Sycl>>();
+	auto& device = *our_device;
 	
 	cl_iface.template call <"foo">(device_data, &(device.get_handle()));
 	device.get_handle().wait();