switch to the default versions of numpy and scipy in libgpuarray-cuda
This commit is contained in:
parent
d1f38e2adc
commit
bc41a7d551
|
@ -18,14 +18,7 @@
|
|||
, python
|
||||
, cudatoolkit
|
||||
, 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 {
|
||||
name = "libgpuarray-cuda-${version}";
|
||||
version = "-9998.0";
|
||||
|
@ -104,7 +97,7 @@ EOF
|
|||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy_numpy
|
||||
scipy
|
||||
nose
|
||||
six
|
||||
Mako
|
||||
|
|
|
@ -11891,8 +11891,7 @@ in modules // {
|
|||
});
|
||||
|
||||
libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
|
||||
numpy = self.numpy_1_10;
|
||||
inherit (self) scipy;
|
||||
inherit (self) numpy scipy;
|
||||
inherit (pkgs.linuxPackages) nvidia_x11;
|
||||
cudatoolkit = pkgs.cudatoolkit75;
|
||||
clblas = pkgs.clblas-cuda;
|
||||
|
|
Loading…
Reference in a new issue