diff options
| -rw-r--r-- | default.nix | 6 | ||||
| -rw-r--r-- | modules/remote-sycl/.nix/derivation.nix | 29 | ||||
| -rw-r--r-- | modules/remote-sycl/SConstruct | 2 | ||||
| -rw-r--r-- | modules/remote-sycl/examples/SConscript | 1 |
4 files changed, 21 insertions, 17 deletions
diff --git a/default.nix b/default.nix index 52a36a1..79f7777 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ { pkgs ? import <nixpkgs> {} -, stdenv ? pkgs.llvmPackages_17.stdenv -, clang-tools ? pkgs.clang-tools_17 +, stdenv ? pkgs.llvmPackages_15.stdenv +, clang-tools ? pkgs.clang-tools_15 , gasp ? (import ((builtins.fetchGit { url = "git@git.keldu.de:apps/gasp"; ref = "master"; @@ -77,7 +77,7 @@ in rec { inherit forstio; inherit stdenv; inherit clang-tools; - openmp = pkgs.llvmPackages_17.openmp; + openmp = pkgs.llvmPackages_15.openmp; build_examples = "true"; }; diff --git a/modules/remote-sycl/.nix/derivation.nix b/modules/remote-sycl/.nix/derivation.nix index 65c408c..c401adc 100644 --- a/modules/remote-sycl/.nix/derivation.nix +++ b/modules/remote-sycl/.nix/derivation.nix @@ -5,9 +5,11 @@ , version , forstio , openmp -, opensycl -, python3 +, keldu , ocl-icd +, lld_15 +, python3 +, bash , build_examples ? "false" }: @@ -22,9 +24,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ - scons clang-tools python3 + scons ]; buildInputs = [ @@ -33,19 +35,20 @@ in stdenv.mkDerivation { forstio.async forstio.io forstio.io_codec - openmp - opensycl + keldu.opensycl ocl-icd - ]; - - buildPhase = '' - scons build_examples=${build_examples} - ''; + openmp + lld_15 + ]; - installPhase = '' - scons prefix=$out build_examples=${build_examples} install - ''; + buildPhase = '' + scons build_examples=${build_examples} + ''; + installPhase = '' + scons prefix=$out build_examples=${build_examples} install + ''; + doCheck = false; checkPhase = '' scons test diff --git a/modules/remote-sycl/SConstruct b/modules/remote-sycl/SConstruct index e71d67e..78c27ab 100644 --- a/modules/remote-sycl/SConstruct +++ b/modules/remote-sycl/SConstruct @@ -59,8 +59,8 @@ env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[], ,'forstio-io' ,'forstio-io_codec' ,'hipSYCL-rt' - ,'omp' ,'OpenCL' + ,'omp' ] ); env.__class__.add_source_files = add_kel_source_files diff --git a/modules/remote-sycl/examples/SConscript b/modules/remote-sycl/examples/SConscript index 1e77251..3c510eb 100644 --- a/modules/remote-sycl/examples/SConscript +++ b/modules/remote-sycl/examples/SConscript @@ -12,6 +12,7 @@ dir_path = Dir('.').abspath # Environment for base library examples_env = env.Clone(); + examples_sycl_env = examples_env.Clone(); examples_sycl_env['CXX'] = 'syclcc'; |