Add clsparse

overlay.nix

@@ -7,33 +7,6 @@ let
   callPackage = final.callPackage;
 
   bscPkgs = {
-
-    # override stdenv to add a sentinel to know if a derivation comes
-    # from unfree sources.
-    stdenv = prev.stdenv // {
-      mkDerivation =
-        args:
-        let
-          originalDrv = prev.stdenv.mkDerivation args;
-          checkLicense = l: if builtins.isAttrs l then !(l.free or true) else false;
-
-          licenses = if builtins.isList args.meta.license then args.meta.license else [ args.meta.license ];
-
-          hasUnfreeLicense =
-            if args ? meta && args.meta ? license then builtins.any checkLicense licenses else false;
-        in
-        if hasUnfreeLicense then
-          builtins.traceVerbose "adding nix-support/private to ${originalDrv.name or originalDrv.pname}" (
-          originalDrv.overrideAttrs (old: {
-            postInstall = (old.postInstall or "") + ''
-              mkdir -p $out/nix-support
-              touch $out/nix-support/private
-            '';
-          }))
-        else
-          originalDrv;
-    };
-
     agenix = prev.callPackage ./pkgs/agenix/default.nix { };
     amd-uprof = prev.callPackage ./pkgs/amd-uprof/default.nix { };
     bench6 = callPackage ./pkgs/bench6/default.nix { };
@@ -44,6 +17,7 @@ let
     clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
     clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
     cudainfo = prev.callPackage ./pkgs/cudainfo/default.nix { };
+    clsparse = callPackage ./pkgs/clsparse/package.nix { };
     #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 { };

pkgs/clsparse/install_target.patch

@@ -0,0 +1,53 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d139ed..15ffc14 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -176,32 +179,22 @@ if( BUILD_clSPARSE OR BUILD_SAMPLES )
+   if( BUILD_clSPARSE )
+     message( STATUS "Setting up clSPARSE external..." )
+ 
+-    if ( BUILD_SAMPLES )
+-      # If the user elects to build samples, then we must build and install clSPARSE
+-      # The install location is set as a subdirectory of the SuperBuild
+-      ExternalProject_Add(
+-        clSPARSE
+-        DEPENDS ${clSPARSE.Dependencies}
+-        SOURCE_DIR ${PROJECT_SOURCE_DIR}/src
+-        BINARY_DIR clSPARSE-build
+-        INSTALL_DIR clSPARSE-package
+-        CMAKE_ARGS ${clSPARSE.Cmake.Args} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+-        -DBUILD_CLVERSION=${BUILD_CLVERSION} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+-        -DUSE_SYSTEM_CL2HPP:BOOL=${USE_SYSTEM_CL2HPP}
+-      )
+-    else( )
+-      # If the user does not want to build samples, then build clSPARSE but don't automatically
+-      # install it
+-      ExternalProject_Add(
+-        clSPARSE
+-        DEPENDS ${clSPARSE.Dependencies}
+-        SOURCE_DIR ${PROJECT_SOURCE_DIR}/src
+-        BINARY_DIR clSPARSE-build
+-        CMAKE_ARGS ${clSPARSE.Cmake.Args} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+-        -DBUILD_CLVERSION=${BUILD_CLVERSION} -DUSE_SYSTEM_CL2HPP:BOOL=${USE_SYSTEM_CL2HPP}
+-        INSTALL_COMMAND ""
+-      )
+-    endif( )
++    ExternalProject_Add(
++      clSPARSE
++      DEPENDS ${clSPARSE.Dependencies}
++      SOURCE_DIR ${PROJECT_SOURCE_DIR}/src
++      BINARY_DIR clSPARSE-build
++      INSTALL_DIR clSPARSE-package
++      CMAKE_ARGS ${clSPARSE.Cmake.Args} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
++      -DBUILD_CLVERSION=${BUILD_CLVERSION} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
++      -DUSE_SYSTEM_CL2HPP:BOOL=${USE_SYSTEM_CL2HPP}
++    )
++
++    install(
++      DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/clSPARSE-package/
++      DESTINATION ${CMAKE_INSTALL_PREFIX}
++      USE_SOURCE_PERMISSIONS
++    )
+ 
+   endif( )
+ 

pkgs/clsparse/package.nix

@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  boost,
+  gtest,
+  ocl-icd,
+  opencl-headers,
+  opencl-clhpp,
+  cmake,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "clsparse";
+  version = "0.10.2.0";
+
+  src = fetchFromGitHub {
+    owner = "clMathLibraries";
+    repo = "clSPARSE";
+    rev = "v${version}";
+    hash = "sha256-jIauCtUyPEIx7pFI3qH0WagV+t/fvro0OsGgONBJm0s=";
+  };
+
+  patches = [
+    ./pass_include_dir.patch
+    ./install_target.patch
+    (fetchpatch {
+      name = "remove-gettypecode.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/clMathLibraries/clSPARSE/pull/210.patch";
+      hash = "sha256-9Q+tk7RMdWE4MCnbvWlsI0MIgBYKIWR2jIC1bICtIjU=";
+    })
+  ];
+
+  postInstallPhase = ''
+    mv $installDir/lib64 lib
+    ln -s lib/ lib64
+  '';
+
+  env.NIX_CFLAGS_COMPILE = "-std=c++17";
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    boost
+    ocl-icd
+    opencl-headers
+    opencl-clhpp
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_Boost=OFF"
+    "-DBUILD_gMock=OFF"
+    "-DBUILD_MTX=OFF"
+    "-DBUILD_SAMPLES=OFF"
+    "-DUSE_SYSTEM_CL2HPP=ON"
+    "-DGMOCK_ROOT=${gtest}"
+    "-DGTEST_INCLUDE_DIR=${gtest.src}/googletest/include"
+  ];
+
+  meta = {
+    description = "A software library containing Sparse functions written in OpenCL";
+    homepage = "https://github.com/clMathLibraries/clSPARSE";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ leixb ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/clsparse/pass_include_dir.patch

@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d139ed..b7ea2d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,6 +132,9 @@ else( )
+       set( GMOCK_ROOT "$ENV{GMOCK_ROOT}" )
+     endif( )
+     list( APPEND clSPARSE.Cmake.Args -DGTEST_ROOT=${GMOCK_ROOT} )
++    if( DEFINED GTEST_INCLUDE_DIR )
++      list( APPEND clSPARSE.Cmake.Args -DGTEST_INCLUDE_DIR=${GTEST_INCLUDE_DIR} )
++    endif( )
+   endif( )
+ endif( )
+ 

pkgs/intel-oneapi/2023.nix

@@ -50,15 +50,11 @@ let
     ];
     phases = [ "installPhase" ];
     installPhase = ''
-      runHook preInstall
-
       awk -F': ' '\
         BEGIN   { print "[ {" } \
         NR>1 && /^Package: / { print "} {"; } \
         /: /    { printf "%s = \"%s\";\n", $1, $2 } \
         END     { print "} ]" }' $srcs > $out
-
-      runHook postInstall
     '';
   };
 
@@ -92,15 +88,11 @@ let
     nativeBuildInputs = [ dpkg ];
     phases = [ "installPhase" ];
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out
       for src in $srcs; do
         echo "unpacking $src"
         dpkg -x $src $out
       done
-
-      runHook postInstall
     '';
 
     inherit meta;
@@ -139,8 +131,6 @@ let
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,etc,lib,include}
       mkdir -p $out/share/man
 
@@ -157,8 +147,6 @@ let
         # Broken due missing libze_loader.so.1
         rsync -a --exclude IMB-MPI1-GPU bin/ $out/bin/
       popd
-
-      runHook postInstall
     '';
     preFixup = ''
       for i in $out/bin/mpi* ; do
@@ -197,8 +185,6 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/lib
 
       cd $src
@@ -207,8 +193,6 @@ let
         # Libraries
         rsync -a lib/intel64/gcc4.8/ $out/lib/
       popd
-
-      runHook postInstall
     '';
 
     inherit meta;
@@ -244,8 +228,6 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -270,8 +252,6 @@ let
           rsync -a compiler/include/ $out/include/
         popd
       popd
-
-      runHook postInstall
     '';
 
     inherit meta;
@@ -313,8 +293,6 @@ let
     dontStrip = true;
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -340,10 +318,7 @@ let
 
         # Fix lib_lin
         ln -s $out/lib $out/lib_lin
-
       popd
-
-      runHook postInstall
     '';
 
     inherit meta;
@@ -406,8 +381,6 @@ let
     dontStrip = true;
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib}
       mkdir -p $out/share/man
 
@@ -435,8 +408,6 @@ let
         # Manuals
         rsync -a documentation/en/man/common/ $out/share/man/
       popd
-
-      runHook postInstall
     '';
 
     inherit meta;