diff --git a/paddle/gserver/layers/CudnnConvBaseLayer.cpp b/paddle/gserver/layers/CudnnConvBaseLayer.cpp index be7e32e54b46000c4eb8382d5372d5dc272be4cd..24363bb8b09cc354c25abe512257be68566c10e1 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 ¶meterMap) { diff --git a/paddle/gserver/layers/CudnnConvLayer.cpp b/paddle/gserver/layers/CudnnConvLayer.cpp deleted file mode 100644 index ed5eb2cb5ba75dfe5f36c04e680cae643381c3f7..0000000000000000000000000000000000000000 --- 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