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

make clblas-cuda and libgpuarray-cuda more functorial

Browse Source
This commit is contained in:
artuuge 2016-06-14 20:01:51 +02:00
parent 93a11d8b0f
commit d1f38e2adc
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,14 @@
, python , python
, cudatoolkit , cudatoolkit
, nvidia_x11 , nvidia_x11
, setuptools
}: }:
let
scipy_numpy = scipy.override (let inherit numpy; in {
passthru = { blas = numpy.blas; };
propagatedBuildInputs = [ numpy.blas numpy ] ++ [ python setuptools ];
});
in
buildPythonPackage rec { buildPythonPackage rec {
name = "libgpuarray-cuda-${version}"; name = "libgpuarray-cuda-${version}";
version = "-9998.0"; version = "-9998.0";
@ -98,7 +104,7 @@ EOF
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy numpy
scipy scipy_numpy
nose nose
six six
Mako Mako

6
pkgs/top-level/all-packages.nix
View File

@ -1550,8 +1550,6 @@ in
libbladeRF = callPackage ../development/libraries/libbladeRF { }; libbladeRF = callPackage ../development/libraries/libbladeRF { };
libgpuarray-cuda = python34Packages.libgpuarray-cuda;
lp_solve = callPackage ../applications/science/math/lp_solve { }; lp_solve = callPackage ../applications/science/math/lp_solve { };
lprof = callPackage ../tools/graphics/lprof { }; lprof = callPackage ../tools/graphics/lprof { };
@ -15950,10 +15948,6 @@ in
clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda { clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda {
cudatoolkit = pkgs.cudatoolkit75; cudatoolkit = pkgs.cudatoolkit75;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
python = pkgs.python34Packages.python;
boost = pkgs.boost159.override {
inherit python;
};
}; };
jags = callPackage ../applications/science/math/jags { }; jags = callPackage ../applications/science/math/jags { };

9
pkgs/top-level/python-packages.nix
View File

@ -11892,14 +11892,7 @@ in modules // {
libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec { libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
numpy = self.numpy_1_10; numpy = self.numpy_1_10;
scipy = self.buildScipyPackage rec { inherit (self) scipy;
version = "0.17.1";
src = pkgs.fetchurl {
url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
};
inherit numpy;
};
inherit (pkgs.linuxPackages) nvidia_x11; inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit75; cudatoolkit = pkgs.cudatoolkit75;
clblas = pkgs.clblas-cuda; clblas = pkgs.clblas-cuda;