Add TAOpenCL

overlay.nix

@@ -60,6 +60,7 @@ let
     tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
     tampi = callPackage ./pkgs/tampi/default.nix { };
     upc-qaire-exporter = prev.callPackage ./pkgs/upc-qaire-exporter/default.nix { };
+    taopencl = callPackage ./pkgs/taopencl/default.nix { };
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 

pkgs/paraver/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{
+  stdenv
 , lib
 , fetchFromGitHub
 , autoreconfHook
@@ -12,17 +13,14 @@
 , openssl
 , glibcLocales
 , wrapGAppsHook
-
-, enableDebug ? false
 }:
 
 let
   wx = wxGTK32;
-  version = "4.12.0";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "wxparaver";
-  inherit version;
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -39,26 +37,21 @@ stdenv.mkDerivation {
     ./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;
 
-  hardeningDisable = [ "all" ];
+  preConfigure = ''
-
+    export CFLAGS="-O3"
-  dontStrip = true;
+    export CXXFLAGS="-O3"
-
+  '';
-  env =
-    let
-      flags = if enableDebug then "-ggdb -Og" else "-O3";
-    in
-    {
-      CFLAGS = flags;
-      CXXFLAGS = flags;
-    };
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -76,11 +69,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    libxml2
+    libxml2.dev
     xml2
     wx
     paraverKernel
-    openssl
+    openssl.dev
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{
+  stdenv
 , lib
 , fetchFromGitHub
 , autoreconfHook
@@ -9,16 +10,11 @@
 , automake
 , pkg-config
 , zlib
-
-, enableDebug ? false
 }:
 
-let
+stdenv.mkDerivation rec {
-  version = "4.12.0";
-in
-stdenv.mkDerivation {
   pname = "paraver-kernel";
-  inherit version;
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -39,14 +35,10 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  env =
+  preConfigure = ''
-    let
+    export CFLAGS="-O3 -DPARALLEL_ENABLED"
-      flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
+    export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
-    in
+  '';
-    {
-      CFLAGS = flags;
-      CXXFLAGS = flags;
-    };
 
   configureFlags = [
     "--with-boost=${boost}"

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" ];
+})