Clean up paraver derivations

Fix strictDeps paraver
Add hydraJobs with tests and packages
2025-09-28 18:44:50 +02:00 · 2025-09-28 18:44:49 +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 · 2025-08-01 13:12:48 +02:00
18 changed files with 132 additions and 114 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
@@ -18,7 +18,7 @@ let
    clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
    clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
    #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
-    #gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; # Broken: https://jungle.bsc.es/git/rarias/bscpkgs/issues/7
+    gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
    intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
    jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { };
    lmbench = callPackage ./pkgs/lmbench/default.nix { };
@@ -44,16 +44,11 @@ let
    stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
    stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
-    #tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; # Broken due gpi-2
+    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
    tampi = callPackage ./pkgs/tampi/default.nix { };
    wxparaver = callPackage ./pkgs/paraver/default.nix { };
  };

-  allPkgs = collect isDerivation bscPkgs;
-
-  mkStrict = pkg: if pkg ? overrideAttrs then pkg.overrideAttrs { strictDeps = true; } else pkg;
-  strictPkgs = map mkStrict allPkgs;
-
 in bscPkgs // {
  # Prevent accidental usage of bsc attribute
  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
@@ -93,15 +88,17 @@ in bscPkgs // {
      };
    };

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

    tests = final.runCommand "ci-tests" { }
      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";

    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/bench6/default.nix
+++ b/pkgs/bench6/default.nix
@@ -27,13 +27,10 @@ stdenv.mkDerivation rec {
    rev = gitCommit;
  };

-  nativeBuildInputs = [
-    cmake
-    clangOmpss2
-  ];
-
  buildInputs = [
    bigotes
+    cmake
+    clangOmpss2
    openmp
    openmpv
    nanos6
--- a/pkgs/bigotes/default.nix
+++ b/pkgs/bigotes/default.nix
@@ -4,7 +4,7 @@
 , cmake
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "bigotes";
  version = "9dce13";
  src = fetchFromGitHub {
@@ -13,5 +13,5 @@ stdenv.mkDerivation {
    rev = "9dce13446a8da30bea552d569d260d54e0188518";
    sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
  };
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ cmake ];
 }
--- a/pkgs/gpi-2/default.nix
+++ b/pkgs/gpi-2/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  patches = [ ./rdma-core.patch ./max-mem.patch ];
+
  preConfigure = ''
    patchShebangs autogen.sh
    ./autogen.sh
--- a/pkgs/gpi-2/max-mem.patch
+++ b/pkgs/gpi-2/max-mem.patch
@@ -0,0 +1,10 @@
+--- a/tests/tests/segments/max_mem.c	2025-09-12 13:30:53.449353591 +0200
+++ b/tests/tests/segments/max_mem.c	2025-09-12 13:33:49.750352401 +0200
+@@ -1,5 +1,7 @@
+ #include <test_utils.h>
+ 
+gaspi_size_t gaspi_get_system_mem (void);
+
+ /* Test allocates 45% of system memory and creates a segment that
+    large or if several ranks per node exist, divided among that
+    number */
--- a/pkgs/gpi-2/rdma-core.patch
+++ b/pkgs/gpi-2/rdma-core.patch
@@ -0,0 +1,12 @@
+--- a/src/devices/ib/GPI2_IB.h	2025-09-12 13:25:31.564181121 +0200
+++ b/src/devices/ib/GPI2_IB.h	2025-09-12 13:24:49.105422150 +0200
+@@ -26,6 +26,9 @@ along with GPI-2. If not, see <http://ww
+ 
+ #include "GPI2_Dev.h"
+ 
+/* Missing prototype as driver.h is now private */
+int ibv_read_sysfs_file(const char *dir, const char *file, char *buf, size_t size);
+
+ #define GASPI_GID_INDEX   (0)
+ #define PORT_LINK_UP      (5)
+ #define MAX_INLINE_BYTES  (128)
--- a/pkgs/intel-oneapi/2023.nix
+++ b/pkgs/intel-oneapi/2023.nix
@@ -78,7 +78,7 @@ let
  uncompressDebs = debs: name: stdenv.mkDerivation {
    name = name;
    srcs = debs;
-    nativeBuildInputs = [ dpkg ];
+    buildInputs = [ dpkg ];
    phases = [ "installPhase" ];
    installPhase = ''
      mkdir -p $out
@@ -108,17 +108,14 @@ let
      "intel-oneapi-mpi-${version}"
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
-
    buildInputs = [
+      rsync
      libfabric
      zlib
      stdenv.cc.cc.lib
    ];

+    nativeBuildInputs = [ autoPatchelfHook ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;
    installPhase = ''
@@ -157,6 +154,7 @@ let

    buildInputs = [
      intel-mpi
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -164,10 +162,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;

@@ -197,6 +192,7 @@ let
    buildInputs = [
      intel-mpi
      intel-tbb
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -205,10 +201,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;

@@ -261,6 +254,7 @@ let
    buildInputs = [
      intel-mpi
      intel-compiler-shared
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -268,10 +262,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];

    phases = [ "installPhase" "fixupPhase" ];

@@ -346,6 +337,7 @@ let

    buildInputs = [
      intel-compiler-shared
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -353,10 +345,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
    autoPatchelfIgnoreMissingDeps = [ "libtbb.so.12" "libtbbmalloc.so.2" "libze_loader.so.1" ];

    phases = [ "installPhase" "fixupPhase" ];
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -57,20 +57,18 @@ in stdenv.mkDerivation rec {

  isClangWithOmpss = true;

-  nativeBuildInputs = [
-    bash
-    cmake
-    elfutils
-    llvmPackages_latest.lld
-    pkg-config
-    python3
-    perl
-    which
-    zlib
-  ];
+  nativeBuildInputs = [ zlib ];

  buildInputs = [
+    which
+    bash
+    python3
+    perl
+    cmake
+    llvmPackages_latest.lld
+    elfutils
    libffi
+    pkg-config
    zlib
    gcc.cc.lib # Required for libstdc++.so.6
  ];
--- a/pkgs/mcxx/default.nix
+++ b/pkgs/mcxx/default.nix
@@ -32,20 +32,17 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  nativeBuildInputs = [
+  buildInputs = [
    autoreconfHook
-    bison
-    flex
+    nanos6
+    gperf
    python3
    gfortran
    pkg-config
-    gperf
-    gcc
-  ];
-
-  buildInputs = [
-    nanos6
    sqlite.dev
+    bison
+    flex
+    gcc
  ];

  patches = [ ./intel.patch ];
--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -88,15 +88,11 @@ in
    dontStrip = enableDebug;
    separateDebugInfo = true;

-    nativeBuildInputs = [
+    buildInputs = [
      autoconf
      automake
      libtool
-      papi # ./configure: line 27378: papi_version: command not found
      pkg-config
-    ];
-
-    buildInputs = [
      boost
      numactl
      hwloc
@@ -108,7 +104,7 @@ in
    postInstall = ''
      mkdir -p $out/nix-support
      echo "export NANOS6_HOME=$out" >> $out/nix-support/setup-hook
-    '';
+    ''; 

    meta = with lib; {
      homepage = "https://github.com/bsc-pm/nanos6";
--- a/pkgs/nosv/default.nix
+++ b/pkgs/nosv/default.nix
@@ -6,6 +6,8 @@
 , pkg-config
 , numactl
 , hwloc
+, papi
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
@@ -56,5 +58,5 @@ in
      numactl
      hwloc
      ovni
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
  }
--- a/pkgs/osu/default.nix
+++ b/pkgs/osu/default.nix
@@ -24,10 +24,9 @@ stdenv.mkDerivation rec {

  doCheck = true;
  enableParallelBuilding = true;
-  nativeBuildInputs = [ mpiAll ];
  buildInputs = [ mpiAll ];
  hardeningDisable = [ "all" ];
-  configureFlags = [
+  configureFlags = [ 
      "CC=mpicc"
      "CXX=mpicxx"
  ];
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "OSU Micro-Benchmarks";
-    homepage = "http://mvapich.cse.ohio-state.edu/benchmarks/";
+    homepage = http://mvapich.cse.ohio-state.edu/benchmarks/;
    maintainers = [ ];
    platforms = lib.platforms.all;
  };
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -13,6 +13,8 @@
 , useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
 }:

+with lib;
+
 let
  release = rec {
    version = "1.12.0";
@@ -43,7 +45,8 @@ in
    postPatch = ''
      patchShebangs --build test/
    '';
-    nativeBuildInputs = [ cmake ] ++ lib.optionals (useMpi) [ mpi ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = lib.optionals (useMpi) [ mpi ];
    cmakeBuildType = if (enableDebug) then "Debug" else "Release";
    cmakeFlags = [
      "-DOVNI_GIT_COMMIT=${src.shortRev}"
--- a/pkgs/paraver/default.nix
+++ b/pkgs/paraver/default.nix
@@ -1,5 +1,4 @@
-{
-  stdenv
+{ stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -12,14 +11,17 @@
 , openssl
 , glibcLocales
 , wrapGAppsHook
+
+, enableDebug ? false
 }:

 let
  wx = wxGTK32;
-in
-stdenv.mkDerivation rec {
-  pname = "wxparaver";
  version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "wxparaver";
+  inherit version;

  src = fetchFromGitHub {
    owner = "bsc-performance-tools";
@@ -36,21 +38,26 @@ stdenv.mkDerivation rec {
    ./fix-boost-87.patch
  ];

-  hardeningDisable = [ "all" ];
-
  # Fix the PARAVER_HOME variable
  postPatch = ''
    sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver
    sed -i '1aexport LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"' docs/wxparaver
  '';

-  dontStrip = true;
  enableParallelBuilding = true;

-  preConfigure = ''
-    export CFLAGS="-O3"
-    export CXXFLAGS="-O3"
-  '';
+  hardeningDisable = [ "all" ];
+
+  dontStrip = true;
+
+  env =
+    let
+      flags = if enableDebug then "-ggdb -Og" else "-O3";
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };

  configureFlags = [
    "--with-boost=${boost}"
@@ -68,11 +75,11 @@ stdenv.mkDerivation rec {

  buildInputs = [
    boost
-    libxml2.dev
+    libxml2
    xml2
    wx
    paraverKernel
-    openssl.dev
+    openssl
  ];

  postInstall = ''
--- a/pkgs/paraver/kernel.nix
+++ b/pkgs/paraver/kernel.nix
@@ -1,5 +1,4 @@
-{
-  stdenv
+{ stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -9,11 +8,16 @@
 , automake
 , pkg-config
 , zlib
+
+, enableDebug ? false
 }:

-stdenv.mkDerivation rec {
-  pname = "paraver-kernel";
+let
  version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "paraver-kernel";
+  inherit version;

  src = fetchFromGitHub {
    owner = "bsc-performance-tools";
@@ -34,10 +38,14 @@ stdenv.mkDerivation rec {

  dontStrip = true;

-  preConfigure = ''
-    export CFLAGS="-O3 -DPARALLEL_ENABLED"
-    export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
-  '';
+  env =
+    let
+      flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };

  configureFlags = [
    "--with-boost=${boost}"
--- a/pkgs/sonar/default.nix
+++ b/pkgs/sonar/default.nix
@@ -18,12 +18,8 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "all" ];
  dontStrip = true;
  configureFlags = [ "--with-ovni=${ovni}" ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
-
  buildInputs = [
+    autoreconfHook
    ovni
    mpi
  ];
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -41,24 +41,20 @@ let
    };
  };
  source = if (useGit) then git else release;
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
  pname = "tampi";
  inherit (source) src version;
  enableParallelBuilding = true;
  separateDebugInfo = true;
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    autoreconfHook
-    gcc
-    gnumake
-    libtool
-  ];
-
  buildInputs = [
+    autoreconfHook
+    automake
+    autoconf
+    libtool
+    gnumake
    boost
    mpi
+    gcc
  ] ++ optional (enableOvni) ovni;
  configureFlags = optional (enableOvni) "--with-ovni=${ovni}";
  dontDisableStatic = true;
Author	SHA1	Message	Date
Aleix Boné	f0daa7cf30	Clean up paraver derivations	2025-09-28 18:44:50 +02:00
Aleix Boné	0cb13011c6	Fix strictDeps paraver	2025-09-28 18:44:49 +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
Rodrigo Arias Mallo	2c8d7ed855	Build nOS-V with PAPI support To support the new instrumentation for HWC it would be useful to already build nOS-V with PAPI support enabled. The enablePapi switch allows it to be disabled with `nosv.override { enablePapi = false; }`. Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>	2025-08-01 13:12:48 +02:00