From 279c23f5bd87b2ebe007dd29605d046fb4781bab Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=91=D0=B0=D1=80?= =?utf8?q?=D0=B0=D0=BD=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2/AI=20Tools=20Lab=20/S?= =?utf8?q?RR/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 1 Nov 2018 17:29:47 +0300 Subject: [PATCH] [nnc] Rename files with ModelIR operation classes according to coding style (#2099) * Rename files containing classes for ModelIR operations (include/core/modelIR/operations/) Signed-off-by: Sergei Barannikov --- contrib/nnc/core/modelIR/ShapeInference.cpp | 28 +++++++++++----------- contrib/nnc/include/core/modelIR/IrDotDumper.h | 28 +++++++++++----------- contrib/nnc/include/core/modelIR/graph.h | 2 +- .../nnc/include/core/modelIR/ir_dot_node_info.h | 2 +- .../operations/{batch_norm.h => BatchNormOp.h} | 0 .../operations/{bias_add_op.h => BiasAddOp.h} | 0 .../{capped_relu_op.h => CappedReluOp.h} | 0 .../modelIR/operations/{concat_op.h => ConcatOp.h} | 0 .../operations/{conv_2d_op.h => Conv2DOp.h} | 0 .../{depthwise_conv2d_op.h => DepthwiseConv2DOp.h} | 0 .../operations/{dropout_op.h => DropoutOp.h} | 0 .../{fully_connected_op.h => FullyConnectedOp.h} | 0 .../modelIR/operations/{pool_op.h => PoolOp.h} | 0 .../modelIR/operations/{relu_op.h => ReluOp.h} | 0 .../operations/{reshape_op.h => ReshapeOp.h} | 0 .../modelIR/operations/{scale_op.h => ScaleOp.h} | 0 .../operations/{softmax_op.h => SoftmaxOp.h} | 0 .../operations/{variable_op.h => VariableOp.h} | 0 .../passes/acl_soft_backend/AclCppOpGenerator.cpp | 26 ++++++++++---------- .../nnc/passes/caffe_frontend/caffe_importer.cpp | 2 +- .../nnc/passes/caffe_frontend/caffe_op_creator.cpp | 26 ++++++++++---------- contrib/nnc/passes/interpreter/Interpreter.cpp | 26 ++++++++++---------- contrib/nnc/passes/interpreter/ops/BatchNorm.h | 2 +- .../nnc/passes/interpreter/ops/Depthwise_conv_2D.h | 2 +- contrib/nnc/passes/interpreter/ops/Dropout.h | 2 +- .../nnc/passes/interpreter/ops/FullyConnected.h | 2 +- contrib/nnc/passes/interpreter/ops/Pool.h | 2 +- contrib/nnc/passes/interpreter/ops/Reshape.h | 2 +- contrib/nnc/passes/interpreter/ops/Scale.h | 2 +- contrib/nnc/passes/interpreter/ops/conv_2D.h | 2 +- contrib/nnc/passes/interpreter/ops/conv_FFT.h | 2 +- contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp | 26 ++++++++++---------- contrib/nnc/passes/soft_backend/SBSerializer.cpp | 26 ++++++++++---------- .../passes/tflite_frontend/tflite_op_creator.cpp | 20 ++++++++-------- contrib/nnc/tests/interpreter/graph_creator.cpp | 22 ++++++++--------- contrib/nnc/tests/interpreter/op_info_util.h | 2 +- contrib/nnc/tests/soft_backend/CompileCPP.cpp | 4 ++-- contrib/nnc/unittests/core/Graph.cpp | 4 ++-- contrib/nnc/unittests/core/NodeReplacer.cpp | 2 +- contrib/nnc/unittests/core/ShapeInference.cpp | 2 +- contrib/nnc/unittests/core/ir_node.cpp | 2 +- contrib/nnc/unittests/core/operation.cpp | 4 ++-- .../nnc/unittests/soft_backend/CPPOperations.cpp | 24 +++++++++---------- contrib/nnc/unittests/soft_backend/Generator.cpp | 2 +- 44 files changed, 149 insertions(+), 149 deletions(-) rename contrib/nnc/include/core/modelIR/operations/{batch_norm.h => BatchNormOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{bias_add_op.h => BiasAddOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{capped_relu_op.h => CappedReluOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{concat_op.h => ConcatOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{conv_2d_op.h => Conv2DOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{depthwise_conv2d_op.h => DepthwiseConv2DOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{dropout_op.h => DropoutOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{fully_connected_op.h => FullyConnectedOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{pool_op.h => PoolOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{relu_op.h => ReluOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{reshape_op.h => ReshapeOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{scale_op.h => ScaleOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{softmax_op.h => SoftmaxOp.h} (100%) rename contrib/nnc/include/core/modelIR/operations/{variable_op.h => VariableOp.h} (100%) diff --git a/contrib/nnc/core/modelIR/ShapeInference.cpp b/contrib/nnc/core/modelIR/ShapeInference.cpp index e6442cc..5b720a1 100644 --- a/contrib/nnc/core/modelIR/ShapeInference.cpp +++ b/contrib/nnc/core/modelIR/ShapeInference.cpp @@ -17,22 +17,22 @@ #include #include "core/modelIR/ShapeInference.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/Conv2DOp.h" #include "core/modelIR/operations/Deconv2DOp.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/variable_op.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/VariableOp.h" +#include "core/modelIR/operations/ReluOp.h" #include "core/modelIR/operations/EluOp.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/DropoutOp.h" #include "core/modelIR/operations/TanhOp.h" #include "core/modelIR/operations/ElementwiseOp.h" diff --git a/contrib/nnc/include/core/modelIR/IrDotDumper.h b/contrib/nnc/include/core/modelIR/IrDotDumper.h index ef4348e..e9006b6 100644 --- a/contrib/nnc/include/core/modelIR/IrDotDumper.h +++ b/contrib/nnc/include/core/modelIR/IrDotDumper.h @@ -18,23 +18,23 @@ #define _NNC_BACKEND_INTERPRETER_CORE_DOTDUMPER_ #include "core/modelIR/Visitor.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/Conv2DOp.h" #include "core/modelIR/operations/Deconv2DOp.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/variable_op.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/VariableOp.h" +#include "core/modelIR/operations/ReluOp.h" #include "core/modelIR/operations/EluOp.h" #include "core/modelIR/operations/operation.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/DropoutOp.h" #include "core/modelIR/operations/TanhOp.h" #include "core/modelIR/operations/ElementwiseOp.h" diff --git a/contrib/nnc/include/core/modelIR/graph.h b/contrib/nnc/include/core/modelIR/graph.h index 15d71ff..7b65a96 100644 --- a/contrib/nnc/include/core/modelIR/graph.h +++ b/contrib/nnc/include/core/modelIR/graph.h @@ -23,7 +23,7 @@ #include #include "core/modelIR/operations/operation.h" -#include "core/modelIR/operations/variable_op.h" +#include "core/modelIR/operations/VariableOp.h" #include "core/modelIR/ir_node.h" namespace nnc { diff --git a/contrib/nnc/include/core/modelIR/ir_dot_node_info.h b/contrib/nnc/include/core/modelIR/ir_dot_node_info.h index d6eb521..620aba3 100644 --- a/contrib/nnc/include/core/modelIR/ir_dot_node_info.h +++ b/contrib/nnc/include/core/modelIR/ir_dot_node_info.h @@ -19,7 +19,7 @@ #include "core/modelIR/Shape.h" #include "core/modelIR/operations/common.h" -#include "core/modelIR/operations/pool_op.h" +#include "core/modelIR/operations/PoolOp.h" namespace nnc { diff --git a/contrib/nnc/include/core/modelIR/operations/batch_norm.h b/contrib/nnc/include/core/modelIR/operations/BatchNormOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/batch_norm.h rename to contrib/nnc/include/core/modelIR/operations/BatchNormOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/bias_add_op.h b/contrib/nnc/include/core/modelIR/operations/BiasAddOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/bias_add_op.h rename to contrib/nnc/include/core/modelIR/operations/BiasAddOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/capped_relu_op.h b/contrib/nnc/include/core/modelIR/operations/CappedReluOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/capped_relu_op.h rename to contrib/nnc/include/core/modelIR/operations/CappedReluOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/concat_op.h b/contrib/nnc/include/core/modelIR/operations/ConcatOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/concat_op.h rename to contrib/nnc/include/core/modelIR/operations/ConcatOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/conv_2d_op.h b/contrib/nnc/include/core/modelIR/operations/Conv2DOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/conv_2d_op.h rename to contrib/nnc/include/core/modelIR/operations/Conv2DOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/depthwise_conv2d_op.h b/contrib/nnc/include/core/modelIR/operations/DepthwiseConv2DOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/depthwise_conv2d_op.h rename to contrib/nnc/include/core/modelIR/operations/DepthwiseConv2DOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/dropout_op.h b/contrib/nnc/include/core/modelIR/operations/DropoutOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/dropout_op.h rename to contrib/nnc/include/core/modelIR/operations/DropoutOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/fully_connected_op.h b/contrib/nnc/include/core/modelIR/operations/FullyConnectedOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/fully_connected_op.h rename to contrib/nnc/include/core/modelIR/operations/FullyConnectedOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/pool_op.h b/contrib/nnc/include/core/modelIR/operations/PoolOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/pool_op.h rename to contrib/nnc/include/core/modelIR/operations/PoolOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/relu_op.h b/contrib/nnc/include/core/modelIR/operations/ReluOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/relu_op.h rename to contrib/nnc/include/core/modelIR/operations/ReluOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/reshape_op.h b/contrib/nnc/include/core/modelIR/operations/ReshapeOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/reshape_op.h rename to contrib/nnc/include/core/modelIR/operations/ReshapeOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/scale_op.h b/contrib/nnc/include/core/modelIR/operations/ScaleOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/scale_op.h rename to contrib/nnc/include/core/modelIR/operations/ScaleOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/softmax_op.h b/contrib/nnc/include/core/modelIR/operations/SoftmaxOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/softmax_op.h rename to contrib/nnc/include/core/modelIR/operations/SoftmaxOp.h diff --git a/contrib/nnc/include/core/modelIR/operations/variable_op.h b/contrib/nnc/include/core/modelIR/operations/VariableOp.h similarity index 100% rename from contrib/nnc/include/core/modelIR/operations/variable_op.h rename to contrib/nnc/include/core/modelIR/operations/VariableOp.h diff --git a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp index 84fe940..8b443f9 100644 --- a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp +++ b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp @@ -6,20 +6,20 @@ #include "option/Options.h" #include "core/modelIR/Tensor.h" -#include "core/modelIR/operations/variable_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/conv_2d_op.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/dropout_op.h" -#include "core/modelIR/operations/relu_op.h" -#include "core/modelIR/operations/capped_relu_op.h" +#include "core/modelIR/operations/VariableOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/Conv2DOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/DropoutOp.h" +#include "core/modelIR/operations/ReluOp.h" +#include "core/modelIR/operations/CappedReluOp.h" #include "core/modelIR/operations/TanhOp.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/pool_op.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/PoolOp.h" #include diff --git a/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp b/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp index 17c4f44..2cc5d5b 100644 --- a/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp +++ b/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp @@ -27,7 +27,7 @@ #include "proto_reader.h" #include "core/modelIR/Shape.h" -#include "core/modelIR/operations/variable_op.h" +#include "core/modelIR/operations/VariableOp.h" #include "core/modelIR/TensorUtil.h" #include "pass/PassException.h" diff --git a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp index 62bbbd5..f89f043 100644 --- a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp +++ b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/conv_2d_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/relu_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/Conv2DOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/ReluOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/DropoutOp.h" #include #include #include diff --git a/contrib/nnc/passes/interpreter/Interpreter.cpp b/contrib/nnc/passes/interpreter/Interpreter.cpp index d22e410..0b40b7e 100644 --- a/contrib/nnc/passes/interpreter/Interpreter.cpp +++ b/contrib/nnc/passes/interpreter/Interpreter.cpp @@ -20,21 +20,21 @@ #include "passes/interpreter/Interpreter.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/Conv2DOp.h" #include "core/modelIR/operations/Deconv2DOp.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/variable_op.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/VariableOp.h" +#include "core/modelIR/operations/ReluOp.h" #include "core/modelIR/operations/EluOp.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/DropoutOp.h" #include "core/modelIR/operations/TanhOp.h" #include "core/modelIR/operations/ElementwiseOp.h" diff --git a/contrib/nnc/passes/interpreter/ops/BatchNorm.h b/contrib/nnc/passes/interpreter/ops/BatchNorm.h index 5fd7350..8034808 100644 --- a/contrib/nnc/passes/interpreter/ops/BatchNorm.h +++ b/contrib/nnc/passes/interpreter/ops/BatchNorm.h @@ -20,7 +20,7 @@ #include "OperationImpl.h" #include "Fill.h" -#include "core/modelIR/operations/batch_norm.h" +#include "core/modelIR/operations/BatchNormOp.h" namespace nnc { diff --git a/contrib/nnc/passes/interpreter/ops/Depthwise_conv_2D.h b/contrib/nnc/passes/interpreter/ops/Depthwise_conv_2D.h index 3f54afd..ae1c2a1 100644 --- a/contrib/nnc/passes/interpreter/ops/Depthwise_conv_2D.h +++ b/contrib/nnc/passes/interpreter/ops/Depthwise_conv_2D.h @@ -20,7 +20,7 @@ #include "OperationImpl.h" #include "core/modelIR/operations/common.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" namespace nnc { diff --git a/contrib/nnc/passes/interpreter/ops/Dropout.h b/contrib/nnc/passes/interpreter/ops/Dropout.h index 001c9b1..8fa2d01 100644 --- a/contrib/nnc/passes/interpreter/ops/Dropout.h +++ b/contrib/nnc/passes/interpreter/ops/Dropout.h @@ -20,7 +20,7 @@ #include "OperationImpl.h" #include "Fill.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/DropoutOp.h" namespace nnc { diff --git a/contrib/nnc/passes/interpreter/ops/FullyConnected.h b/contrib/nnc/passes/interpreter/ops/FullyConnected.h index 0ff905e..7688ac6 100644 --- a/contrib/nnc/passes/interpreter/ops/FullyConnected.h +++ b/contrib/nnc/passes/interpreter/ops/FullyConnected.h @@ -18,7 +18,7 @@ #define _NNC_CORE_BACKEND_INTERPRETER_FULLYCONNECTED_ #include "core/modelIR/ShapeRange.h" -#include "core/modelIR/operations/fully_connected_op.h" +#include "core/modelIR/operations/FullyConnectedOp.h" #include "OperationImpl.h" namespace nnc diff --git a/contrib/nnc/passes/interpreter/ops/Pool.h b/contrib/nnc/passes/interpreter/ops/Pool.h index 07b12b6..8b63533 100644 --- a/contrib/nnc/passes/interpreter/ops/Pool.h +++ b/contrib/nnc/passes/interpreter/ops/Pool.h @@ -18,7 +18,7 @@ #define _NNC_CORE_BACKEND_INTERPRETER_POOL_ #include "OperationImpl.h" -#include "core/modelIR/operations/pool_op.h" +#include "core/modelIR/operations/PoolOp.h" #include "core/modelIR/operations/common.h" namespace nnc diff --git a/contrib/nnc/passes/interpreter/ops/Reshape.h b/contrib/nnc/passes/interpreter/ops/Reshape.h index 87515f8..574aad3 100644 --- a/contrib/nnc/passes/interpreter/ops/Reshape.h +++ b/contrib/nnc/passes/interpreter/ops/Reshape.h @@ -17,7 +17,7 @@ #ifndef _NNC_CORE_BACKEND_INTERPRETER_RESHAPE_IMPL_ #define _NNC_CORE_BACKEND_INTERPRETER_RESHAPE_IMPL_ -#include "core/modelIR/operations/reshape_op.h" +#include "core/modelIR/operations/ReshapeOp.h" #include "OperationImpl.h" #include "Fill.h" diff --git a/contrib/nnc/passes/interpreter/ops/Scale.h b/contrib/nnc/passes/interpreter/ops/Scale.h index e1bbd2e..e2e9115 100644 --- a/contrib/nnc/passes/interpreter/ops/Scale.h +++ b/contrib/nnc/passes/interpreter/ops/Scale.h @@ -19,7 +19,7 @@ #include "OperationImpl.h" -#include "core/modelIR/operations/scale_op.h" +#include "core/modelIR/operations/ScaleOp.h" namespace nnc { diff --git a/contrib/nnc/passes/interpreter/ops/conv_2D.h b/contrib/nnc/passes/interpreter/ops/conv_2D.h index d93e1ef..2bf7e7d 100644 --- a/contrib/nnc/passes/interpreter/ops/conv_2D.h +++ b/contrib/nnc/passes/interpreter/ops/conv_2D.h @@ -18,7 +18,7 @@ #define _NNC_CORE_BACKEND_INTERPRETER_CONV2D_IMPL_ #include "OperationImpl.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/Conv2DOp.h" namespace nnc { diff --git a/contrib/nnc/passes/interpreter/ops/conv_FFT.h b/contrib/nnc/passes/interpreter/ops/conv_FFT.h index 982a94e..463ed1b 100644 --- a/contrib/nnc/passes/interpreter/ops/conv_FFT.h +++ b/contrib/nnc/passes/interpreter/ops/conv_FFT.h @@ -42,7 +42,7 @@ #include #include "OperationImpl.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/Conv2DOp.h" namespace nnc { diff --git a/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp b/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp index b0b5a9f..6fe7c52 100644 --- a/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp +++ b/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp @@ -22,21 +22,21 @@ #include "core/modelIR/Shape.h" #include "core/modelIR/ShapeRange.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/Conv2DOp.h" #include "core/modelIR/operations/Deconv2DOp.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/ReluOp.h" #include "core/modelIR/operations/EluOp.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/DropoutOp.h" #include "core/modelIR/operations/TanhOp.h" #include "core/modelIR/operations/ElementwiseOp.h" diff --git a/contrib/nnc/passes/soft_backend/SBSerializer.cpp b/contrib/nnc/passes/soft_backend/SBSerializer.cpp index 3db71d6..943cde5 100644 --- a/contrib/nnc/passes/soft_backend/SBSerializer.cpp +++ b/contrib/nnc/passes/soft_backend/SBSerializer.cpp @@ -20,21 +20,21 @@ #include "CommonData.def" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/conv_2d_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/Conv2DOp.h" #include "core/modelIR/operations/Deconv2DOp.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/ReluOp.h" #include "core/modelIR/operations/EluOp.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/batch_norm.h" -#include "core/modelIR/operations/scale_op.h" -#include "core/modelIR/operations/dropout_op.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/BatchNormOp.h" +#include "core/modelIR/operations/ScaleOp.h" +#include "core/modelIR/operations/DropoutOp.h" #include "core/modelIR/operations/TanhOp.h" #include "core/modelIR/operations/ElementwiseOp.h" #include "core/modelIR/ir_node.h" diff --git a/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp b/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp index 36cdc9d..99b78f6 100644 --- a/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp +++ b/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp @@ -17,16 +17,16 @@ #include "tflite_op_creator.h" #include "schema_generated.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/conv_2d_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/relu_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/reshape_op.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/Conv2DOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/ReluOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/ReshapeOp.h" #include "pass/PassException.h" using namespace nnc::mir; diff --git a/contrib/nnc/tests/interpreter/graph_creator.cpp b/contrib/nnc/tests/interpreter/graph_creator.cpp index 877193a..952417f 100644 --- a/contrib/nnc/tests/interpreter/graph_creator.cpp +++ b/contrib/nnc/tests/interpreter/graph_creator.cpp @@ -17,17 +17,17 @@ #include #include -#include "core/modelIR/operations/variable_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/conv_2d_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/relu_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/softmax_op.h" +#include "core/modelIR/operations/VariableOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/Conv2DOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/ReluOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" #include "core/modelIR/ShapeInference.h" #include "passes/common_frontend/shape_helper.h" diff --git a/contrib/nnc/tests/interpreter/op_info_util.h b/contrib/nnc/tests/interpreter/op_info_util.h index 5a2693d..25c0b38 100644 --- a/contrib/nnc/tests/interpreter/op_info_util.h +++ b/contrib/nnc/tests/interpreter/op_info_util.h @@ -22,7 +22,7 @@ #include "core/modelIR/TensorVariant.h" #include "core/modelIR/operations/common.h" -#include "core/modelIR/operations/pool_op.h" +#include "core/modelIR/operations/PoolOp.h" #include "core/modelIR/ShapeInference.h" diff --git a/contrib/nnc/tests/soft_backend/CompileCPP.cpp b/contrib/nnc/tests/soft_backend/CompileCPP.cpp index 1c1ba68..27252a4 100644 --- a/contrib/nnc/tests/soft_backend/CompileCPP.cpp +++ b/contrib/nnc/tests/soft_backend/CompileCPP.cpp @@ -30,8 +30,8 @@ #include "core/modelIR/graph.h" #include "core/modelIR/Shape.h" -#include "core/modelIR/operations/relu_op.h" -#include "core/modelIR/operations/variable_op.h" +#include "core/modelIR/operations/ReluOp.h" +#include "core/modelIR/operations/VariableOp.h" #include "core/modelIR/ShapeInference.h" #include "passes/soft_backend/CPPGenerator.h" diff --git a/contrib/nnc/unittests/core/Graph.cpp b/contrib/nnc/unittests/core/Graph.cpp index 7d9dc23..5e88db2 100644 --- a/contrib/nnc/unittests/core/Graph.cpp +++ b/contrib/nnc/unittests/core/Graph.cpp @@ -1,9 +1,9 @@ #include #include "core/modelIR/graph.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/ReluOp.h" -#include "core/modelIR/operations/concat_op.h" +#include "core/modelIR/operations/ConcatOp.h" namespace { diff --git a/contrib/nnc/unittests/core/NodeReplacer.cpp b/contrib/nnc/unittests/core/NodeReplacer.cpp index fbc2014..bdc4f81 100644 --- a/contrib/nnc/unittests/core/NodeReplacer.cpp +++ b/contrib/nnc/unittests/core/NodeReplacer.cpp @@ -1,7 +1,7 @@ #include #include "core/modelIR/graph.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/ReluOp.h" namespace { diff --git a/contrib/nnc/unittests/core/ShapeInference.cpp b/contrib/nnc/unittests/core/ShapeInference.cpp index 2d68b0a..3f06e2a 100644 --- a/contrib/nnc/unittests/core/ShapeInference.cpp +++ b/contrib/nnc/unittests/core/ShapeInference.cpp @@ -16,7 +16,7 @@ #include "core/modelIR/graph.h" #include "core/modelIR/ShapeInference.h" -#include "core/modelIR/operations/reshape_op.h" +#include "core/modelIR/operations/ReshapeOp.h" #include "core/modelIR/Shape.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/core/ir_node.cpp b/contrib/nnc/unittests/core/ir_node.cpp index 99acb73..7a197bd 100644 --- a/contrib/nnc/unittests/core/ir_node.cpp +++ b/contrib/nnc/unittests/core/ir_node.cpp @@ -15,7 +15,7 @@ */ #include "core/modelIR/operations/operation.h" -#include "core/modelIR/operations/reshape_op.h" +#include "core/modelIR/operations/ReshapeOp.h" #include "core/modelIR/ir_node.h" #include diff --git a/contrib/nnc/unittests/core/operation.cpp b/contrib/nnc/unittests/core/operation.cpp index 84bfec5..6604989 100644 --- a/contrib/nnc/unittests/core/operation.cpp +++ b/contrib/nnc/unittests/core/operation.cpp @@ -15,8 +15,8 @@ */ #include "core/modelIR/operations/operation.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/concat_op.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/ConcatOp.h" #include diff --git a/contrib/nnc/unittests/soft_backend/CPPOperations.cpp b/contrib/nnc/unittests/soft_backend/CPPOperations.cpp index 12992a0..f7d5be6 100644 --- a/contrib/nnc/unittests/soft_backend/CPPOperations.cpp +++ b/contrib/nnc/unittests/soft_backend/CPPOperations.cpp @@ -47,18 +47,18 @@ #include "SBSerializer.h" // operations part -#include "core/modelIR/operations/variable_op.h" -#include "core/modelIR/operations/fully_connected_op.h" -#include "core/modelIR/operations/conv_2d_op.h" -#include "core/modelIR/operations/depthwise_conv2d_op.h" -#include "core/modelIR/operations/pool_op.h" -#include "core/modelIR/operations/relu_op.h" -#include "core/modelIR/operations/capped_relu_op.h" -#include "core/modelIR/operations/reshape_op.h" -#include "core/modelIR/operations/concat_op.h" -#include "core/modelIR/operations/bias_add_op.h" -#include "core/modelIR/operations/softmax_op.h" -#include "core/modelIR/operations/scale_op.h" +#include "core/modelIR/operations/VariableOp.h" +#include "core/modelIR/operations/FullyConnectedOp.h" +#include "core/modelIR/operations/Conv2DOp.h" +#include "core/modelIR/operations/DepthwiseConv2DOp.h" +#include "core/modelIR/operations/PoolOp.h" +#include "core/modelIR/operations/ReluOp.h" +#include "core/modelIR/operations/CappedReluOp.h" +#include "core/modelIR/operations/ReshapeOp.h" +#include "core/modelIR/operations/ConcatOp.h" +#include "core/modelIR/operations/BiasAddOp.h" +#include "core/modelIR/operations/SoftmaxOp.h" +#include "core/modelIR/operations/ScaleOp.h" // various headers #include "core/modelIR/TensorVariant.h" diff --git a/contrib/nnc/unittests/soft_backend/Generator.cpp b/contrib/nnc/unittests/soft_backend/Generator.cpp index 6189920..b62da3e 100644 --- a/contrib/nnc/unittests/soft_backend/Generator.cpp +++ b/contrib/nnc/unittests/soft_backend/Generator.cpp @@ -15,7 +15,7 @@ */ #include "passes/soft_backend/CPPGenerator.h" -#include "core/modelIR/operations/relu_op.h" +#include "core/modelIR/operations/ReluOp.h" #include -- 2.7.4