Fixing example for sycl rpc

6 files changed, 8 insertions, 9 deletions

diff --git a/default.nix b/default.nix
index 9e30663..30a894c 100644
--- a/default.nix
+++ b/default.nix
@@ -121,7 +121,7 @@ in rec {
 			inherit clang-tools;
 			openmp = pkgs.llvmPackages_15.openmp;
 			
-			build_examples = "false";
+			build_examples = "true";
 			build_benchmarks = "true";
 		};
 		
diff --git a/modules/remote-sycl/.nix/derivation.nix b/modules/remote-sycl/.nix/derivation.nix
index c63dd19..28e3cc8 100644
--- a/modules/remote-sycl/.nix/derivation.nix
+++ b/modules/remote-sycl/.nix/derivation.nix
@@ -11,8 +11,8 @@
 , python3
 , bash
 
-, build_examples ? "false"
-, build_benchmarks ? "false"
+, build_examples ? "true"
+, build_benchmarks ? "true"
 }:
 
 let
diff --git a/modules/remote-sycl/SConstruct b/modules/remote-sycl/SConstruct
index 07ca30b..33dc1cc 100644
--- a/modules/remote-sycl/SConstruct
+++ b/modules/remote-sycl/SConstruct
@@ -60,7 +60,8 @@ env_vars.Add(
 env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
     CPPDEFINES=['SAW_UNIX'],
     CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
-    LIBS=['forstio-core'
+    LIBS=[
+         'forstio-core'
         ,'forstio-codec'
         ,'forstio-async'
         ,'forstio-remote'
diff --git a/modules/remote-sycl/examples/sycl_basic.cpp b/modules/remote-sycl/examples/sycl_basic.cpp
index a4bc595..499ef2b 100644
--- a/modules/remote-sycl/examples/sycl_basic.cpp
+++ b/modules/remote-sycl/examples/sycl_basic.cpp
@@ -18,9 +18,7 @@ int main(){
 		return -1;
 	}
 
-	auto device = remote_ctx.connect_device(*rmt_addr);
-
-	auto rpc_server = listen_basic_sycl(remote_ctx, device, *rmt_addr);
+	auto rpc_server = listen_basic_sycl(remote_ctx, *rmt_addr);
 	saw::rpc_client<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> client{rpc_server};
 
 	saw::id<schema::Array<schema::UInt64>> id_zero{0u};
diff --git a/modules/remote-sycl/examples/sycl_basic.hpp b/modules/remote-sycl/examples/sycl_basic.hpp
index b250d8c..6932184 100644
--- a/modules/remote-sycl/examples/sycl_basic.hpp
+++ b/modules/remote-sycl/examples/sycl_basic.hpp
@@ -10,4 +10,4 @@ using BasicInterface = Interface<
 >;
 }
 
-saw::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::device<saw::rmt::Sycl>& dev, saw::remote_address<saw::rmt::Sycl>& addr);
+saw::rpc_server<schema::BasicInterface, saw::encode::Native, 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 763e733..42d59ca 100644
--- a/modules/remote-sycl/examples/sycl_basic_kernel.cpp
+++ b/modules/remote-sycl/examples/sycl_basic_kernel.cpp
@@ -1,6 +1,6 @@
 #include "sycl_basic.hpp"
 
-saw::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::device<saw::rmt::Sycl>& dev, saw::remote_address<saw::rmt::Sycl>& addr){
+saw::rpc_server<schema::BasicInterface, saw::encode::Native, 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{
 		/**
 		 * This is the increment kernel