summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/remote-hip/.nix/derivation.nix23
-rw-r--r--modules/remote-hip/SConstruct3
-rw-r--r--modules/remote-hip/examples/hip_device_info.cpp3
-rw-r--r--modules/remote-hip/tests/SConscript33
4 files changed, 7 insertions, 55 deletions
diff --git a/modules/remote-hip/.nix/derivation.nix b/modules/remote-hip/.nix/derivation.nix
index c63dd19..18d31c7 100644
--- a/modules/remote-hip/.nix/derivation.nix
+++ b/modules/remote-hip/.nix/derivation.nix
@@ -4,21 +4,17 @@
, clang-tools
, version
, forstio
-, openmp
, keldu
-, ocl-icd
-, lld_15
-, python3
-, bash
+, rocmPackages
-, build_examples ? "false"
+, build_examples ? "true"
, build_benchmarks ? "false"
}:
let
in stdenv.mkDerivation {
- pname = "forstio-remote-sycl";
+ pname = "forstio-remote-hip";
inherit version;
src = ./..;
@@ -26,7 +22,6 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
clang-tools
- python3
scons
];
@@ -35,10 +30,6 @@ in stdenv.mkDerivation {
forstio.codec
forstio.async
forstio.remote
- keldu.adaptivecpp-dev
- ocl-icd
- openmp
- lld_15
];
buildPhase = ''
@@ -49,12 +40,6 @@ in stdenv.mkDerivation {
scons prefix=$out build_benchmarks=${build_benchmarks} build_examples=${build_examples} install
'';
- doCheck = true;
- checkPhase = ''
- export ACPP_APPDB_DIR=.
- scons test
- ./bin/tests
- '';
-
+ doCheck = false;
outputs = ["out" "dev"];
}
diff --git a/modules/remote-hip/SConstruct b/modules/remote-hip/SConstruct
index 78bf333..83b1f3a 100644
--- a/modules/remote-hip/SConstruct
+++ b/modules/remote-hip/SConstruct
@@ -64,9 +64,6 @@ env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
,'forstio-codec'
,'forstio-async'
,'forstio-remote'
- ,'acpp-rt'
- ,'OpenCL'
- ,'omp'
]
);
env.__class__.add_source_files = add_kel_source_files
diff --git a/modules/remote-hip/examples/hip_device_info.cpp b/modules/remote-hip/examples/hip_device_info.cpp
new file mode 100644
index 0000000..ade4548
--- /dev/null
+++ b/modules/remote-hip/examples/hip_device_info.cpp
@@ -0,0 +1,3 @@
+int main(){
+ return 0;
+}
diff --git a/modules/remote-hip/tests/SConscript b/modules/remote-hip/tests/SConscript
deleted file mode 100644
index f56f0bd..0000000
--- a/modules/remote-hip/tests/SConscript
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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['CXX'] = 'acpp';
-
-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'];