about summary refs log tree commit diff
path: root/pkgs/development/python-modules/Theano
diff options
context:
space:
mode:
authorRyan Burns <rtburns@protonmail.com>2021-09-21 01:07:45 -0700
committerRyan Burns <rtburns@protonmail.com>2021-09-22 23:29:17 -0700
commit63391899a35d732e85eb90efb8cf0c59d12f1c11 (patch)
treec1567271956914c7ca816d96da1fa1cc81fa69e8 /pkgs/development/python-modules/Theano
parent11bf0ac25ba3a87f574f4b896646ebb2581edadf (diff)
pythonPackages.Theano: fix cuda package
* add missing setuptools for cuda
* remove unused nvidia_x11
Diffstat (limited to 'pkgs/development/python-modules/Theano')
-rw-r--r--pkgs/development/python-modules/Theano/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index e279100e9cc68..351f8dc9b7117 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -8,19 +8,15 @@
 , nose
 , numpy
 , scipy
+, setuptools
 , six
 , libgpuarray
 , cudaSupport ? false, cudatoolkit
 , cudnnSupport ? false, cudnn
-, nvidia_x11
 }:
 
 assert cudnnSupport -> cudaSupport;
 
-assert cudaSupport -> nvidia_x11 != null
-                   && cudatoolkit != null
-                   && cudnn != null;
-
 let
   wrapped = command: buildTop: buildInputs:
     runCommandCC "${command}-wrapped" { inherit buildInputs; } ''
@@ -81,7 +77,15 @@ in buildPythonPackage rec {
 
   # keep Nose around since running the tests by hand is possible from Python or bash
   checkInputs = [ nose ];
-  propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ];
+  # setuptools needed for cuda support
+  propagatedBuildInputs = [
+    libgpuarray_
+    numpy
+    numpy.blas
+    scipy
+    setuptools
+    six
+  ];
 
   pythonImportsCheck = [ "theano" ];