You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by jx...@apache.org on 2017/11/30 18:56:27 UTC
[incubator-mxnet] branch master updated: Move legacy operators
under the nn directory (#8858)
This is an automated email from the ASF dual-hosted git repository.
jxie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 2aa506a Move legacy operators under the nn directory (#8858)
2aa506a is described below
commit 2aa506adc0ef639097b1b9ee0fe2d4183686df1a
Author: Da Zheng <zh...@gmail.com>
AuthorDate: Thu Nov 30 10:56:21 2017 -0800
Move legacy operators under the nn directory (#8858)
* Move legacy operators to nn/
* Move CuDNN operators to nn/
* Update CuDNN algoreg.
* fix amalgamation.
* fix a path of a header file.
* Fix the path for mkl header files.
* Fix compilation errors in mkl.
* Fix for the coding style.
* Fix the path of the header files.
* Fix headers in the cu files.
* Compile cu files.
* Update activation-inl.h
* Update activation-inl.h
---
Makefile | 4 ++--
amalgamation/mxnet_predict0.cc | 16 ++++++++--------
src/operator/convolution_v1.cu | 2 +-
src/operator/mkl/mkl_convolution-inl.h | 2 +-
src/operator/mkl/mkl_pooling-inl.h | 2 +-
src/operator/{ => nn}/activation-inl.h | 10 +++++-----
src/operator/{ => nn}/activation.cc | 6 +++---
src/operator/{ => nn}/activation.cu | 4 ++--
src/operator/{ => nn}/batch_norm-inl.h | 12 ++++++------
src/operator/{ => nn}/batch_norm.cc | 4 ++--
src/operator/{ => nn}/batch_norm.cu | 4 ++--
src/operator/{ => nn}/convolution-inl.h | 12 ++++++------
src/operator/{ => nn}/convolution.cc | 4 ++--
src/operator/{ => nn}/convolution.cu | 2 +-
src/operator/{ => nn/cudnn}/cudnn_activation-inl.h | 8 ++++----
src/operator/{ => nn/cudnn}/cudnn_algoreg-inl.h | 12 ++++++------
src/operator/{ => nn/cudnn}/cudnn_algoreg.cc | 0
src/operator/{ => nn/cudnn}/cudnn_batch_norm-inl.h | 8 ++++----
src/operator/{ => nn/cudnn}/cudnn_batch_norm.cc | 0
src/operator/{ => nn/cudnn}/cudnn_batch_norm.cu | 0
src/operator/{ => nn/cudnn}/cudnn_convolution-inl.h | 10 +++++-----
src/operator/{ => nn/cudnn}/cudnn_deconvolution-inl.h | 10 +++++-----
src/operator/{ => nn/cudnn}/cudnn_pooling-inl.h | 8 ++++----
.../{ => nn/cudnn}/cudnn_softmax_activation-inl.h | 8 ++++----
src/operator/{ => nn}/deconvolution-inl.h | 10 +++++-----
src/operator/{ => nn}/deconvolution.cc | 0
src/operator/{ => nn}/deconvolution.cu | 2 +-
src/operator/{ => nn}/depthwise_convolution-inl.h | 8 ++++----
src/operator/{ => nn}/depthwise_convolution_tf.cuh | 4 ++--
src/operator/{ => nn}/dropout-inl.h | 12 ++++++------
src/operator/{ => nn}/dropout.cc | 0
src/operator/{ => nn}/dropout.cu | 0
src/operator/{ => nn}/fully_connected-inl.h | 12 ++++++------
src/operator/{ => nn}/fully_connected.cc | 0
src/operator/{ => nn}/fully_connected.cu | 0
src/operator/{ => nn}/pooling-inl.h | 10 +++++-----
src/operator/{ => nn}/pooling.cc | 4 ++--
src/operator/{ => nn}/pooling.cu | 2 +-
src/operator/{ => nn}/softmax_activation-inl.h | 8 ++++----
src/operator/{ => nn}/softmax_activation.cc | 2 +-
src/operator/{ => nn}/softmax_activation.cu | 4 ++--
src/operator/{ => nn}/upsampling-inl.h | 8 ++++----
src/operator/{ => nn}/upsampling.cc | 0
src/operator/{ => nn}/upsampling.cu | 0
44 files changed, 117 insertions(+), 117 deletions(-)
diff --git a/Makefile b/Makefile
index 647ec6f..72dd26e 100644
--- a/Makefile
+++ b/Makefile
@@ -284,9 +284,9 @@ endif
all: lib/libmxnet.a lib/libmxnet.so $(BIN) extra-packages
-SRC = $(wildcard src/*/*/*.cc src/*/*.cc src/*.cc)
+SRC = $(wildcard src/*/*/*/*.cc src/*/*/*.cc src/*/*.cc src/*.cc)
OBJ = $(patsubst %.cc, build/%.o, $(SRC))
-CUSRC = $(wildcard src/*/*/*.cu src/*/*.cu src/*.cu)
+CUSRC = $(wildcard src/*/*/*/*.cu src/*/*/*.cu src/*/*.cu src/*.cu)
CUOBJ = $(patsubst %.cu, build/%_gpu.o, $(CUSRC))
# extra operators
diff --git a/amalgamation/mxnet_predict0.cc b/amalgamation/mxnet_predict0.cc
index 053dc1e..f35591d 100644
--- a/amalgamation/mxnet_predict0.cc
+++ b/amalgamation/mxnet_predict0.cc
@@ -64,16 +64,16 @@
#include "src/operator/operator.cc"
#include "src/operator/operator_util.cc"
-#include "src/operator/activation.cc"
-#include "src/operator/batch_norm.cc"
+#include "src/operator/nn/activation.cc"
+#include "src/operator/nn/batch_norm.cc"
#include "src/operator/concat.cc"
-#include "src/operator/convolution.cc"
-#include "src/operator/deconvolution.cc"
-#include "src/operator/dropout.cc"
-#include "src/operator/fully_connected.cc"
+#include "src/operator/nn/convolution.cc"
+#include "src/operator/nn/deconvolution.cc"
+#include "src/operator/nn/dropout.cc"
+#include "src/operator/nn/fully_connected.cc"
#include "src/operator/leaky_relu.cc"
-#include "src/operator/pooling.cc"
-#include "src/operator/softmax_activation.cc"
+#include "src/operator/nn/pooling.cc"
+#include "src/operator/nn/softmax_activation.cc"
#include "src/operator/softmax_output.cc"
#include "src/operator/tensor/elemwise_binary_broadcast_op_basic.cc"
#include "src/operator/tensor/elemwise_binary_op.cc"
diff --git a/src/operator/convolution_v1.cu b/src/operator/convolution_v1.cu
index bcba772..f3928ab 100644
--- a/src/operator/convolution_v1.cu
+++ b/src/operator/convolution_v1.cu
@@ -27,7 +27,7 @@
#include "./convolution_v1-inl.h"
#include <vector>
#if MXNET_USE_CUDNN == 1
-#include "./cudnn_convolution-inl.h"
+#include "./nn/cudnn/cudnn_convolution-inl.h"
#endif // MXNET_USE_CUDNN
namespace mxnet {
diff --git a/src/operator/mkl/mkl_convolution-inl.h b/src/operator/mkl/mkl_convolution-inl.h
index 870e568..813d061 100644
--- a/src/operator/mkl/mkl_convolution-inl.h
+++ b/src/operator/mkl/mkl_convolution-inl.h
@@ -31,7 +31,7 @@
#include <string>
#include <utility>
#include "../operator_common.h"
-#include "../convolution-inl.h"
+#include "../nn/convolution-inl.h"
#include "./mkl_util-inl.h"
namespace mxnet {
diff --git a/src/operator/mkl/mkl_pooling-inl.h b/src/operator/mkl/mkl_pooling-inl.h
index bc3fcee..5662a61 100644
--- a/src/operator/mkl/mkl_pooling-inl.h
+++ b/src/operator/mkl/mkl_pooling-inl.h
@@ -26,7 +26,7 @@
#include <string>
#include <utility>
#include "../operator_common.h"
-#include "../pooling-inl.h"
+#include "../nn/pooling-inl.h"
#include "./mkl_util-inl.h"
namespace mxnet {
diff --git a/src/operator/activation-inl.h b/src/operator/nn/activation-inl.h
similarity index 97%
rename from src/operator/activation-inl.h
rename to src/operator/nn/activation-inl.h
index 8280079..ac8b747 100644
--- a/src/operator/activation-inl.h
+++ b/src/operator/nn/activation-inl.h
@@ -24,8 +24,8 @@
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_ACTIVATION_INL_H_
-#define MXNET_OPERATOR_ACTIVATION_INL_H_
+#ifndef MXNET_OPERATOR_NN_ACTIVATION_INL_H_
+#define MXNET_OPERATOR_NN_ACTIVATION_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -35,8 +35,8 @@
#include <string>
#include <vector>
#include <utility>
-#include "./operator_common.h"
-#include "./mxnet_op.h"
+#include "../operator_common.h"
+#include "../mxnet_op.h"
namespace mxnet {
namespace op {
@@ -215,4 +215,4 @@ class ActivationProp : public OperatorProperty {
#endif // DMLC_USE_CXX11
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_ACTIVATION_INL_H_
+#endif // MXNET_OPERATOR_NN_ACTIVATION_INL_H_
diff --git a/src/operator/activation.cc b/src/operator/nn/activation.cc
similarity index 97%
rename from src/operator/activation.cc
rename to src/operator/nn/activation.cc
index bff1d5b..401a9e3 100644
--- a/src/operator/activation.cc
+++ b/src/operator/nn/activation.cc
@@ -24,11 +24,11 @@
* \author Bing Xu
*/
#include "./activation-inl.h"
-#include "./mshadow_op.h"
+#include "../mshadow_op.h"
#if MXNET_USE_MKL2017 == 1
#include <mkl_memory.h>
-#include "./mkl/mkl_memory-inl.h"
-#include "./mkl/mkl_relu-inl.h"
+#include "../mkl/mkl_memory-inl.h"
+#include "../mkl/mkl_relu-inl.h"
#endif // MXNET_USE_MKL2017
namespace mxnet {
diff --git a/src/operator/activation.cu b/src/operator/nn/activation.cu
similarity index 96%
rename from src/operator/activation.cu
rename to src/operator/nn/activation.cu
index 71efa70..c2f6be9 100644
--- a/src/operator/activation.cu
+++ b/src/operator/nn/activation.cu
@@ -24,9 +24,9 @@
* \author Bing Xu
*/
#include "./activation-inl.h"
-#include "./mshadow_op.h"
+#include "../mshadow_op.h"
#if MXNET_USE_CUDNN == 1
-#include "./cudnn_activation-inl.h"
+#include "./cudnn/cudnn_activation-inl.h"
#endif
namespace mxnet {
diff --git a/src/operator/batch_norm-inl.h b/src/operator/nn/batch_norm-inl.h
similarity index 98%
rename from src/operator/batch_norm-inl.h
rename to src/operator/nn/batch_norm-inl.h
index 45c8cae..2a9dee2 100644
--- a/src/operator/batch_norm-inl.h
+++ b/src/operator/nn/batch_norm-inl.h
@@ -23,8 +23,8 @@
* \brief
* \author Bing Xu, Chris Olivier
*/
-#ifndef MXNET_OPERATOR_BATCH_NORM_INL_H_
-#define MXNET_OPERATOR_BATCH_NORM_INL_H_
+#ifndef MXNET_OPERATOR_NN_BATCH_NORM_INL_H_
+#define MXNET_OPERATOR_NN_BATCH_NORM_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -34,9 +34,9 @@
#include <vector>
#include <string>
#include <utility>
-#include "./mshadow_op.h"
-#include "./operator_common.h"
-#include "mxnet_op.h"
+#include "../mshadow_op.h"
+#include "../operator_common.h"
+#include "../mxnet_op.h"
#ifdef __GNUG__
#pragma GCC diagnostic push
@@ -489,5 +489,5 @@ extern volatile bool disable_mkl;
#pragma GCC diagnostic pop
#endif
-#endif // MXNET_OPERATOR_BATCH_NORM_INL_H_
+#endif // MXNET_OPERATOR_NN_BATCH_NORM_INL_H_
diff --git a/src/operator/batch_norm.cc b/src/operator/nn/batch_norm.cc
similarity index 99%
rename from src/operator/batch_norm.cc
rename to src/operator/nn/batch_norm.cc
index 3fb1aa2..ca28832 100644
--- a/src/operator/batch_norm.cc
+++ b/src/operator/nn/batch_norm.cc
@@ -28,8 +28,8 @@
#include <nnvm/op_attr_types.h>
#if MXNET_USE_MKL2017 == 1
#include <mkl_memory.h>
-#include "./mkl/mkl_memory-inl.h"
-#include "./mkl/mkl_batch_norm-inl.h"
+#include "../mkl/mkl_memory-inl.h"
+#include "../mkl/mkl_batch_norm-inl.h"
#endif // MXNET_USE_MKL2017
/*! \brief inverse standard deviation <-> variance */
diff --git a/src/operator/batch_norm.cu b/src/operator/nn/batch_norm.cu
similarity index 99%
rename from src/operator/batch_norm.cu
rename to src/operator/nn/batch_norm.cu
index f9f5e1e..59317b7 100644
--- a/src/operator/batch_norm.cu
+++ b/src/operator/nn/batch_norm.cu
@@ -36,10 +36,10 @@
#define USE_GLOBAL_STATS_FLAG 32
#if MXNET_USE_CUDNN == 1 && CUDNN_MAJOR >= 5
-#include "./cudnn_batch_norm-inl.h"
+#include "./cudnn/cudnn_batch_norm-inl.h"
#endif
-#include "../common/cuda_utils.h"
+#include "../../common/cuda_utils.h"
using namespace mxnet;
diff --git a/src/operator/convolution-inl.h b/src/operator/nn/convolution-inl.h
similarity index 99%
rename from src/operator/convolution-inl.h
rename to src/operator/nn/convolution-inl.h
index c0cc246..3818088 100644
--- a/src/operator/convolution-inl.h
+++ b/src/operator/nn/convolution-inl.h
@@ -24,8 +24,8 @@
* \ref: https://github.com/Yangqing/caffe/wiki/Convolution-in-Caffe:-a-memo
* \author Bing Xu, Jun Wu
*/
-#ifndef MXNET_OPERATOR_CONVOLUTION_INL_H_
-#define MXNET_OPERATOR_CONVOLUTION_INL_H_
+#ifndef MXNET_OPERATOR_NN_CONVOLUTION_INL_H_
+#define MXNET_OPERATOR_NN_CONVOLUTION_INL_H_
#include <mxnet/io.h>
#include <mxnet/base.h>
@@ -39,9 +39,9 @@
#include <vector>
#include <string>
#include <utility>
-#include "./operator_common.h"
-#include "./nn/im2col.h"
-#include "./linalg.h"
+#include "../operator_common.h"
+#include "../linalg.h"
+#include "./im2col.h"
namespace mxnet {
@@ -681,4 +681,4 @@ class ConvolutionProp : public OperatorProperty {
#endif // DMLC_USE_CXX11
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CONVOLUTION_INL_H_
+#endif // MXNET_OPERATOR_NN_CONVOLUTION_INL_H_
diff --git a/src/operator/convolution.cc b/src/operator/nn/convolution.cc
similarity index 98%
rename from src/operator/convolution.cc
rename to src/operator/nn/convolution.cc
index bc65cc2..ef8ec90 100644
--- a/src/operator/convolution.cc
+++ b/src/operator/nn/convolution.cc
@@ -27,8 +27,8 @@
#include "./convolution-inl.h"
#if MXNET_USE_MKL2017 == 1
#include <mkl_memory.h>
-#include "./mkl/mkl_memory-inl.h"
-#include "./mkl/mkl_convolution-inl.h"
+#include "../mkl/mkl_memory-inl.h"
+#include "../mkl/mkl_convolution-inl.h"
#endif // MXNET_USE_MKL2017
#if MXNET_USE_NNPACK == 1
#include "./nnpack/nnpack_convolution-inl.h"
diff --git a/src/operator/convolution.cu b/src/operator/nn/convolution.cu
similarity index 98%
rename from src/operator/convolution.cu
rename to src/operator/nn/convolution.cu
index 2962559..c31d78c 100644
--- a/src/operator/convolution.cu
+++ b/src/operator/nn/convolution.cu
@@ -27,7 +27,7 @@
#include "./convolution-inl.h"
#include <vector>
#if MXNET_USE_CUDNN == 1
-#include "./cudnn_convolution-inl.h"
+#include "./cudnn/cudnn_convolution-inl.h"
#endif // MXNET_USE_CUDNN
#include "./depthwise_convolution-inl.h"
diff --git a/src/operator/cudnn_activation-inl.h b/src/operator/nn/cudnn/cudnn_activation-inl.h
similarity index 97%
rename from src/operator/cudnn_activation-inl.h
rename to src/operator/nn/cudnn/cudnn_activation-inl.h
index 75506b3..8885283 100644
--- a/src/operator/cudnn_activation-inl.h
+++ b/src/operator/nn/cudnn/cudnn_activation-inl.h
@@ -24,11 +24,11 @@
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_CUDNN_ACTIVATION_INL_H_
-#define MXNET_OPERATOR_CUDNN_ACTIVATION_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_ACTIVATION_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_ACTIVATION_INL_H_
#include <algorithm>
#include <vector>
-#include "./activation-inl.h"
+#include "../activation-inl.h"
namespace mxnet {
namespace op {
@@ -225,4 +225,4 @@ class CuDNNActivationOp : public Operator {
}; // class CuDNNActivationOp
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_ACTIVATION_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_ACTIVATION_INL_H_
diff --git a/src/operator/cudnn_algoreg-inl.h b/src/operator/nn/cudnn/cudnn_algoreg-inl.h
similarity index 95%
rename from src/operator/cudnn_algoreg-inl.h
rename to src/operator/nn/cudnn/cudnn_algoreg-inl.h
index fd7b8fa..3eca4c2 100644
--- a/src/operator/cudnn_algoreg-inl.h
+++ b/src/operator/nn/cudnn/cudnn_algoreg-inl.h
@@ -23,16 +23,16 @@
* \brief
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_CUDNN_ALGOREG_INL_H_
-#define MXNET_OPERATOR_CUDNN_ALGOREG_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_ALGOREG_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_ALGOREG_INL_H_
#include <algorithm>
#include <mutex>
#include <string>
#include <vector>
-#include "../common/cuda_utils.h"
-#include "./convolution-inl.h"
-#include "./deconvolution-inl.h"
+#include "../../../common/cuda_utils.h"
+#include "../convolution-inl.h"
+#include "../deconvolution-inl.h"
namespace mxnet {
namespace op {
#if MXNET_USE_CUDNN == 1
@@ -175,4 +175,4 @@ typedef CuDNNAlgoReg<DeconvolutionParam> CuDNNDeconvAlgoReg;
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_ALGOREG_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_ALGOREG_INL_H_
diff --git a/src/operator/cudnn_algoreg.cc b/src/operator/nn/cudnn/cudnn_algoreg.cc
similarity index 100%
rename from src/operator/cudnn_algoreg.cc
rename to src/operator/nn/cudnn/cudnn_algoreg.cc
diff --git a/src/operator/cudnn_batch_norm-inl.h b/src/operator/nn/cudnn/cudnn_batch_norm-inl.h
similarity index 98%
rename from src/operator/cudnn_batch_norm-inl.h
rename to src/operator/nn/cudnn/cudnn_batch_norm-inl.h
index c231ca3..3dc9c83 100644
--- a/src/operator/cudnn_batch_norm-inl.h
+++ b/src/operator/nn/cudnn/cudnn_batch_norm-inl.h
@@ -24,13 +24,13 @@
* \author Junyuan Xie
*/
-#ifndef MXNET_OPERATOR_CUDNN_BATCH_NORM_INL_H_
-#define MXNET_OPERATOR_CUDNN_BATCH_NORM_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_BATCH_NORM_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_BATCH_NORM_INL_H_
#include <vector>
#include <map>
#include <string>
#include <utility>
-#include "batch_norm-inl.h"
+#include "../batch_norm-inl.h"
namespace mxnet {
namespace op {
@@ -387,4 +387,4 @@ class CuDNNBatchNormProp : public OperatorProperty {
#endif // MXNET_USE_CUDNN == 1 && CUDNN_MAJOR >= 4
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_BATCH_NORM_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_BATCH_NORM_INL_H_
diff --git a/src/operator/cudnn_batch_norm.cc b/src/operator/nn/cudnn/cudnn_batch_norm.cc
similarity index 100%
rename from src/operator/cudnn_batch_norm.cc
rename to src/operator/nn/cudnn/cudnn_batch_norm.cc
diff --git a/src/operator/cudnn_batch_norm.cu b/src/operator/nn/cudnn/cudnn_batch_norm.cu
similarity index 100%
rename from src/operator/cudnn_batch_norm.cu
rename to src/operator/nn/cudnn/cudnn_batch_norm.cu
diff --git a/src/operator/cudnn_convolution-inl.h b/src/operator/nn/cudnn/cudnn_convolution-inl.h
similarity index 99%
rename from src/operator/cudnn_convolution-inl.h
rename to src/operator/nn/cudnn/cudnn_convolution-inl.h
index 148a942..f372039 100644
--- a/src/operator/cudnn_convolution-inl.h
+++ b/src/operator/nn/cudnn/cudnn_convolution-inl.h
@@ -23,16 +23,16 @@
* \brief
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_CUDNN_CONVOLUTION_INL_H_
-#define MXNET_OPERATOR_CUDNN_CONVOLUTION_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_CONVOLUTION_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_CONVOLUTION_INL_H_
#include <algorithm>
#include <vector>
#include <mutex>
#include <string>
-#include "./convolution-inl.h"
+#include "../convolution-inl.h"
#include "./cudnn_algoreg-inl.h"
-#include "../common/cuda_utils.h"
+#include "../../../common/cuda_utils.h"
namespace mxnet {
namespace op {
@@ -912,4 +912,4 @@ class CuDNNConvolutionOp : public Operator {
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_CONVOLUTION_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_CONVOLUTION_INL_H_
diff --git a/src/operator/cudnn_deconvolution-inl.h b/src/operator/nn/cudnn/cudnn_deconvolution-inl.h
similarity index 99%
rename from src/operator/cudnn_deconvolution-inl.h
rename to src/operator/nn/cudnn/cudnn_deconvolution-inl.h
index 6796678..09e89c2 100644
--- a/src/operator/cudnn_deconvolution-inl.h
+++ b/src/operator/nn/cudnn/cudnn_deconvolution-inl.h
@@ -23,16 +23,16 @@
* \brief
* \author Wei Wu, Leonard Lausen
*/
-#ifndef MXNET_OPERATOR_CUDNN_DECONVOLUTION_INL_H_
-#define MXNET_OPERATOR_CUDNN_DECONVOLUTION_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_DECONVOLUTION_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_DECONVOLUTION_INL_H_
#include <algorithm>
#include <vector>
#include <mutex>
#include <string>
-#include "./deconvolution-inl.h"
+#include "../deconvolution-inl.h"
#include "./cudnn_algoreg-inl.h"
-#include "../common/cuda_utils.h"
+#include "../../../common/cuda_utils.h"
namespace mxnet {
namespace op {
@@ -951,4 +951,4 @@ class CuDNNDeconvolutionOp : public Operator {
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_DECONVOLUTION_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_DECONVOLUTION_INL_H_
diff --git a/src/operator/cudnn_pooling-inl.h b/src/operator/nn/cudnn/cudnn_pooling-inl.h
similarity index 98%
rename from src/operator/cudnn_pooling-inl.h
rename to src/operator/nn/cudnn/cudnn_pooling-inl.h
index b345e0b..104ed85 100644
--- a/src/operator/cudnn_pooling-inl.h
+++ b/src/operator/nn/cudnn/cudnn_pooling-inl.h
@@ -24,11 +24,11 @@
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_CUDNN_POOLING_INL_H_
-#define MXNET_OPERATOR_CUDNN_POOLING_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_POOLING_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_POOLING_INL_H_
#include <algorithm>
#include <vector>
-#include "./pooling-inl.h"
+#include "../pooling-inl.h"
namespace mxnet {
namespace op {
@@ -311,5 +311,5 @@ class CuDNNPoolingOp : public Operator {
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_POOLING_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_POOLING_INL_H_
diff --git a/src/operator/cudnn_softmax_activation-inl.h b/src/operator/nn/cudnn/cudnn_softmax_activation-inl.h
similarity index 96%
rename from src/operator/cudnn_softmax_activation-inl.h
rename to src/operator/nn/cudnn/cudnn_softmax_activation-inl.h
index b7ab18e..5afdb48 100644
--- a/src/operator/cudnn_softmax_activation-inl.h
+++ b/src/operator/nn/cudnn/cudnn_softmax_activation-inl.h
@@ -24,11 +24,11 @@
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_CUDNN_SOFTMAX_ACTIVATION_INL_H_
-#define MXNET_OPERATOR_CUDNN_SOFTMAX_ACTIVATION_INL_H_
+#ifndef MXNET_OPERATOR_NN_CUDNN_CUDNN_SOFTMAX_ACTIVATION_INL_H_
+#define MXNET_OPERATOR_NN_CUDNN_CUDNN_SOFTMAX_ACTIVATION_INL_H_
#include <algorithm>
#include <vector>
-#include "./softmax_activation-inl.h"
+#include "../softmax_activation-inl.h"
namespace mxnet {
namespace op {
@@ -181,4 +181,4 @@ class CuDNNSoftmaxActivationOp : public Operator {
}; // class CuDNNSoftmaxActivationOp
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_CUDNN_SOFTMAX_ACTIVATION_INL_H_
+#endif // MXNET_OPERATOR_NN_CUDNN_CUDNN_SOFTMAX_ACTIVATION_INL_H_
diff --git a/src/operator/deconvolution-inl.h b/src/operator/nn/deconvolution-inl.h
similarity index 99%
rename from src/operator/deconvolution-inl.h
rename to src/operator/nn/deconvolution-inl.h
index a1e3b90..9a3c179 100644
--- a/src/operator/deconvolution-inl.h
+++ b/src/operator/nn/deconvolution-inl.h
@@ -23,8 +23,8 @@
* \brief
* \author Wei Wu
*/
-#ifndef MXNET_OPERATOR_DECONVOLUTION_INL_H_
-#define MXNET_OPERATOR_DECONVOLUTION_INL_H_
+#ifndef MXNET_OPERATOR_NN_DECONVOLUTION_INL_H_
+#define MXNET_OPERATOR_NN_DECONVOLUTION_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -34,8 +34,8 @@
#include <vector>
#include <string>
#include <utility>
-#include "./operator_common.h"
-#include "./linalg.h"
+#include "../operator_common.h"
+#include "../linalg.h"
namespace mxnet {
@@ -750,4 +750,4 @@ class DeconvolutionProp : public OperatorProperty {
#endif // DMLC_USE_CXX11
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_DECONVOLUTION_INL_H_
+#endif // MXNET_OPERATOR_NN_DECONVOLUTION_INL_H_
diff --git a/src/operator/deconvolution.cc b/src/operator/nn/deconvolution.cc
similarity index 100%
rename from src/operator/deconvolution.cc
rename to src/operator/nn/deconvolution.cc
diff --git a/src/operator/deconvolution.cu b/src/operator/nn/deconvolution.cu
similarity index 98%
rename from src/operator/deconvolution.cu
rename to src/operator/nn/deconvolution.cu
index 2f0f37b..6d07876 100644
--- a/src/operator/deconvolution.cu
+++ b/src/operator/nn/deconvolution.cu
@@ -26,7 +26,7 @@
#include "./deconvolution-inl.h"
#if MXNET_USE_CUDNN == 1
-#include "./cudnn_deconvolution-inl.h"
+#include "./cudnn/cudnn_deconvolution-inl.h"
#endif // MXNET_USE_CUDNN
namespace mxnet {
diff --git a/src/operator/depthwise_convolution-inl.h b/src/operator/nn/depthwise_convolution-inl.h
similarity index 98%
rename from src/operator/depthwise_convolution-inl.h
rename to src/operator/nn/depthwise_convolution-inl.h
index e43fd08..c4b7a47 100644
--- a/src/operator/depthwise_convolution-inl.h
+++ b/src/operator/nn/depthwise_convolution-inl.h
@@ -22,12 +22,12 @@
* \brief CUDA depthwise convolution code
* \author shuqian.qu@hobot.cc
*/
-#ifndef MXNET_OPERATOR_DEPTHWISE_CONVOLUTION_INL_H_
-#define MXNET_OPERATOR_DEPTHWISE_CONVOLUTION_INL_H_
+#ifndef MXNET_OPERATOR_NN_DEPTHWISE_CONVOLUTION_INL_H_
+#define MXNET_OPERATOR_NN_DEPTHWISE_CONVOLUTION_INL_H_
#include <algorithm>
#include <vector>
#include "./convolution-inl.h"
-#include "../common/cuda_utils.h"
+#include "../../common/cuda_utils.h"
#if MXNET_USE_CUDA
#include <cub/cub.cuh>
@@ -350,4 +350,4 @@ void DepthwiseConvolutionOp<DType>::Backward(const OpContext &ctx,
} // namespace mxnet
#endif
-#endif // MXNET_OPERATOR_DEPTHWISE_CONVOLUTION_INL_H_
+#endif // MXNET_OPERATOR_NN_DEPTHWISE_CONVOLUTION_INL_H_
diff --git a/src/operator/depthwise_convolution_tf.cuh b/src/operator/nn/depthwise_convolution_tf.cuh
similarity index 99%
rename from src/operator/depthwise_convolution_tf.cuh
rename to src/operator/nn/depthwise_convolution_tf.cuh
index f94da44..c7f48e6 100644
--- a/src/operator/depthwise_convolution_tf.cuh
+++ b/src/operator/nn/depthwise_convolution_tf.cuh
@@ -26,8 +26,8 @@
*/
#ifndef MXNET_OPERATOR_DEPTHWISE_CONVOLUTION_TF_CUH_
#define MXNET_OPERATOR_DEPTHWISE_CONVOLUTION_TF_CUH_
-#include "../common/cuda_utils.h"
-#include "./mxnet_op.h"
+#include "../../common/cuda_utils.h"
+#include "../mxnet_op.h"
namespace tf {
namespace depthwise_conv {
diff --git a/src/operator/dropout-inl.h b/src/operator/nn/dropout-inl.h
similarity index 97%
rename from src/operator/dropout-inl.h
rename to src/operator/nn/dropout-inl.h
index 3071131..4c8a5ee 100644
--- a/src/operator/dropout-inl.h
+++ b/src/operator/nn/dropout-inl.h
@@ -24,8 +24,8 @@
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_DROPOUT_INL_H_
-#define MXNET_OPERATOR_DROPOUT_INL_H_
+#ifndef MXNET_OPERATOR_NN_DROPOUT_INL_H_
+#define MXNET_OPERATOR_NN_DROPOUT_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
#include <mxnet/operator.h>
@@ -34,9 +34,9 @@
#include <string>
#include <utility>
#include <algorithm>
-#include "./operator_common.h"
-#include "./mshadow_op.h"
-#include "../engine/openmp.h"
+#include "../../engine/openmp.h"
+#include "../operator_common.h"
+#include "../mshadow_op.h"
#if defined(USE_MKL) && defined(_OPENMP)
#include <omp.h>
@@ -285,4 +285,4 @@ class DropoutProp : public OperatorProperty {
#endif // DMLC_USE_CXX11
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_DROPOUT_INL_H_
+#endif // MXNET_OPERATOR_NN_DROPOUT_INL_H_
diff --git a/src/operator/dropout.cc b/src/operator/nn/dropout.cc
similarity index 100%
rename from src/operator/dropout.cc
rename to src/operator/nn/dropout.cc
diff --git a/src/operator/dropout.cu b/src/operator/nn/dropout.cu
similarity index 100%
rename from src/operator/dropout.cu
rename to src/operator/nn/dropout.cu
diff --git a/src/operator/fully_connected-inl.h b/src/operator/nn/fully_connected-inl.h
similarity index 97%
rename from src/operator/fully_connected-inl.h
rename to src/operator/nn/fully_connected-inl.h
index 0fe828a..9f3deec 100644
--- a/src/operator/fully_connected-inl.h
+++ b/src/operator/nn/fully_connected-inl.h
@@ -22,8 +22,8 @@
* \file fully_connect_op-inl.h
* \brief fully connect operator and symbol
*/
-#ifndef MXNET_OPERATOR_FULLY_CONNECTED_INL_H_
-#define MXNET_OPERATOR_FULLY_CONNECTED_INL_H_
+#ifndef MXNET_OPERATOR_NN_FULLY_CONNECTED_INL_H_
+#define MXNET_OPERATOR_NN_FULLY_CONNECTED_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -32,9 +32,9 @@
#include <vector>
#include <string>
#include <utility>
-#include "./operator_common.h"
-#include "./elemwise_op_common.h"
-#include "linalg.h"
+#include "../operator_common.h"
+#include "../elemwise_op_common.h"
+#include "../linalg.h"
namespace mxnet {
namespace op {
@@ -297,4 +297,4 @@ class FullyConnectedProp : public OperatorProperty {
#endif
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_FULLY_CONNECTED_INL_H_
+#endif // MXNET_OPERATOR_NN_FULLY_CONNECTED_INL_H_
diff --git a/src/operator/fully_connected.cc b/src/operator/nn/fully_connected.cc
similarity index 100%
rename from src/operator/fully_connected.cc
rename to src/operator/nn/fully_connected.cc
diff --git a/src/operator/fully_connected.cu b/src/operator/nn/fully_connected.cu
similarity index 100%
rename from src/operator/fully_connected.cu
rename to src/operator/nn/fully_connected.cu
diff --git a/src/operator/pooling-inl.h b/src/operator/nn/pooling-inl.h
similarity index 98%
rename from src/operator/pooling-inl.h
rename to src/operator/nn/pooling-inl.h
index caa6717..8825043 100644
--- a/src/operator/pooling-inl.h
+++ b/src/operator/nn/pooling-inl.h
@@ -24,8 +24,8 @@
* \author Bing Xu, Jun Wu
*/
-#ifndef MXNET_OPERATOR_POOLING_INL_H_
-#define MXNET_OPERATOR_POOLING_INL_H_
+#ifndef MXNET_OPERATOR_NN_POOLING_INL_H_
+#define MXNET_OPERATOR_NN_POOLING_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -35,8 +35,8 @@
#include <vector>
#include <string>
#include <utility>
-#include "./operator_common.h"
-#include "./nn/pool.h"
+#include "../operator_common.h"
+#include "./pool.h"
namespace mxnet {
namespace op {
@@ -332,4 +332,4 @@ class PoolingProp : public OperatorProperty {
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_POOLING_INL_H_
+#endif // MXNET_OPERATOR_NN_POOLING_INL_H_
diff --git a/src/operator/pooling.cc b/src/operator/nn/pooling.cc
similarity index 98%
rename from src/operator/pooling.cc
rename to src/operator/nn/pooling.cc
index 382e171..8345ea3 100644
--- a/src/operator/pooling.cc
+++ b/src/operator/nn/pooling.cc
@@ -26,8 +26,8 @@
#include "./pooling-inl.h"
#if MXNET_USE_MKL2017 == 1
#include <mkl_memory.h>
-#include "./mkl/mkl_memory-inl.h"
-#include "./mkl/mkl_pooling-inl.h"
+#include "../mkl/mkl_memory-inl.h"
+#include "../mkl/mkl_pooling-inl.h"
#endif // MXNET_USE_MKL2017
#if MXNET_USE_NNPACK == 1
#include "./nnpack/nnpack_pooling-inl.h"
diff --git a/src/operator/pooling.cu b/src/operator/nn/pooling.cu
similarity index 98%
rename from src/operator/pooling.cu
rename to src/operator/nn/pooling.cu
index d6e0932..dcebe67 100644
--- a/src/operator/pooling.cu
+++ b/src/operator/nn/pooling.cu
@@ -26,7 +26,7 @@
#include <vector>
#include "./pooling-inl.h"
#if MXNET_USE_CUDNN == 1
-#include "./cudnn_pooling-inl.h"
+#include "./cudnn/cudnn_pooling-inl.h"
#endif // MXNET_USE_CUDNN
namespace mxnet {
diff --git a/src/operator/softmax_activation-inl.h b/src/operator/nn/softmax_activation-inl.h
similarity index 97%
rename from src/operator/softmax_activation-inl.h
rename to src/operator/nn/softmax_activation-inl.h
index 1e65434..500bf51 100644
--- a/src/operator/softmax_activation-inl.h
+++ b/src/operator/nn/softmax_activation-inl.h
@@ -23,8 +23,8 @@
* \brief SoftmaxActivation operator
* \author Junyuan Xie
*/
-#ifndef MXNET_OPERATOR_SOFTMAX_ACTIVATION_INL_H_
-#define MXNET_OPERATOR_SOFTMAX_ACTIVATION_INL_H_
+#ifndef MXNET_OPERATOR_NN_SOFTMAX_ACTIVATION_INL_H_
+#define MXNET_OPERATOR_NN_SOFTMAX_ACTIVATION_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -34,7 +34,7 @@
#include <string>
#include <vector>
#include <utility>
-#include "./operator_common.h"
+#include "../operator_common.h"
namespace mxnet {
namespace op {
@@ -210,4 +210,4 @@ class SoftmaxActivationProp : public OperatorProperty {
#endif // DMLC_USE_CXX11
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_SOFTMAX_ACTIVATION_INL_H_
+#endif // MXNET_OPERATOR_NN_SOFTMAX_ACTIVATION_INL_H_
diff --git a/src/operator/softmax_activation.cc b/src/operator/nn/softmax_activation.cc
similarity index 98%
rename from src/operator/softmax_activation.cc
rename to src/operator/nn/softmax_activation.cc
index 23e4eb8..657b382 100644
--- a/src/operator/softmax_activation.cc
+++ b/src/operator/nn/softmax_activation.cc
@@ -24,7 +24,7 @@
* \author Junyuan Xie
*/
#include "./softmax_activation-inl.h"
-#include "./mshadow_op.h"
+#include "../mshadow_op.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/softmax_activation.cu b/src/operator/nn/softmax_activation.cu
similarity index 94%
rename from src/operator/softmax_activation.cu
rename to src/operator/nn/softmax_activation.cu
index ad9628b..0810483 100644
--- a/src/operator/softmax_activation.cu
+++ b/src/operator/nn/softmax_activation.cu
@@ -24,9 +24,9 @@
* \author Junyuan Xie
*/
#include "./softmax_activation-inl.h"
-#include "./mshadow_op.h"
+#include "../mshadow_op.h"
#if MXNET_USE_CUDNN == 1
-#include "./cudnn_softmax_activation-inl.h"
+#include "./cudnn/cudnn_softmax_activation-inl.h"
#endif
namespace mxnet {
diff --git a/src/operator/upsampling-inl.h b/src/operator/nn/upsampling-inl.h
similarity index 98%
rename from src/operator/upsampling-inl.h
rename to src/operator/nn/upsampling-inl.h
index bac9709..f660609 100644
--- a/src/operator/upsampling-inl.h
+++ b/src/operator/nn/upsampling-inl.h
@@ -23,8 +23,8 @@
* \brief
* \author Bing Xu
*/
-#ifndef MXNET_OPERATOR_UPSAMPLING_INL_H_
-#define MXNET_OPERATOR_UPSAMPLING_INL_H_
+#ifndef MXNET_OPERATOR_NN_UPSAMPLING_INL_H_
+#define MXNET_OPERATOR_NN_UPSAMPLING_INL_H_
#include <dmlc/logging.h>
#include <dmlc/parameter.h>
@@ -34,7 +34,7 @@
#include <vector>
#include <string>
#include <utility>
-#include "./operator_common.h"
+#include "../operator_common.h"
namespace mxnet {
namespace op {
@@ -332,4 +332,4 @@ class UpSamplingProp : public OperatorProperty {
} // namespace op
} // namespace mxnet
-#endif // MXNET_OPERATOR_UPSAMPLING_INL_H_
+#endif // MXNET_OPERATOR_NN_UPSAMPLING_INL_H_
diff --git a/src/operator/upsampling.cc b/src/operator/nn/upsampling.cc
similarity index 100%
rename from src/operator/upsampling.cc
rename to src/operator/nn/upsampling.cc
diff --git a/src/operator/upsampling.cu b/src/operator/nn/upsampling.cu
similarity index 100%
rename from src/operator/upsampling.cu
rename to src/operator/nn/upsampling.cu
--
To stop receiving notification emails like this one, please contact
['"commits@mxnet.apache.org" <co...@mxnet.apache.org>'].