fix for V5 GA RNN APIs

1 files changed, 107 insertions, 99 deletions

diff --git a/ffi.lua b/ffi.lua
index ce15950..7b07124 100644
--- a/ffi.lua
+++ b/ffi.lua
@@ -1241,146 +1241,154 @@ cudnnStatus_t             cudnnCreateRNNDescriptor(cudnnRNNDescriptor_t * rnnDes
 cudnnStatus_t             cudnnDestroyRNNDescriptor(cudnnRNNDescriptor_t rnnDesc);
 
 cudnnStatus_t             cudnnSetRNNDescriptor(cudnnRNNDescriptor_t rnnDesc,
-                                                int hiddenSize,
-                                                int seqLength,
-                                                int numLayers,
-                                                cudnnDropoutDescriptor_t dropoutDesc, /* Between layers, not between recurrent steps.*/
-                                                cudnnRNNInputMode_t inputMode,
-                                                cudnnDirectionMode_t direction,
-                                                cudnnRNNMode_t mode,
+                                                int hiddenSize, 
+                                                int numLayers, 
+                                                cudnnDropoutDescriptor_t dropoutDesc, 
+                                                cudnnRNNInputMode_t inputMode,                                                 
+                                                cudnnDirectionMode_t direction, 
+                                                cudnnRNNMode_t mode, 
                                                 cudnnDataType_t dataType);
 
 
-/* dataType in the RNN descriptor is used to determine math precision*/
-/* dataType in weight descriptors and input descriptors is used to describe storage*/
+// dataType in the RNN descriptor is used to determine math precision
+// dataType in weight descriptors and input descriptors is used to describe storage
 
 cudnnStatus_t             cudnnGetRNNWorkspaceSize( cudnnHandle_t              handle,
-                                                    const cudnnRNNDescriptor_t rnnDesc,
+                                                    const cudnnRNNDescriptor_t rnnDesc,  
+                                                    const int seqLength, 
                                                     const cudnnTensorDescriptor_t    *xDesc,
                                                     size_t                     *sizeInBytes
                                                     );
-
+                                                      
 cudnnStatus_t             cudnnGetRNNTrainingReserveSize( cudnnHandle_t              handle,
-                                                          const cudnnRNNDescriptor_t rnnDesc,
+                                                          const cudnnRNNDescriptor_t rnnDesc,  
+                                                          const int seqLength, 
                                                           const cudnnTensorDescriptor_t    *xDesc,
                                                           size_t                     *sizeInBytes
                                                     );
 
-
+                                                    
 cudnnStatus_t             cudnnGetRNNParamsSize( cudnnHandle_t              handle,
-                                                 const cudnnRNNDescriptor_t rnnDesc,
-                                                 const cudnnTensorDescriptor_t    *xDesc,
-                                                 size_t                     *sizeInBytes
+                                                 const cudnnRNNDescriptor_t rnnDesc,  
+                                                 const cudnnTensorDescriptor_t    xDesc,                                                    
+                                                 size_t                     *sizeInBytes,
+                                                 cudnnDataType_t dataType
                                                     );
 
 cudnnStatus_t             cudnnGetRNNLinLayerMatrixParams( cudnnHandle_t              handle,
-                             const cudnnRNNDescriptor_t rnnDesc,
+                             const cudnnRNNDescriptor_t rnnDesc,  
                              const int layer,
-                             const cudnnTensorDescriptor_t * xDesc,
-                             const cudnnFilterDescriptor_t wDesc,
-                             const void * w,
-                             const int linLayerID,
-                             cudnnFilterDescriptor_t linLayerMatDesc,
+                             const cudnnTensorDescriptor_t xDesc, 
+                             const cudnnFilterDescriptor_t wDesc, 
+                             const void * w, 
+                             const int linLayerID,  
+                             cudnnFilterDescriptor_t linLayerMatDesc, 
                              void ** linLayerMat
                              );
 
 cudnnStatus_t             cudnnGetRNNLinLayerBiasParams( cudnnHandle_t              handle,
-                             const cudnnRNNDescriptor_t rnnDesc,
+                             const cudnnRNNDescriptor_t rnnDesc,  
                              const int layer,
-                             const cudnnTensorDescriptor_t * xDesc,
-                             const cudnnFilterDescriptor_t wDesc,
-                             const void * w,
-                             const int linLayerID,
-                             cudnnFilterDescriptor_t linLayerBiasDesc,
-                             void ** linLayerBias
+                             const cudnnTensorDescriptor_t xDesc, 
+                             const cudnnFilterDescriptor_t wDesc, 
+                             const void * w, 
+                             const int linLayerID, 
+                             cudnnFilterDescriptor_t linLayerBiasDesc, 
+                             void ** linLayerBias                       
                              );
 
 
-cudnnStatus_t             cudnnRNNForwardInference( cudnnHandle_t handle,
-                                                    const cudnnRNNDescriptor_t rnnDesc,
-                                                    const cudnnTensorDescriptor_t * xDesc,
-                                                    const void * x,
-                                                    const cudnnTensorDescriptor_t hxDesc,
-                                                    const void * hx,
-                                                    const cudnnTensorDescriptor_t cxDesc,
-                                                    const void * cx,
-                                                    const cudnnFilterDescriptor_t wDesc,
-                                                    const void * w,
-                                                    const cudnnTensorDescriptor_t *yDesc,
-                                                    void * y,
-                                                    const cudnnTensorDescriptor_t hyDesc,
-                                                    void * hy,
-                                                    const cudnnTensorDescriptor_t cyDesc,
-                                                    void * cy,
-                                                    void * workspace,
-                                                    size_t workSpaceSizeInBytes);
-
-
-
-cudnnStatus_t             cudnnRNNForwardTraining( cudnnHandle_t handle,
-                                                   const cudnnRNNDescriptor_t rnnDesc,
-                                                   const cudnnTensorDescriptor_t *xDesc,
-                                                   const void * x,
-                                                   const cudnnTensorDescriptor_t hxDesc,
-                                                   const void * hx,
-                                                   const cudnnTensorDescriptor_t cxDesc,
-                                                   const void * cx,
-                                                   const cudnnFilterDescriptor_t wDesc,
-                                                   const void * w,
-                                                   const cudnnTensorDescriptor_t *yDesc,
-                                                   void * y,
-                                                   const cudnnTensorDescriptor_t hyDesc,
-                                                   void * hy,
-                                                   const cudnnTensorDescriptor_t cyDesc,
-                                                   void * cy,
-                                                   void * workspace,
+cudnnStatus_t             cudnnRNNForwardInference( cudnnHandle_t handle, 
+                                                    const cudnnRNNDescriptor_t rnnDesc, 
+                                                    const int seqLength, 
+                                                    const cudnnTensorDescriptor_t * xDesc, 
+                                                    const void * x, 
+                                                    const cudnnTensorDescriptor_t hxDesc, 
+                                                    const void * hx, 
+                                                    const cudnnTensorDescriptor_t cxDesc, 
+                                                    const void * cx, 
+                                                    const cudnnFilterDescriptor_t wDesc, 
+                                                    const void * w, 
+                                                    const cudnnTensorDescriptor_t *yDesc,  
+                                                    void * y, 
+                                                    const cudnnTensorDescriptor_t hyDesc, 
+                                                    void * hy, 
+                                                    const cudnnTensorDescriptor_t cyDesc, 
+                                                    void * cy, 
+                                                    void * workspace, 
+                                                    size_t workSpaceSizeInBytes);             
+
+                                           
+
+cudnnStatus_t             cudnnRNNForwardTraining( cudnnHandle_t handle, 
+                                                   const cudnnRNNDescriptor_t rnnDesc, 
+                                                   const int seqLength, 
+                                                   const cudnnTensorDescriptor_t *xDesc, 
+                                                   const void * x, 
+                                                   const cudnnTensorDescriptor_t hxDesc, 
+                                                   const void * hx, 
+                                                   const cudnnTensorDescriptor_t cxDesc, 
+                                                   const void * cx, 
+                                                   const cudnnFilterDescriptor_t wDesc, 
+                                                   const void * w, 
+                                                   const cudnnTensorDescriptor_t *yDesc,  
+                                                   void * y, 
+                                                   const cudnnTensorDescriptor_t hyDesc, 
+                                                   void * hy, 
+                                                   const cudnnTensorDescriptor_t cyDesc, 
+                                                   void * cy, 
+                                                   void * workspace, 
                                                    size_t workSpaceSizeInBytes,
-                                                   void * reserveSpace,
+                                                   void * reserveSpace, 
                                                    size_t reserveSpaceSizeInBytes);
 
-cudnnStatus_t             cudnnRNNBackwardData( cudnnHandle_t handle,
-                                                const cudnnRNNDescriptor_t rnnDesc,
-                                                const cudnnTensorDescriptor_t * yDesc,
-                                                const void * y,
-                                                const cudnnTensorDescriptor_t * dyDesc,
-                                                const void * dy,
-                                                const cudnnTensorDescriptor_t dhyDesc,
-                                                const void * dhy,
-                                                const cudnnTensorDescriptor_t dcyDesc,
-                                                const void * dcy,
-                                                const cudnnFilterDescriptor_t wDesc,
-                                                const void * w,
-                                                const cudnnTensorDescriptor_t hxDesc,
-                                                const void * hx,
-                                                const cudnnTensorDescriptor_t cxDesc,
-                                                const void * cx,
-                                                const cudnnTensorDescriptor_t * dxDesc,
-                                                void * dx,
+cudnnStatus_t             cudnnRNNBackwardData( cudnnHandle_t handle, 
+                                                const cudnnRNNDescriptor_t rnnDesc, 
+                                                const int seqLength, 
+                                                const cudnnTensorDescriptor_t * yDesc, 
+                                                const void * y,                                                
+                                                const cudnnTensorDescriptor_t * dyDesc, 
+                                                const void * dy, 
+                                                const cudnnTensorDescriptor_t dhyDesc, 
+                                                const void * dhy, 
+                                                const cudnnTensorDescriptor_t dcyDesc, 
+                                                const void * dcy, 
+                                                const cudnnFilterDescriptor_t wDesc, 
+                                                const void * w, 
+                                                const cudnnTensorDescriptor_t hxDesc, 
+                                                const void * hx,                                                                  
+                                                const cudnnTensorDescriptor_t cxDesc, 
+                                                const void * cx,                                                 
+                                                const cudnnTensorDescriptor_t * dxDesc, 
+                                                void * dx, 
                                                 const cudnnTensorDescriptor_t dhxDesc,
                                                 void * dhx,
                                                 const cudnnTensorDescriptor_t dcxDesc,
                                                 void * dcx,
                                                 void * workspace,
                                                 size_t workSpaceSizeInBytes,
-                                                const void * reserveSpace,
+                                                const void * reserveSpace, 
                                                 size_t reserveSpaceSizeInBytes );
 
 
-cudnnStatus_t             cudnnRNNBackwardWeights( cudnnHandle_t handle,
-                                                   const cudnnRNNDescriptor_t rnnDesc,
-                                                   const cudnnTensorDescriptor_t * xDesc,
-                                                   const void * x,
-                                                   const cudnnTensorDescriptor_t hxDesc,
-                                                   const void * hx,
-                                                   const cudnnTensorDescriptor_t * yDesc,
+cudnnStatus_t             cudnnRNNBackwardWeights( cudnnHandle_t handle, 
+                                                   const cudnnRNNDescriptor_t rnnDesc, 
+                                                   const int seqLength, 
+                                                   const cudnnTensorDescriptor_t * xDesc, 
+                                                   const void * x, 
+                                                   const cudnnTensorDescriptor_t hxDesc, 
+                                                   const void * hx,                                                   
+                                                   const cudnnTensorDescriptor_t * yDesc, 
                                                    const void * y,
-                                                   const void * workspace,
-                                                   size_t workSpaceSizeInBytes,
-                                                   const cudnnFilterDescriptor_t dwDesc,
+                                                   const void * workspace, 
+                                                   size_t workSpaceSizeInBytes, 
+                                                   const cudnnFilterDescriptor_t dwDesc, 
                                                    void * dw,
-                                                   const void * reserveSpace,
+                                                   const void * reserveSpace, 
                                                    size_t reserveSpaceSizeInBytes );
-
+                                
+                                
+                                                                                                                        
 
 
 /* DEPRECATED routines to be removed next release :