adaptivecpp: update to LLVM 18
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
llvmPackages_17,
|
||||
llvmPackages_18,
|
||||
python3,
|
||||
cmake,
|
||||
boost,
|
||||
@@ -24,7 +24,7 @@
|
||||
let
|
||||
inherit (llvmPackages) stdenv;
|
||||
rocmPackages = rocmPackages_6;
|
||||
llvmPackages = llvmPackages_17;
|
||||
llvmPackages = llvmPackages_18;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "adaptivecpp";
|
||||
@@ -98,8 +98,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests =
|
||||
# Loosely based on the AdaptiveCpp GitHub CI: https://github.com/AdaptiveCpp/AdaptiveCpp/blob/develop/.github/workflows/linux.yml
|
||||
# This may be overkill, especially as this won't be run on GPU on the CI
|
||||
# Loosely based on the AdaptiveCpp GitHub CI: https://github.com/AdaptiveCpp/AdaptiveCpp/blob/develop/.github/workflows/linux.yml
|
||||
# This may be overkill, especially as this won't be run on GPU on the CI
|
||||
let
|
||||
runner = targets: enablePstlTests: callPackage ./tests.nix { inherit enablePstlTests; };
|
||||
run =
|
||||
|
||||
@@ -20,8 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ cmake tbb ];
|
||||
buildInputs = [ boost ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
tbb
|
||||
];
|
||||
buildInputs = [ boost ];
|
||||
|
||||
sourceRoot = "${adaptivecpp.src.name}/tests";
|
||||
|
||||
@@ -34,14 +37,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeFeature "DACCP_TARGETS" "${targets}")
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
install -Dm755 sycl_tests -t $out/bin/
|
||||
install -Dm755 rt_tests -t $out/bin/
|
||||
install -Dm755 device_compilation_tests -t $out/bin/
|
||||
install -Dm755 dump_test/dump_test -t $out/bin/
|
||||
install -Dm755 platform_api/platform_api -t $out/bin/
|
||||
'' + lib.optionalString enablePstlTests ''
|
||||
install -Dm755 pstl_tests -t $out/bin/
|
||||
'';
|
||||
installPhase =
|
||||
''
|
||||
mkdir $out
|
||||
install -Dm755 sycl_tests -t $out/bin/
|
||||
install -Dm755 rt_tests -t $out/bin/
|
||||
install -Dm755 device_compilation_tests -t $out/bin/
|
||||
install -Dm755 dump_test/dump_test -t $out/bin/
|
||||
install -Dm755 platform_api/platform_api -t $out/bin/
|
||||
''
|
||||
+ lib.optionalString enablePstlTests ''
|
||||
install -Dm755 pstl_tests -t $out/bin/
|
||||
'';
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user