From b16c0a84e6ff469e043f09ac378310097b52c618 Mon Sep 17 00:00:00 2001
From: wangyang59 <wangyang59@baidu.com>
Date: Tue, 7 Mar 2017 10:39:05 -0800
Subject: [PATCH] only keep CudnnConvBaseLayer and let both cudnn_conv and
 cudnn_convt point to it

---
 paddle/gserver/layers/CudnnConvBaseLayer.cpp |  2 +
 paddle/gserver/layers/CudnnConvLayer.cpp     | 46 --------------------
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 paddle/gserver/layers/CudnnConvLayer.cpp

diff --git a/paddle/gserver/layers/CudnnConvBaseLayer.cpp b/paddle/gserver/layers/CudnnConvBaseLayer.cpp
index be7e32e54..24363bb8b 100644
--- a/paddle/gserver/layers/CudnnConvBaseLayer.cpp
+++ b/paddle/gserver/layers/CudnnConvBaseLayer.cpp
@@ -17,6 +17,8 @@ limitations under the License. */
 #include "paddle/utils/Stat.h"
 
 namespace paddle {
+REGISTER_LAYER(cudnn_conv, CudnnConvBaseLayer);
+REGISTER_LAYER(cudnn_convt, CudnnConvBaseLayer);
 
 bool CudnnConvBaseLayer::init(const LayerMap &layerMap,
                               const ParameterMap &parameterMap) {
diff --git a/paddle/gserver/layers/CudnnConvLayer.cpp b/paddle/gserver/layers/CudnnConvLayer.cpp
deleted file mode 100644
index ed5eb2cb5..000000000
--- a/paddle/gserver/layers/CudnnConvLayer.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#include "CudnnConvBaseLayer.h"
-
-namespace paddle {
-/**
- * @brief A 2-dimension conv layer implemented by cuDNN. It only
- *        supports GPU mode. We automatic select CudnnConvLayer for GPU
- *        mode and ExpandConvLayer for CPU mode if you set type of "conv".
- *        User also can specfiy type of "exconv" or "cudnn_conv" for
- *        particular type.
- *
- * The config file api is img_conv_layer.
- */
-class CudnnConvLayer : public CudnnConvBaseLayer {
-public:
-  explicit CudnnConvLayer(const LayerConfig& config)
-      : CudnnConvBaseLayer(config) {}
-
-  ~CudnnConvLayer() {}
-};
-
-REGISTER_LAYER(cudnn_conv, CudnnConvLayer);
-
-class CudnnConvTransLayer : public CudnnConvBaseLayer {
-public:
-  explicit CudnnConvTransLayer(const LayerConfig& config)
-      : CudnnConvBaseLayer(config) {}
-
-  ~CudnnConvTransLayer() {}
-};
-
-REGISTER_LAYER(cudnn_convt, CudnnConvTransLayer);
-}  // namespace paddle
-- 
GitLab