From 357d8f600c943965d91ca810db9e6ca6a481b6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 15 Apr 2018 11:13:33 +0200 Subject: [PATCH 1/2] clblas: Enable darwin build --- .../libraries/science/math/clblas/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40b02d30341..7a653a58eb2 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -7,6 +7,7 @@ , python , ocl-icd , opencl-headers +, Accelerate, CoreGraphics, CoreVideo, OpenCL , gtest }: @@ -40,11 +41,19 @@ stdenv.mkDerivation rec { gfortran blas python - ocl-icd - opencl-headers boost gtest - ]; + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + OpenCL + ]; enableParallelBuilding = true; @@ -56,7 +65,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a515c543a91..47ecd3333e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19673,7 +19673,9 @@ with pkgs; blas = callPackage ../development/libraries/science/math/blas { }; - clblas = callPackage ../development/libraries/science/math/clblas { }; + clblas = callPackage ../development/libraries/science/math/clblas { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; + }; jags = callPackage ../applications/science/math/jags { }; From d96f0c5682a63e0eef72899a4e52164e1dde4e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 15 Apr 2018 18:34:45 +0200 Subject: [PATCH 2/2] pythonPackages.libgpuarray: enable darwin build --- pkgs/development/python-modules/libgpuarray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index c0c2b205f58..26fe33995ed 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { libraryPath = lib.makeLibraryPath ( [] ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] - ++ lib.optionals openclSupport [ ocl-icd clblas ] + ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); preBuild = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { postFixup = '' rm $out/lib/libgpuarray-static.a - + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 @@ -75,7 +75,7 @@ buildPythonPackage rec { description = "Library to manipulate tensors on GPU."; license = licenses.free; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }