merge conflict

apache · Apr 7, 2020 · b8efb3d · b8efb3d
1 parent 977428b
commit b8efb3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/include/mxnet/resource.h b/include/mxnet/resource.h
@@ -202,9 +202,8 @@ struct Resource {
   void get_cudnn_dropout_desc(
       cudnnDropoutDescriptor_t *dropout_desc,
       mshadow::Stream<gpu> *stream,
-      const float dropout, uint64_t seed,
-      const std::string &name = MXNET_RESOURCE_DEFAULT_NAME_FARG("cudnn_dropout_state"),
-      bool reset) const;
+      const float dropout, uint64_t seed, bool reset,
+      const std::string &name = MXNET_RESOURCE_DEFAULT_NAME_FARG("cudnn_dropout_state")) const;
 #endif  // MXNET_USE_CUDNN == 1
 
   /*!

diff --git a/src/resource.cc b/src/resource.cc
@@ -428,9 +428,8 @@ void* Resource::get_host_space_internal(size_t size) const {
 void Resource::get_cudnn_dropout_desc(
     cudnnDropoutDescriptor_t *dropout_desc,
     mshadow::Stream<gpu> *stream,
-    const float dropout, uint64_t seed,
-    const std::string &name,
-    bool reset) const {
+    const float dropout, uint64_t seed, bool reset,
+    const std::string &name) const {
 
   CHECK_EQ(req.type, ResourceRequest::kCuDNNDropoutDesc);
   auto state_space = static_cast<resource::SpaceAllocator*>(ptr_);