Compare commits

..

10 Commits

Author SHA1 Message Date
87c1903778
Simplify findMatch in intel-oneapi 2023
This should be a noop
2025-06-16 12:57:11 +02:00
1e7d43dacb
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-06-16 12:55:40 +02:00
38d2425dfe
Add oneMath
With support for MKL and CUDA enabled by default
2025-06-16 12:54:41 +02:00
4377ad3e46
Introduce intel oneapi 202{4,5} and make 2025 the default intelPackages 2025-06-16 12:53:38 +02:00
d974fbee05
Add build for tasycl with adaptivecpp 2025-06-16 12:53:38 +02:00
812d71beb1
tasycl: init at 2.0.0 2025-06-16 12:53:38 +02:00
97d128338a
Add test for icpx with ompss-2 as host compiler 2025-06-16 12:53:37 +02:00
6cb7e8dbe8
Add SYCL test compilation 2025-06-16 12:36:28 +02:00
b2831347cc
Add alias intelPackages -> intelPackages_2023 2025-06-16 12:36:28 +02:00
2d1f1ee5c7
Fix sycl intel-oneapi-compiler 2025-06-16 12:36:28 +02:00
3 changed files with 22 additions and 21 deletions

View File

@ -1,19 +1,11 @@
let let
bscOverlay = import ./overlay.nix; bscOverlay = import ./overlay.nix;
# read flake.lock and determine revision from there # Pin the nixpkgs
lock = builtins.fromJSON (builtins.readFile ./flake.lock); nixpkgsPath = import ./nixpkgs.nix;
inherit (lock.nodes.nixpkgs.locked) rev narHash;
fetchedNixpkgs = builtins.fetchTarball { pkgs = import nixpkgsPath {
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; overlays = [ bscOverlay ];
sha256 = narHash;
}; };
in
{ overlays ? [ ] in pkgs
, nixpkgs ? fetchedNixpkgs
, ...
}@attrs:
import nixpkgs (
(builtins.removeAttrs attrs [ "overlays" "nixpkgs" ]) //
{ overlays = [ bscOverlay ] ++ overlays; }
)

9
nixpkgs.nix Normal file
View File

@ -0,0 +1,9 @@
let
commit = "e4ad989506ec7d71f7302cc3067abd82730a4beb";
in builtins.fetchTarball {
# Descriptive name to make the store path easier to identify
name = "nixpkgs-${commit}";
url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz";
# Hash obtained using `nix-prefetch-url --unpack <url>`
sha256 = "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=";
}

View File

@ -12,11 +12,11 @@
, opensycl ? null , opensycl ? null
, adaptivecpp ? null , adaptivecpp ? null
, useIntel ? true , useIntel ? true
# TODO: move back to main branch and release
, useGit ? false , useGit ? true
, gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git" , gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git"
, gitBranch ? "main" , gitBranch ? "fix/various"
, gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825" , gitCommit ? "8be4729ded0ef64f028e98eb2b2baf2ccba7ff42"
}: }:
assert (useIntel || opensycl != null || adaptivecpp != null); assert (useIntel || opensycl != null || adaptivecpp != null);
@ -42,12 +42,12 @@ let
; ;
release = rec { release = rec {
version = "2.1.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bsc-pm"; owner = "bsc-pm";
repo = "tasycl"; repo = "tasycl";
rev = version; rev = version;
hash = "sha256-0kXnb0lHeQNHR27GTLbJ8xbiICLU8k2+FqEnnFSrzzo="; hash = "sha256-Z4d45baVBhE9NW8Ww948M78TJx7BpxTr9pGJvJO9hdI=";
}; };
}; };