Compare commits

..

12 Commits

Author SHA1 Message Date
5be04c5ff5
Disable test for SYCL Intel 2023
Some checks failed
CI / build:all (pull_request) Failing after 38m11s
2025-10-08 11:08:23 +02:00
7da1b55d5e
Use gcc13 for llvm-ompss2 for intel 2025-10-08 11:08:22 +02:00
61c1779634
Use gcc13 for intel compiler 2025-10-08 11:08:22 +02:00
ea12c28793
Reorder includes in intel 202{4,5} wrapper 2025-10-08 11:08:22 +02:00
91a89092a8
Fix path in intel compiler wrapper 2025-10-08 11:08:22 +02:00
b3cab4639f
Do not check missing symlinks in intel-oneapi 2025-10-08 11:08:22 +02:00
01bda24821
Add passthru in ompss2 wrapper for icpx compat 2025-10-08 11:08:22 +02:00
967353d573
Remove wrapper flags when clang called from intel 2025-10-08 11:08:21 +02:00
0e667db329
Add oneMath 2025-10-08 11:08:21 +02:00
344579386d
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-08 11:08:21 +02:00
1e5192da6d
Add intel-hpckit-2025 as default intelPackages
Also introduces hpckit_2024
2025-10-08 11:08:21 +02:00
dee85a49a7
Add TASYCL 2.1.0 2025-10-08 11:08:21 +02:00

View File

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