diff options
| author | Claudius "keldu" Holeksa <mail@keldu.de> | 2024-05-13 10:08:56 +0200 |
|---|---|---|
| committer | Claudius "keldu" Holeksa <mail@keldu.de> | 2024-05-13 10:08:56 +0200 |
| commit | 82006ae71c1ff89dc32f2bb4b76c61857b2f6874 (patch) | |
| tree | 39eae0af33676f02a78ba83698ae64c91f8a749d | |
| parent | 6b9e221a0c439ce3ee9b728bc9ead8f5c2c82ceb (diff) | |
Continud renaming of opencl to sycl
| -rw-r--r-- | default.nix | 4 | ||||
| -rw-r--r-- | modules/remote-sycl/SConstruct | 13 | ||||
| -rw-r--r-- | modules/remote-sycl/c++/remote.hpp | 12 |
3 files changed, 14 insertions, 15 deletions
diff --git a/default.nix b/default.nix index 7abf030..1caab74 100644 --- a/default.nix +++ b/default.nix @@ -72,7 +72,7 @@ in rec { build_examples = "true"; }; - remote-opencl = pkgs.callPackage modules/remote-opencl/.nix/derivation.nix { + remote-sycl = pkgs.callPackage modules/remote-sycl/.nix/derivation.nix { inherit version; inherit forstio; inherit stdenv; @@ -110,7 +110,7 @@ in rec { unstable = pkgs.symlinkJoin { name = "forstio-unstable-${version}"; paths = [ - forstio.remote-opencl + forstio.remote-sycl forstio.io_codec # forstio.codec-minecraft ]; diff --git a/modules/remote-sycl/SConstruct b/modules/remote-sycl/SConstruct index a27e6d7..e084925 100644 --- a/modules/remote-sycl/SConstruct +++ b/modules/remote-sycl/SConstruct @@ -46,13 +46,12 @@ env_vars.Add('prefix', env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[], CPPDEFINES=['SAW_UNIX'], CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'], - LIBS=[ - 'forstio-core', - 'forstio-codec', - 'forstio-async', - 'forstio-io', - 'forstio-io_codec', - 'OpenCL' + LIBS=['forstio-core' + ,'forstio-codec' + ,'forstio-async' + ,'forstio-io' + ,'forstio-io_codec' + #,'OpenCL' ] ); env.__class__.add_source_files = add_kel_source_files diff --git a/modules/remote-sycl/c++/remote.hpp b/modules/remote-sycl/c++/remote.hpp index 3073b23..3be3c79 100644 --- a/modules/remote-sycl/c++/remote.hpp +++ b/modules/remote-sycl/c++/remote.hpp @@ -4,11 +4,11 @@ namespace saw { namespace rmt { -struct OpenCl {}; +struct Sycl {}; } template<> -class remote<rmt::OpenCl> { +class remote<rmt::Sycl> { private: SAW_FORBID_COPY(remote); SAW_FORBID_MOVE(remote); @@ -17,20 +17,20 @@ public: /* error_or<void> create_remote(){ - return remote<rmt::OpenCl>{*this}; + return remote<rmt::Sycl>{*this}; } */ }; template<> -struct remote_address<rmt::OpenCl> { +struct remote_address<rmt::Sycl> { private: - remote<rmt::OpenCl>* ctx_; + remote<rmt::Sycl>* ctx_; SAW_FORBID_COPY(remote_address); SAW_FORBID_MOVE(remote_address); public: - remote_address(remote<rmt::OpenCl>& r_ctx): + remote_address(remote<rmt::Sycl>& r_ctx): ctx_{&r_ctx} {} |