Compare commits

..

12 Commits

Author SHA1 Message Date
5448fc75e1
Disable test for SYCL Intel 2023
Some checks failed
CI / build:all (pull_request) Failing after 53s
2025-10-08 09:55:07 +02:00
db058d6b4a
Use gcc13 for llvm-ompss2 for intel
Some checks failed
CI / build:all (pull_request) Failing after 47s
2025-10-07 17:39:03 +02:00
ac93781cbd
Use gcc13 for intel compiler 2025-10-07 16:28:17 +02:00
312a54526c
Reorder includes in intel 202{4,5} wrapper 2025-10-07 16:28:17 +02:00
d464e30e13
Fix path in intel compiler wrapper 2025-10-07 16:28:17 +02:00
acc76acc16
Do not check missing symlinks in intel-oneapi 2025-10-07 16:28:17 +02:00
94276875c4
Add passthru in ompss2 wrapper for icpx compat 2025-10-07 16:28:17 +02:00
cd0dd65455
Remove wrapper flags when clang called from intel 2025-10-07 16:28:16 +02:00
08ca2ed5bf
Add oneMath 2025-10-07 16:28:16 +02:00
75567ed725
Fix parsing of new apt package list for oneapi 2023
New apt list does not have Package: as the first entry for all packages
2025-10-07 16:28:16 +02:00
cc7f7c0e8c
Add intel-hpckit-2025 as default intelPackages
Also introduces hpckit_2024
2025-10-07 16:28:16 +02:00
f5451b3b91
Add TASYCL 2.1.0 2025-10-07 16:28:16 +02:00

View File

@ -1,32 +1,36 @@
{
lib,
stdenv,
autoconf,
automake,
autoreconfHook,
boost,
fetchFromGitHub,
gnumake,
libtool,
withCFlags,
{ stdenv
, lib
, withCFlags
, intelPackages
, fetchFromGitHub
, automake
, autoconf
, libtool
, gnumake
, autoreconfHook
, boost
, adaptivecpp ? null
, useIntel ? true
useIntel ? true,
adaptivecpp ? null,
intelPackages ? null,
useGit ? false,
gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git",
gitBranch ? "main",
gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825",
, useGit ? false
, gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git"
, gitBranch ? "main"
, gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825"
}:
assert !useIntel -> adaptivecpp != null;
assert useIntel -> intelPackages != null;
assert (useIntel || adaptivecpp != null);
let
variant = if useIntel then "intel" else "acpp";
syclStdenv = withCFlags [ "-O3" ] (if useIntel then intelPackages.stdenv else stdenv);
syclStdenv =
if useIntel then
# If we don't set optimization level, separateDebugInfo sets ggdb and
# intel disables all optimizations
withCFlags ["-O3"] intelPackages.stdenv
else
withCFlags [ "-L${adaptivecpp}/lib" "-lacpp-rt" "-I${adaptivecpp}/include" ] stdenv
;
release = rec {
version = "2.1.0";
@ -49,10 +53,14 @@ let
source = if (useGit) then git else release;
isOldRelease = (!useGit && (builtins.compareVersions source.version "2.0.0" <= 0));
in
assert !isOldRelease || useIntel; # old releases only work with intel
syclStdenv.mkDerivation {
pname = "tasycl-${variant}";
pname = "tasycl";
inherit (source) src version;
enableParallelBuilding = true;
@ -70,9 +78,8 @@ syclStdenv.mkDerivation {
boost
];
configureFlags = lib.optionals (!useIntel) [
"CXX=${lib.getExe adaptivecpp}"
];
# only needed for release versions prior or equal to 2.0.0
configureFlags = lib.optionals isOldRelease [ "--with-sycl-include=${intelPackages.icx.cc}/include/sycl" ];
# add symlinks so we can explicitly link with tasycl-intel / tasycl-acpp
postInstall = ''