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

switch to the default versions of numpy and scipy in libgpuarray-cuda

This commit is contained in:
artuuge 2016-06-16 00:03:07 +02:00
parent d1f38e2adc
commit bc41a7d551
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,14 +18,7 @@
, 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";
@ -104,7 +97,7 @@ EOF
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy numpy
scipy_numpy scipy
nose nose
six six
Mako Mako

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

@ -11891,8 +11891,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; inherit (self) numpy scipy;
inherit (self) scipy;
inherit (pkgs.linuxPackages) nvidia_x11; inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit75; cudatoolkit = pkgs.cudatoolkit75;
clblas = pkgs.clblas-cuda; clblas = pkgs.clblas-cuda;