diff options
| author | Claudius 'keldu' Holeksa <mail@keldu.de> | 2024-07-15 16:38:25 +0200 |
|---|---|---|
| committer | Claudius 'keldu' Holeksa <mail@keldu.de> | 2024-07-15 16:38:25 +0200 |
| commit | 6b68a4f7ddac183f460b668bee7a385daada0ce5 (patch) | |
| tree | 61e960a96fc35e040f3e7c4f7e649344e30846bc | |
| parent | 816760c8480e8e76c7f4021a845161eb697e215c (diff) | |
Move files and ammend remote-sycl
| -rw-r--r-- | modules/remote-sycl/.nix/derivation.nix | 1 | ||||
| -rw-r--r-- | modules/remote-sycl/SConstruct | 1 | ||||
| -rw-r--r-- | modules/remote-sycl/c++/common.hpp | 2 | ||||
| -rw-r--r-- | modules/remote-sycl/c++/transfer.hpp | 2 | ||||
| -rw-r--r-- | modules/remote/tests/SConscript | 31 | ||||
| -rw-r--r-- | modules/remote/tests/remote_loopback.cpp (renamed from modules/codec/tests/remote_loopback.cpp) | 0 |
6 files changed, 35 insertions, 2 deletions
diff --git a/modules/remote-sycl/.nix/derivation.nix b/modules/remote-sycl/.nix/derivation.nix index ba6d1ec..c63dd19 100644 --- a/modules/remote-sycl/.nix/derivation.nix +++ b/modules/remote-sycl/.nix/derivation.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation { forstio.core forstio.codec forstio.async + forstio.remote keldu.adaptivecpp-dev ocl-icd openmp diff --git a/modules/remote-sycl/SConstruct b/modules/remote-sycl/SConstruct index 40344e7..07ca30b 100644 --- a/modules/remote-sycl/SConstruct +++ b/modules/remote-sycl/SConstruct @@ -63,6 +63,7 @@ env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[], LIBS=['forstio-core' ,'forstio-codec' ,'forstio-async' + ,'forstio-remote' ,'acpp-rt' ,'OpenCL' ,'omp' diff --git a/modules/remote-sycl/c++/common.hpp b/modules/remote-sycl/c++/common.hpp index cb2d73f..8c008c3 100644 --- a/modules/remote-sycl/c++/common.hpp +++ b/modules/remote-sycl/c++/common.hpp @@ -1,6 +1,6 @@ #pragma once -#include <forstio/codec/remote.hpp> +#include <forstio/remote/remote.hpp> #include <forstio/codec/data.hpp> #include <forstio/codec/id_map.hpp> diff --git a/modules/remote-sycl/c++/transfer.hpp b/modules/remote-sycl/c++/transfer.hpp index 2a95f67..5d76e7c 100644 --- a/modules/remote-sycl/c++/transfer.hpp +++ b/modules/remote-sycl/c++/transfer.hpp @@ -6,7 +6,7 @@ #include <forstio/error.hpp> #include <forstio/reduce_templates.hpp> -#include <forstio/codec/transfer.hpp> +#include <forstio/remote/transfer.hpp> namespace saw { diff --git a/modules/remote/tests/SConscript b/modules/remote/tests/SConscript new file mode 100644 index 0000000..f8ffc92 --- /dev/null +++ b/modules/remote/tests/SConscript @@ -0,0 +1,31 @@ +#!/bin/false + +import os +import os.path +import glob + + +Import('env') + +dir_path = Dir('.').abspath + +# Environment for base library +test_cases_env = env.Clone(); + +test_cases_env.Append(LIBS=['forstio-test']); + +test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp")) +test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp")) + +env.sources += test_cases_env.sources; +env.headers += test_cases_env.headers; + +objects_static = [] +test_cases_env.add_source_files(objects_static, test_cases_env.sources, shared=False); +test_cases_env.program = test_cases_env.Program('#bin/tests', [objects_static, env.library_static]); + +# Set Alias +env.Alias('test', test_cases_env.program); +env.Alias('check', test_cases_env.program); + +env.targets += ['test','check']; diff --git a/modules/codec/tests/remote_loopback.cpp b/modules/remote/tests/remote_loopback.cpp index 2895ee7..2895ee7 100644 --- a/modules/codec/tests/remote_loopback.cpp +++ b/modules/remote/tests/remote_loopback.cpp |