From 6831edddd22d2d8dbb73c88fb612c0bdd5b8ba19 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 11 Jun 2024 16:05:47 +0200
Subject: Intermediate  commit while working on design issues

---
 modules/remote-sycl/examples/SConscript            |  2 +-
 modules/remote-sycl/examples/sycl_basic.cpp        |  2 +-
 modules/remote-sycl/examples/sycl_basic.hpp        |  4 ++--
 modules/remote-sycl/examples/sycl_basic_kernel.cpp | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/remote-sycl/examples')

diff --git a/modules/remote-sycl/examples/SConscript b/modules/remote-sycl/examples/SConscript
index 3c510eb..02e528b 100644
--- a/modules/remote-sycl/examples/SConscript
+++ b/modules/remote-sycl/examples/SConscript
@@ -14,7 +14,7 @@ examples_env = env.Clone();
 
 
 examples_sycl_env = examples_env.Clone();
-examples_sycl_env['CXX'] = 'syclcc';
+examples_sycl_env['CXX'] = 'acpp';
 
 examples_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
 examples_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
diff --git a/modules/remote-sycl/examples/sycl_basic.cpp b/modules/remote-sycl/examples/sycl_basic.cpp
index 64ec1fe..3f92cdb 100644
--- a/modules/remote-sycl/examples/sycl_basic.cpp
+++ b/modules/remote-sycl/examples/sycl_basic.cpp
@@ -23,7 +23,7 @@ int main(){
 
 	saw::id<schema::UInt64> next_id{0u};
 	{
-		auto eov = rpc_server.template call<"increment">(saw::data<schema::UInt64>{1u});
+		auto eov = rpc_server.template call<"increment">(saw::data<schema::UInt64, saw::encode::Native<saw::rmt::Sycl>>{1u});
 		if(eov.is_error()){
 			auto& err = eov.get_error();
 			std::cerr<<"Error: "<<err.get_category()<<" : "<<err.get_message()<<std::endl;
diff --git a/modules/remote-sycl/examples/sycl_basic.hpp b/modules/remote-sycl/examples/sycl_basic.hpp
index 0d4b5d2..c7cfadc 100644
--- a/modules/remote-sycl/examples/sycl_basic.hpp
+++ b/modules/remote-sycl/examples/sycl_basic.hpp
@@ -6,8 +6,8 @@ namespace schema {
 using namespace saw::schema;
 
 using BasicInterface = Interface<
-	Member<Function<UInt64, UInt64>, "increment">
+	Member<Function<Array<UInt64>, UInt64>, "increment">
 >;
 }
 
-saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::storage::Default>, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr);
+saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr);
diff --git a/modules/remote-sycl/examples/sycl_basic_kernel.cpp b/modules/remote-sycl/examples/sycl_basic_kernel.cpp
index 18fe9b7..86e73b5 100644
--- a/modules/remote-sycl/examples/sycl_basic_kernel.cpp
+++ b/modules/remote-sycl/examples/sycl_basic_kernel.cpp
@@ -1,9 +1,9 @@
 #include "sycl_basic.hpp"
 
-saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::storage::Default>, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr){
-	saw::interface<schema::BasicInterface, saw::encode::Native<saw::storage::Default>, cl::sycl::queue*> iface{
-		[](saw::data<saw::schema::UInt64> in, cl::sycl::queue* q) -> saw::data<saw::schema::UInt64> {
-			uint64_t inr = in.get();
+saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr){
+	saw::interface<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>, cl::sycl::queue*> iface{
+		[](saw::data<saw::schema::Array<saw::schema::UInt64>, saw::encode::Native<saw::rmt::Sycl>> in, cl::sycl::queue* q) -> saw::data<saw::schema::UInt64, saw::encode::Native<saw::rmt::Sycl>> {
+			uint64_t inr = in.size();
 			cl::sycl::buffer<uint64_t,1>  d_inc{ &inr, 1u };
 			q->submit([&](cl::sycl::handler& h){
 				auto a_inc = d_inc.get_access<cl::sycl::access::mode::read_write>(h);
@@ -16,7 +16,7 @@ saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::storage::Defaul
 			return {inr};
 		}
 	};
-	auto rpc_server = ctx.template listen<schema::BasicInterface, saw::encode::Native<saw::storage::Default>>(addr, std::move(iface));
+	auto rpc_server = ctx.template listen<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>>(addr, std::move(iface));
 	
 	return rpc_server;
 }
-- 
cgit v1.2.3