wip

The stdenv no longer provides it by default.

Reviewed-by: Aleix Boné <abonerib@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>

flake.lock

@@ -2,10 +2,10 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700390070,
+        "lastModified": 1736867362,
-        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
+        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
-        "path": "/nix/store/z7y28qzhk7driiwcw78k0mb24laknm0f-source",
+        "path": "/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source",
-        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
+        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
         "type": "path"
       },
       "original": {

overlay.nix

@@ -11,12 +11,12 @@ let
 
   bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
+    bigotes = callPackage ./pkgs/bigotes/default.nix { };
     clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
     clangOmpss2Nanos6 = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nanos6; };
-    clangOmpss2Nodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; };
+    clangOmpss2Nodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmp; };
-    clangOmpss2OpenmpNodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; clangOmpss2Unwrapped = final.clangOmpss2OpenmpUnwrapped; };
+    clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
     clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
-    clangOmpss2OpenmpUnwrapped = final.clangOmpss2Unwrapped.override { enableNosv = true; };
     #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
     gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
     intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
@@ -31,6 +31,8 @@ let
     #nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { };
     nodes = callPackage ./pkgs/nodes/default.nix { };
     nosv = callPackage ./pkgs/nosv/default.nix { };
+    openmp = callPackage ./pkgs/llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; };
+    openmpv = final.openmp.override { enableNosv = true; enableOvni = true; };
     osumb = callPackage ./pkgs/osu/default.nix { };
     ovni = callPackage ./pkgs/ovni/default.nix { };
     ovniGit = final.ovni.override { useGit = true; };
@@ -41,9 +43,10 @@ let
     stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; };
     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
     stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
-    stdenvClangOmpss2OpenmpNodes = final.stdenv.override { cc = final.clangOmpss2OpenmpNodes; allowedRequisites = null; };
+    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
     tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
     tampi = callPackage ./pkgs/tampi/default.nix { };
+    vivado = callPackage ./pkgs/vivado/default.nix { };
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
@@ -76,10 +79,13 @@ in bscPkgs // {
         stdenv = final.stdenvClangOmpss2Nodes;
       };
       clangNosvOpenmp-task = callPackage ./test/compilers/clang-openmp.nix {
-        stdenv = final.stdenvClangOmpss2OpenmpNodes;
+        stdenv = final.stdenvClangOmpss2Nodes;
       };
-      clangNosvOpenmp-nosv = callPackage ./test/compilers/clang-openmp-nosv.nix {
+      clangNosvOmpv-nosv = callPackage ./test/compilers/clang-openmp-nosv.nix {
-        stdenv = final.stdenvClangOmpss2OpenmpNodes;
+        stdenv = final.stdenvClangOmpss2NodesOmpv;
+      };
+      clangNosvOmpv-ld = callPackage ./test/compilers/clang-openmp-ld.nix {
+        stdenv = final.stdenvClangOmpss2NodesOmpv;
       };
     };
 

pkgs/bigotes/default.nix

@@ -0,0 +1,17 @@
+{
+  stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bigotes";
+  version = "9dce13";
+  src = fetchFromGitHub {
+    owner = "rodarima";
+    repo = "bigotes";
+    rev = "9dce13446a8da30bea552d569d260d54e0188518";
+    sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
+  };
+  buildInputs = [ cmake ];
+}

pkgs/gpi-2/default.nix

@@ -17,6 +17,10 @@ let
     name ="rdma-core-all";
     paths = [ rdma-core.dev rdma-core.out ];
   };
+  mpiAll = symlinkJoin {
+    name = "mpi-all";
+    paths = [ mpi.all ];
+  };
 in
 
 stdenv.mkDerivation rec {
@@ -37,13 +41,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-infiniband=${rdma-core-all}"
-    "--with-mpi=${mpi}"
+    "--with-mpi=${mpiAll}"
     "--with-slurm"
     "CFLAGS=-fPIC"
     "CXXFLAGS=-fPIC"
   ];
 
-  buildInputs = [ slurm mpi rdma-core-all autoconf automake libtool rsync gfortran ];
+  buildInputs = [ slurm mpiAll rdma-core-all autoconf automake libtool rsync gfortran ];
 
   hardeningDisable = [ "all" ];
 }

pkgs/intel-oneapi/2023.nix

@@ -198,6 +198,7 @@ let
       libffi_3_3
       libelf
       libxml2
+      zlib
       hwloc
       stdenv.cc.cc.lib
     ];

pkgs/llvm-ompss2/clang.nix

@@ -10,27 +10,25 @@
 , elfutils
 , libffi
 , zlib
-, nosv
 , pkg-config
 , gcc # needed to set the rpath of libstdc++ for clang-tblgen
 , enableDebug ? false
-, enableNosv ? false
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
-, gitCommit ? "0a6d6c64b04f9bbbe1399f18be426e191fb6b42c"
+, gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:
 
 let
   stdenv = llvmPackages_latest.stdenv;
 
   release = rec {
-    version = "2023.11";
+    version = "2024.11";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "llvm";
       rev = "refs/tags/github-release-${version}";
-      hash = "sha256-XLYS401BixGw3Ke/JKuikVKvbA92ENCdUvYLyZX9UtI=";
+      hash = "sha256-pF0qa987nLkIJPUrXh1srzBkLPfb31skIegD0bl34Kg=";
     };
   };
 
@@ -73,8 +71,6 @@ in stdenv.mkDerivation rec {
     pkg-config
     zlib
     gcc.cc.lib # Required for libstdc++.so.6
-  ] ++ lib.optionals enableNosv [
-    nosv
   ];
 
   # Error with -D_FORTIFY_SOURCE=2, see https://bugs.gentoo.org/636604:
@@ -107,27 +103,19 @@ in stdenv.mkDerivation rec {
       "-DCMAKE_CXX_FLAGS_DEBUG=-g -ggnu-pubnames"
       "-DCMAKE_EXE_LINKER_FLAGS_DEBUG=-Wl,--gdb-index"
       "-DLLVM_LIT_ARGS=-sv --xunit-xml-output=xunit.xml"
-      "-DLLVM_ENABLE_PROJECTS=clang;openmp;compiler-rt;lld"
+      "-DLLVM_ENABLE_PROJECTS=clang;compiler-rt;lld"
       "-DLLVM_ENABLE_ASSERTIONS=ON"
       "-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
       "-DCMAKE_INSTALL_BINDIR=bin"
       "-DLLVM_ENABLE_ZLIB=FORCE_ON"
       "-DLLVM_ENABLE_LIBXML2=OFF"
-  '' + (lib.optionalString enableNosv ''
-      "-DCLANG_DEFAULT_NOSV_HOME=${nosv}"
-  '') + ''
       # Set the rpath to include external libraries (zlib) both on build and
       # install
       "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON"
       "-DCMAKE_INSTALL_RPATH=${zlib}/lib:${gcc.cc.lib}/lib"
+      "-DLLVM_APPEND_VC_REV=ON"
+      "-DLLVM_FORCE_VC_REVISION=${source.version}"
     )
-
-  '';
-
-  # Remove support for GNU and Intel Openmp
-  postInstall = ''
-    rm -f $out/lib/libgomp*
-    rm -f $out/lib/libiomp*
   '';
 
 # About "-DCLANG_DEFAULT_NANOS6_HOME=${nanos6}", we could specify a default

pkgs/llvm-ompss2/default.nix

@@ -3,15 +3,24 @@
 , lib
 , gcc
 , clangOmpss2Unwrapped
+, openmp ? null
 , wrapCCWith
 , llvmPackages_latest
 , ompss2rt ? null
 }:
 
+let
+  usingNodesAndOmpv = (openmp.pname == "openmp-v" && ompss2rt.pname == "nodes");
+  sameNosv = openmp.nosv == ompss2rt.nosv;
+in
+
+assert lib.assertMsg (usingNodesAndOmpv -> sameNosv) "OpenMP-V and NODES must share the same nOS-V";
 
 let
   homevar = if ompss2rt.pname == "nanos6" then "NANOS6_HOME" else "NODES_HOME";
   rtname  = if ompss2rt.pname == "nanos6" then "libnanos6" else "libnodes";
+  ompname = if openmp.pname == "openmp-v" then  "libompv" else "libomp";
+
 
   # We need to replace the lld linker from bintools with our linker just built,
   # otherwise we run into incompatibility issues when mixing compiler and linker
@@ -27,6 +36,8 @@ let
   cc = clangOmpss2Unwrapped;
 in wrapCCWith {
   inherit cc bintools;
+  # extraPackages adds packages to depsTargetTargetPropagated
+  extraPackages = lib.optional (openmp != null) openmp;
   extraBuildCommands = ''
     echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
     echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
@@ -43,6 +54,9 @@ in wrapCCWith {
     echo "--gcc-toolchain=${gcc}" >> $out/nix-support/cc-cflags
 
     wrap clang++  $wrapper $ccPath/clang++
+
+  '' + lib.optionalString (openmp != null) ''
+    echo "export OPENMP_RUNTIME=${ompname}" >> $out/nix-support/cc-wrapper-hook
   '' + lib.optionalString (ompss2rt != null) ''
     echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook
     echo "export ${homevar}=${ompss2rt}"   >> $out/nix-support/cc-wrapper-hook

pkgs/llvm-ompss2/openmp.nix

@@ -0,0 +1,77 @@
+{ lib
+, llvmPackages_latest
+, monorepoSrc
+, runCommand
+, cmake
+, ninja
+, llvm
+, perl
+, pkg-config
+, version
+, nosv
+, ovni
+, python3
+, enableNosv ? false
+, enableDebug ? false
+, enableOvni ? false
+}:
+
+assert enableOvni -> enableNosv;
+
+let
+  stdenv = llvmPackages_latest.stdenv;
+in
+stdenv.mkDerivation rec {
+  pname = "openmp" + (lib.optionalString enableNosv "-v");
+  inherit version;
+
+  src = runCommand "${pname}-src" {} ''
+    mkdir -p "$out"
+    cp -r ${monorepoSrc}/cmake "$out"
+    cp -r ${monorepoSrc}/openmp "$out"
+  '';
+
+  sourceRoot = "${src.name}/openmp";
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    perl
+    pkg-config
+    python3
+  ] ++ lib.optionals enableNosv [
+    nosv
+  ] ++ lib.optionals enableOvni [
+    ovni
+  ];
+
+  doCheck = false;
+
+  hardeningDisable = [ "all" ];
+
+  cmakeBuildType = if enableDebug then "Debug" else "Release";
+
+  dontStrip = enableDebug;
+
+  separateDebugInfo = true;
+
+  cmakeFlags = [
+    "-DLIBOMP_OMPD_SUPPORT=OFF"
+    "-DOPENMP_ENABLE_LIBOMPTARGET=OFF"
+  ];
+
+  # Remove support for GNU and Intel Openmp.
+  # Also, remove libomp if building with nosv, as there is no support to build
+  # only one runtime at a time.
+  postInstall = ''
+    rm -f $out/lib/libgomp*
+    rm -f $out/lib/libiomp*
+  '' + lib.optionalString enableNosv ''
+    rm -f $out/lib/libomp.*
+  '';
+
+  passthru = {
+    inherit nosv;
+  };
+}
+

pkgs/nanos6/0001-Add-missing-cstdint-include.patch

@@ -0,0 +1,32 @@
+From 6fc5bef066ac011d6b15a7c090f4498b0b730818 Mon Sep 17 00:00:00 2001
+From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
+Date: Fri, 12 Apr 2024 14:44:43 +0200
+Subject: [PATCH] Add missing cstdint include
+
+---
+ src/dependencies/DataTrackingSupport.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/dependencies/DataTrackingSupport.hpp b/src/dependencies/DataTrackingSupport.hpp
+index 56226085..cdfd5e1c 100644
+--- a/src/dependencies/DataTrackingSupport.hpp
++++ b/src/dependencies/DataTrackingSupport.hpp
+@@ -1,13 +1,14 @@
+ /*
+ 	This file is part of Nanos6 and is licensed under the terms contained in the COPYING file.
+ 
+-	Copyright (C) 2020 Barcelona Supercomputing Center (BSC)
++	Copyright (C) 2020-2024 Barcelona Supercomputing Center (BSC)
+ */
+ 
+ #ifndef DATA_TRACKING_SUPPORT_HPP
+ #define DATA_TRACKING_SUPPORT_HPP
+ 
+ #include "support/config/ConfigVariable.hpp"
++#include <cstdint>
+ 
+ class Task;
+ 
+-- 
+2.44.0
+

pkgs/nanos6/default.nix

@@ -19,7 +19,7 @@
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
-, gitCommit ? "4fdddf67b573fbe624bf64b92c0a9b4e344b9dd3"
+, gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
 }:
 
 assert enableJemalloc -> (jemallocNanos6 != null);
@@ -28,12 +28,12 @@ with lib;
 
 let
   release = rec {
-    version = "4.0";
+    version = "4.2";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nanos6";
       rev = "version-${version}";
-      hash = "sha256-o2j7xNufdjcWykbwDDHQYxYCs4kpyQvJnuFyeXYZULw=";
+      hash = "sha256-tBrRGLCjSFYdmVGPAC2DzYY6HJyZGUOMeykujafn7+4=";
     };
   };
 
@@ -48,9 +48,8 @@ let
 
   source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation (source // rec {
     pname = "nanos6";
-    inherit (source) src version;
 
     prePatch = ''
       patchShebangs scripts/generate_config.sh
@@ -114,4 +113,4 @@ in
       platforms = platforms.linux;
       license = licenses.gpl3;
     };
-  }
+  })

pkgs/nodes/default.nix

@@ -1,15 +1,11 @@
 {
   stdenv
 , lib
-, automake
-, autoconf
-, libtool
 , fetchFromGitHub
 , pkg-config
 , perl
 , numactl
 , hwloc
-, papi
 , boost
 , autoreconfHook
 , ovni
@@ -18,19 +14,19 @@
 , useGit ? false
 , gitUrl ? "ssh://git@gitlab-internal.bsc.es/nos-v/nodes.git"
 , gitBranch ? "master"
-, gitCommit ? "813da5976d06f587747dbb07aa911cfd855eff1a"
+, gitCommit ? "6002ec9ae6eb876d962cc34366952a3b26599ba6"
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "1.1";
+    version = "1.3";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nodes";
       rev = "version-${version}";
-      hash = "sha256-Cfj3ozVK/sx/eccTjv7wZX8KUMdca0vY0RY0UWSRftg=";
+      hash = "sha256-cFb9pxcjtkMmH0CsGgUO9LTdXDNh7MCqicgGWawLrsU=";
     };
   };
 
@@ -69,21 +65,20 @@ in
     # disable all by default, which includes bindnow.
     hardeningDisable = [ "all" ];
 
-    buildInputs = [
+    nativeBuildInputs = [
       autoreconfHook
-      autoconf
-      automake
-      libtool
       pkg-config
+    ];
+
+    buildInputs = [
       boost
       numactl
       hwloc
-      papi
       nosv
       ovni
     ];
 
     passthru = {
-      nosv = nosv;
+      inherit nosv;
     };
   }

pkgs/nosv/default.nix

@@ -6,23 +6,24 @@
 , pkg-config
 , numactl
 , hwloc
+, cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
 , gitUrl ? "git@gitlab-internal.bsc.es:nos-v/nos-v.git"
 , gitBranch ? "master"
-, gitCommit ? "f696951f62cac018bd9fd15e2fb9f34e96b185b5"
+, gitCommit ? "cfd361bd1dd30c96da405e6bbaa7e78f5f93dfda"
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "2.1.1";
+    version = "3.1.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nos-v";
       rev = "${version}";
-      hash = "sha256-G80vaHep72iovnlIgqqjaQOYYtn83UJG7XrXnI/WO70=";
+      hash = "sha256-Pkre+ZZsREDxJLCoIoPN1HQDuUa2H1IQyKB3omg6qaU=";
     };
   };
 
@@ -43,10 +44,15 @@ in
     hardeningDisable = [ "all" ];
     dontStrip = true;
     separateDebugInfo = true;
-    configureFlags = [ "--with-ovni=${ovni}" ];
+    configureFlags = [
-    buildInputs = [
+      "--with-ovni=${ovni}"
+      "CACHELINE_WIDTH=${toString cacheline}"
+    ];
+    nativeBuildInputs = [
       autoreconfHook
       pkg-config
+    ];
+    buildInputs = [
       numactl
       hwloc
       ovni

pkgs/osu/default.nix

@@ -3,8 +3,16 @@
 , fetchurl
 , mpi
 , lib
+, symlinkJoin
 }:
 
+let
+  mpiAll = symlinkJoin {
+    name = "mpi-all";
+    paths = [ mpi.all ];
+  };
+in
+
 stdenv.mkDerivation rec {
   version = "7.1-1";
   name = "osu-micro-benchmarks-${version}";
@@ -16,11 +24,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   enableParallelBuilding = true;
-  buildInputs = [ mpi ];
+  buildInputs = [ mpiAll ];
   hardeningDisable = [ "all" ];
   configureFlags = [ 
-      "CC=${mpi}/bin/mpicc"
+      "CC=mpicc"
-      "CXX=${mpi}/bin/mpicxx"
+      "CXX=mpicxx"
   ];
 
   postInstall = ''

pkgs/ovni/default.nix

@@ -7,21 +7,23 @@
 , useGit ? false
 , gitBranch ? "master"
 , gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git"
-, gitCommit ? "7a33deffb7aaae70527125d48428f22169c9d39e"
+, gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
 , enableDebug ? false
+# Only enable MPI if the build is native (fails on cross-compilation)
+, useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "1.4.1";
+    version = "1.11.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "ovni";
       rev = "${version}";
-      hash = "sha256-/vv7Yy6dzoxuHjMc0h/vFFwWzysPLXFZIN2rbLT/SC8=";
+      hash = "sha256-DEZUK1dvbPGH5WYkZ2hpP5PShkMxXkHOqMwgYUHHxeM=";
-    } // { shortRev = "7a33def"; };
+    } // { shortRev = "a7103f8"; };
   };
 
   git = rec {
@@ -43,9 +45,12 @@ in
     postPatch = ''
       patchShebangs --build test/
     '';
-    buildInputs = [ cmake mpi ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = lib.optionals (useMpi) [ mpi ];
     cmakeBuildType = if (enableDebug) then "Debug" else "Release";
-    cmakeFlags = [ "-DOVNI_GIT_COMMIT=${src.shortRev}" ];
+    cmakeFlags = [
+      "-DOVNI_GIT_COMMIT=${src.shortRev}"
+    ] ++ lib.optionals (!useMpi) [ "-DUSE_MPI=OFF" ];
     preCheck = ''
       export CTEST_OUTPUT_ON_FAILURE=1
     '';

pkgs/paraver/default.nix

@@ -10,6 +10,7 @@
 , paraverKernel
 , openssl
 , glibcLocales
+, wrapGAppsHook
 }:
 
 let
@@ -48,6 +49,10 @@ stdenv.mkDerivation rec {
     "--with-openssl=${openssl.dev}"
   ];
 
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
   buildInputs = [
     autoreconfHook
     boost
@@ -58,7 +63,6 @@ stdenv.mkDerivation rec {
     automake
     paraverKernel
     openssl.dev
-    paraverKernel
   ];
 
   postInstall = ''
@@ -69,5 +73,9 @@ stdenv.mkDerivation rec {
     # cp -p ${paraverKernel}/include/* $out/include
     cp -a ${paraverKernel}/lib/paraver-kernel $out/lib/paraver-kernel
     cp -p ${paraverKernel}/share/filters-config/* $out/share/filters-config
+
+    # Move man files to proper location
+    mkdir -p $out/share/man
+    mv $out/share/doc/wxparaver_help_contents/man $out/share/man/man1
   '';
 }

pkgs/paraver/kernel.nix

@@ -4,14 +4,15 @@
 , boost
 , libxml2
 , xml2
-, wxGTK30
+, wxGTK32
 , autoconf
 , automake
 , pkg-config
+, zlib
 }:
 
 let
-  wx = wxGTK30;
+  wx = wxGTK32;
 in
 stdenv.mkDerivation rec {
   pname = "paraver-kernel";
@@ -51,5 +52,6 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     pkg-config
+    zlib
   ];
 }

pkgs/sonar/default.nix

@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sonar";
-  version = "0.2.0";
+  version = "1.0.1";
   src = fetchFromGitHub {
     owner = "bsc-pm";
     repo = "sonar";
     rev = "${version}";
-    sha256 = "sha256-iQSw4PbFk0EALXPHpLBPPQ7U8Ed8fkez1uG9MuF6PJo=";
+    sha256 = "sha256-DazOEaiMfJLrZNtmQEEHdBkm/m4hq5e0mPEfMtzYqWk=";
   };
   hardeningDisable = [ "all" ];
   dontStrip = true;

pkgs/tagaspi/default.nix

@@ -11,8 +11,16 @@
 , numactl
 , rdma-core
 , gfortran
+, symlinkJoin
 }:
 
+let
+  mpiAll = symlinkJoin {
+    name = "mpi-all";
+    paths = [ mpi.all ];
+  };
+in
+
 stdenv.mkDerivation rec {
   pname = "tagaspi";
   enableParallelBuilding = true;
@@ -32,10 +40,10 @@ stdenv.mkDerivation rec {
     autoconf
     libtool
     boost
-    mpi
     numactl
     rdma-core
     gfortran
+    mpiAll
   ];
 
   dontDisableStatic = true;

pkgs/tampi/default.nix

@@ -1,5 +1,6 @@
 {
   stdenv
+, lib
 , fetchFromGitHub
 , automake
 , autoconf
@@ -9,20 +10,26 @@
 , mpi
 , gcc
 , autoreconfHook
+, enableOvni ? true
+, ovni ? null
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git"
 , gitBranch ? "master"
-, gitCommit ? "16f92094ca6da25e2f561c000f5fbc2901944f7b"
+, gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
 }:
 
+with lib;
+
+assert enableOvni -> (ovni != null);
+
 let
   release = rec {
-    version = "3.0";
+    version = "4.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "tampi";
       rev = "v${version}";
-      hash = "sha256-qdWBxPsXKM428F2ojt2B6/0ZsQyGzEiojNaqbhDmrks=";
+      hash = "sha256-R7ew5tsrxGReTvOeeZe1FD0oThBhOHoDGv6Mo2sbmDg=";
     };
   };
   git = rec {
@@ -48,7 +55,8 @@ in stdenv.mkDerivation rec {
     boost
     mpi
     gcc
-  ];
+  ] ++ optional (enableOvni) ovni;
+  configureFlags = optional (enableOvni) "--with-ovni=${ovni}";
   dontDisableStatic = true;
   hardeningDisable = [ "all" ];
 }

pkgs/vivado/default.nix

@@ -0,0 +1,55 @@
+# Thanks to MLabs to made the switch.
+
+{
+  stdenv
+, lib
+, ncurses5
+, libxcrypt-legacy
+, zlib
+, libuuid
+, xorg
+, freetype
+, fontconfig
+, buildFHSEnv
+}:
+
+with lib;
+
+let
+  vivadoDeps = pkgs:
+    let
+      # Apply patch from https://github.com/nix-community/nix-environments/pull/54
+      # to fix ncurses libtinfo.so's soname issue
+      ncurses' = ncurses5.overrideAttrs (old: {
+        configureFlags = old.configureFlags ++ ["--with-termlib"];
+        postFixup = "";
+      });
+    in [
+      libxcrypt-legacy
+      (ncurses'.override {unicodeSupport = false;})
+      zlib
+      libuuid
+      xorg.libSM
+      xorg.libICE
+      xorg.libXrender
+      xorg.libX11
+      xorg.libXext
+      xorg.libXtst
+      xorg.libXi
+      freetype
+      fontconfig
+    ];
+
+  vivadoEnv = buildFHSEnv {
+    name = "vivado-env";
+    targetPkgs = vivadoDeps;
+  };
+
+  vivado = buildFHSEnv {
+    name = "vivado";
+    targetPkgs = vivadoDeps;
+    profile = "set -e; source /opt/Xilinx/Vivado/2024.2/settings64.sh";
+    runScript = "vivado";
+  };
+in
+  vivadoEnv

test/compilers/clang-openmp-ld.nix

@@ -0,0 +1,46 @@
+{
+  stdenv
+, writeText
+, openmp
+}:
+
+let
+  hello_c = writeText "hello.c" ''
+  int main(int argc, char *argv[])
+  {
+    #pragma omp parallel
+    {
+    }
+
+    return 0;
+  }
+  '';
+
+in stdenv.mkDerivation {
+  pname = "openmp-test-ld";
+  version = "1.0.0";
+
+  dontUnpack = true;
+  dontConfigure = true;
+
+  # nOS-V requires access to /sys/devices to request NUMA information. It will
+  # fail to run otherwise, so we disable the sandbox for this test.
+  __noChroot = true;
+
+  buildInputs = [ openmp ];
+
+  buildPhase = ''
+    set -x
+
+    cp ${hello_c} hello.c
+    clang -fopenmp=libompv ./hello.c -o hello
+
+    set +x
+  '';
+
+  installPhase = ''
+    touch $out
+  '';
+
+}
+