From b437ff0037ba6692fc9d670ce6ba560ec0a8ff5f Mon Sep 17 00:00:00 2001
From: GaoWei8 <catherin.gao@foxmail.com>
Date: Tue, 15 Sep 2020 04:26:12 +0000
Subject: [PATCH] polish codes

---
 paddle/fluid/operators/cudnn_lstm_cache.h |  7 ++++++-
 paddle/fluid/platform/cudnn_helper.h      |  2 ++
 paddle/fluid/platform/dynload/cudnn.h     | 16 ++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/paddle/fluid/operators/cudnn_lstm_cache.h b/paddle/fluid/operators/cudnn_lstm_cache.h
index 4b46e2b475e..ccd612fbcc8 100644
--- a/paddle/fluid/operators/cudnn_lstm_cache.h
+++ b/paddle/fluid/operators/cudnn_lstm_cache.h
@@ -54,6 +54,7 @@ class ScopedRNNBase {
       x_descs_.emplace_back(x_desc_.descriptor<T>(dims_x, strides_x));
       y_descs_.emplace_back(y_desc_.descriptor<T>(dims_y, strides_y));
     }
+#if CUDNN_VERSION >= 7201
     if (!sequence_length.empty()) {
       x_seq_desc_.descriptor<T>(seq_length_, batch_size_, input_size_, true,
                                 sequence_length);
@@ -61,7 +62,7 @@ class ScopedRNNBase {
                                 hidden_size_ * numDirections, true,
                                 sequence_length);
     }
-
+#endif
     // ------------------- cudnn hx, hy, cx, cy descriptors----------
     std::vector<int> dims_hx = {num_layers_ * numDirections, batch_size_,
                                 hidden_size_};
@@ -125,8 +126,10 @@ class ScopedRNNBase {
   }
   cudnnTensorDescriptor_t* x_descs() { return x_descs_.data(); }
   cudnnTensorDescriptor_t* y_descs() { return y_descs_.data(); }
+#if CUDNN_VERSION >= 7201
   cudnnRNNDataDescriptor_t x_seq_desc() { return x_seq_desc_.desc(); }
   cudnnRNNDataDescriptor_t y_seq_desc() { return y_seq_desc_.desc(); }
+#endif
   cudnnTensorDescriptor_t init_h_desc() { return init_h_desc_.desc(); }
   cudnnTensorDescriptor_t init_c_desc() { return init_c_desc_.desc(); }
   cudnnTensorDescriptor_t last_h_desc() { return last_h_desc_.desc(); }
@@ -151,8 +154,10 @@ class ScopedRNNBase {
 
   platform::ScopedTensorDescriptor x_desc_;
   platform::ScopedTensorDescriptor y_desc_;
+#if CUDNN_VERSION >= 7201
   platform::ScopedRNNTensorDescriptor x_seq_desc_;
   platform::ScopedRNNTensorDescriptor y_seq_desc_;
+#endif
   platform::ScopedTensorDescriptor init_h_desc_;
   platform::ScopedTensorDescriptor init_c_desc_;
   platform::ScopedTensorDescriptor last_h_desc_;
diff --git a/paddle/fluid/platform/cudnn_helper.h b/paddle/fluid/platform/cudnn_helper.h
index bb4c2a89f6f..4b9c5c429da 100644
--- a/paddle/fluid/platform/cudnn_helper.h
+++ b/paddle/fluid/platform/cudnn_helper.h
@@ -294,6 +294,7 @@ class ScopedTensorDescriptor {
   DISABLE_COPY_AND_ASSIGN(ScopedTensorDescriptor);
 };
 
+#if CUDNN_VERSION >= 7201
 class ScopedRNNTensorDescriptor {
  public:
   ScopedRNNTensorDescriptor() {
@@ -337,6 +338,7 @@ class ScopedRNNTensorDescriptor {
   cudnnRNNDataDescriptor_t desc_;
   DISABLE_COPY_AND_ASSIGN(ScopedRNNTensorDescriptor);
 };
+#endif
 
 class ScopedDropoutDescriptor {
  public:
diff --git a/paddle/fluid/platform/dynload/cudnn.h b/paddle/fluid/platform/dynload/cudnn.h
index ca237efa115..2aaa49c966f 100644
--- a/paddle/fluid/platform/dynload/cudnn.h
+++ b/paddle/fluid/platform/dynload/cudnn.h
@@ -181,14 +181,14 @@ CUDNN_DNN_ROUTINE_EACH_R7(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
 #endif
 
 #if CUDNN_VERSION >= 7201
-#define CUDNN_DNN_ROUTINE_EACH_AFTER_R7(__macro) \
-  __macro(cudnnCreateRNNDataDescriptor);         \
-  __macro(cudnnDestroyRNNDataDescriptor);        \
-  __macro(cudnnSetRNNDataDescriptor);            \
-  __macro(cudnnRNNForwardTrainingEx);            \
-  __macro(cudnnSetRNNPaddingMode);               \
-  __macro(cudnnRNNBackwardDataEx);               \
-  __macro(cudnnRNNBackwardWeightsEx);            \
+#define CUDNN_DNN_ROUTINE_EACH_AFTER_R72(__macro) \
+  __macro(cudnnCreateRNNDataDescriptor);          \
+  __macro(cudnnDestroyRNNDataDescriptor);         \
+  __macro(cudnnSetRNNDataDescriptor);             \
+  __macro(cudnnRNNForwardTrainingEx);             \
+  __macro(cudnnSetRNNPaddingMode);                \
+  __macro(cudnnRNNBackwardDataEx);                \
+  __macro(cudnnRNNBackwardWeightsEx);             \
   __macro(cudnnRNNForwardInferenceEx);
 CUDNN_DNN_ROUTINE_EACH_AFTER_R7(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
 #endif
-- 
GitLab