Add TAOpenCL

Add hydraJobs with tests and packages
Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
2025-09-29 12:54:25 +02:00 · 2025-09-26 16:12:46 +02:00 · 2025-09-12 14:28:42 +02:00 · 2025-09-12 14:21:00 +02:00
3 changed files with 66 additions and 8 deletions
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,25 @@
  inputs.nixpkgs.url = "nixpkgs";

  outputs = { self, nixpkgs, ...}:
-  let
-    pkgs = import nixpkgs {
+    let
      # For now we only support x86
      system = "x86_64-linux";
-      overlays = [ self.overlays.default ];
-    };
-  in
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ self.overlays.default ];
+      };
+    in
    {
      bscOverlay = import ./overlay.nix;
      overlays.default = self.bscOverlay;
-      legacyPackages.x86_64-linux = pkgs;
+      # full nixpkgs with our overlay applied
+      legacyPackages.${system} = pkgs;
+
+      hydraJobs = {
+        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
+      };
+
+      # propagate nixpkgs lib, so we can do bscpkgs.lib
+      inherit (nixpkgs) lib;
    };
 }
--- a/overlay.nix
+++ b/overlay.nix
@@ -46,6 +46,7 @@ let
    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
    tampi = callPackage ./pkgs/tampi/default.nix { };
+    taopencl = callPackage ./pkgs/taopencl/default.nix { };
    wxparaver = callPackage ./pkgs/paraver/default.nix { };
  };

@@ -88,7 +89,9 @@ in bscPkgs // {
      };
    };

-    pkgs = final.runCommand "ci-pkgs" { }
+    pkgs = filterAttrs (_: isDerivation) bscPkgs;
+
+    pkgsList = final.runCommand "ci-pkgs" { }
      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";

    tests = final.runCommand "ci-tests" { }
@@ -96,7 +99,7 @@ in bscPkgs // {

    all = final.runCommand "ci-all" { }
    ''
-      deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}"
+      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
      cat $deps
      printf '%s\n' $deps > $out
    '';
--- a/pkgs/taopencl/default.nix
+++ b/pkgs/taopencl/default.nix
@@ -0,0 +1,46 @@
+{
+  stdenv
+, automake
+, autoconf
+, libtool
+, gnumake
+, boost
+, mpi
+, gcc
+, autoreconfHook
+, ocl-icd
+, opencl-headers
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "taopencl";
+  version = finalAttrs.src.shortRev;
+
+  src = builtins.fetchGit {
+    url = "git@gitlab-internal.bsc.es:task-awareness/taopencl/taopencl.git";
+    ref = "master";
+    rev = "c3b7b32ae8fa4af7ceff598532a881f8f1490aaf";
+  };
+
+  enableParallelBuilding = true;
+  separateDebugInfo = true;
+
+  configureFlags = [
+    "--with-opencl-lib=${ocl-icd}/lib"
+    "--with-opencl-include=${opencl-headers}/include"
+  ];
+
+  buildInputs = [
+    autoreconfHook
+    automake
+    autoconf
+    libtool
+    gnumake
+    boost
+    mpi
+    gcc
+  ];
+
+  dontDisableStatic = true;
+  hardeningDisable = [ "all" ];
+})
Author	SHA1	Message	Date
Aleix Boné	b37f28a631	Add TAOpenCL	2025-09-29 12:54:25 +02:00
Aleix Boné	2ffdd53d86	Add hydraJobs with tests and packages Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>	2025-09-26 16:12:46 +02:00
Aleix Boné	c7b5ec13b8	Provide nixpkgs.lib in bscpkgs outputs Currently, we can use bscpkgs similarly to nixpkgs either through the flake outputs or with import bscpkgs: ```nix # currently supported: bscpkgs.legacyPackages.x86_64-linux.hello let pkgs = import bscpkgs { system = "x86_64-linux"; }; in pkgs.hello ``` The missing piece is nixpkgs.lib (not pkgs.lib, the system agnostic one). The workaround is to do bscpkgs.inputs.nixpkgs.lib instead. We can simplify this by forwarding the lib to our outputs. This enables us to use bscpkgs as a drop-in replacing the inputs to our flake from nixpkgs to bscpkgs. (inputs.nixpkgs.url = "<BSCpkgs url>"). Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es> Tested-by: Aleix Boné <abonerib@bsc.es>	2025-09-12 14:28:42 +02:00
Rodrigo Arias Mallo	00dfe801f4	Fix GPI-2 and enable TAGASPI The rdma-core driver.h include is no longer installed: `56dd87acd2` So ibv_read_sysfs_file() is not defined. As the symbols is still distributed, we simply add the missing prototype manually. Similarly, the gaspi_get_system_mem() function is not available from the gaspi public headers, so we define it in the max_mem.c test. Fixes: rarias/bscpkgs#7 Reviewed-by: Aleix Boné <abonerib@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>	2025-09-12 14:21:00 +02:00