Rewrite choice of cuDNN definitions.

theano/gpuarray/c_code/dnn_rnn_desc.c

@@ -29,11 +29,17 @@ int dnn_rnn_desc(int hidden_size, int num_layers,
     PyErr_SetString(PyExc_RuntimeError, "Can't create RNN descriptor");
     return -1;
   }
-
+  #if CUDNN_MAJOR < 7
+  err = cudnnSetRNNDescriptor(desc, hidden_size, num_layers, ddesc,
+                              (cudnnRNNInputMode_t)input_mode,
+                              (cudnnDirectionMode_t)direction_mode,
+                              (cudnnRNNMode_t)rnn_mode, data_type);
+  #else
   err = cudnnSetRNNDescriptor(_handle, desc, hidden_size, num_layers, ddesc,
                               (cudnnRNNInputMode_t)input_mode,
                               (cudnnDirectionMode_t)direction_mode,
                               (cudnnRNNMode_t)rnn_mode, CUDNN_RNN_ALGO_STANDARD, data_type);
+  #endif
   if (err != CUDNN_STATUS_SUCCESS) {
     cudnnDestroyRNNDescriptor(desc);
     PyErr_SetString(PyExc_RuntimeError, "Can't set RNN descriptor");

theano/gpuarray/cudnn_defs.py

@@ -103,7 +103,7 @@ class CuDNNV6(CuDNNV51):
                                 # new in v6
                                 ('CUDNN_DATA_INT8', 'int8'),
                                 ('CUDNN_DATA_INT32', 'int32'),
-#                                ('CUDNN_DATA_INT8X4', 'int8x4'),
+                                # ('CUDNN_DATA_INT8X4', 'int8x4'),
                                 ctype='cudnnDataType_t')
 
     cudnnPoolingMode_t = CEnumType(('CUDNN_POOLING_MAX', 'max'),
@@ -133,15 +133,17 @@ class CuDNNV6(CuDNNV51):
                                       ('CUDNN_REDUCE_TENSOR_NORM2', 'norm2'),
                                       ctype='cudnnReduceTensorOp_t')
 
+
 class CuDNNV7(CuDNNV6):
     version = 7
     cudnnMathType_t = CEnumType(('CUDNN_DEFAULT_MATH', 'non_tensor_op'),
                                 ('CUDNN_TENSOR_OP_MATH', 'tensor_op'),
-                                ctype = 'cudnnMathType_t') 
+                                ctype='cudnnMathType_t')
     cudnnDeterminism_t = CEnumType(('CUDNN_NON_DETERMINISTIC', 'non_deterministic'),
                                    ('CUDNN_DETERMINISTIC', 'deterministic'),
-                                   ctype = 'cudnnDeterminism_t') 
-    
+                                   ctype='cudnnDeterminism_t')
+
+
 def get_definitions(cudnn_version=None):
     """
     Return cuDNN definitions to be used by Theano for the given cuDNN version.
@@ -151,7 +153,10 @@ def get_definitions(cudnn_version=None):
     if None, return definitions for the  most recent supported cuDNN version.
 
     """
-    if cudnn_version is not None and cudnn_version // 1000 == 6:
-        return CuDNNV6()
+    if cudnn_version is not None:
+        if cudnn_version // 1000 == 5:
+            return CuDNNV51()
+        if cudnn_version // 1000 == 6:
+            return CuDNNV6()
     # By default, we use definitions for the last supported cuDNN version.
     return CuDNNV7()

theano/gpuarray/dnn.py

@@ -90,7 +90,7 @@ def _dnn_lib():
                     if lib_name:
                         break
             if lib_name is None:
-                raise RuntimeError('Could not find cudnn library (looked for v5* or v6*)')
+                raise RuntimeError('Could not find cudnn library (looked for v5* to v7*)')
             else:
                 dnn_handle = ctypes.cdll.LoadLibrary(lib_name)