public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58536 from markuskowa/fix-clblas

Browse Source 
clblas: turn of gtest, fix build
This commit is contained in:
Silvan Mosberger 2019-03-29 16:36:02 +01:00 committed by GitHub
commit 106b52bac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/science/math/clblas/default.nix
View File

@ -8,21 +8,20 @@
, ocl-icd , ocl-icd
, opencl-headers , opencl-headers
, Accelerate, CoreGraphics, CoreVideo, OpenCL , Accelerate, CoreGraphics, CoreVideo, OpenCL
, gtest
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clblas-${version}"; name = "clblas-${version}";
version = "2.12"; version = "2.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "clMathLibraries"; owner = "clMathLibraries";
repo = "clBLAS"; repo = "clBLAS";
rev = "v${version}"; rev = "v${version}";
sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
}; };
patches = [ ./platform.patch ]; patches = [ ./platform.patch ];
postPatch = '' postPatch = ''
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DUSE_SYSTEM_GTEST=ON" "-DBUILD_TEST=OFF"
]; ];
buildInputs = [ buildInputs = [
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
blas blas
python python
boost boost
gtest
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
ocl-icd ocl-icd
opencl-headers opencl-headers
@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/clMathLibraries/clBLAS"; homepage = "https://github.com/clMathLibraries/clBLAS";
description = "A software library containing BLAS functions written in OpenCL"; description = "A software library containing BLAS functions written in OpenCL";
longDescription = '' longDescription = ''
This package contains a library of BLAS functions on top of OpenCL. This package contains a library of BLAS functions on top of OpenCL.
''; '';
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ artuuge ]; maintainers = with maintainers; [ artuuge ];

3
pkgs/development/python-modules/libgpuarray/default.nix
View File

@ -66,8 +66,9 @@ buildPythonPackage rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
cmake
cython cython
nose nose
]; ];