From 29b977069b29cb79a7a3ab28d4b8167ae594d60c Mon Sep 17 00:00:00 2001 From: Liangliang He Date: Mon, 30 Oct 2017 15:06:06 +0800 Subject: [PATCH] Refactor new_operator_def to NewOperatorDef --- mace/ops/addn_benchmark.cc | 2 +- mace/ops/addn_test.cc | 2 +- mace/ops/batch_norm_benchmark.cc | 2 +- mace/ops/batch_norm_test.cc | 10 +++++----- mace/ops/channel_shuffle_benchmark.cc | 2 +- mace/ops/channel_shuffle_test.cc | 2 +- mace/ops/concat_benchmark.cc | 2 +- mace/ops/concat_test.cc | 6 +++--- mace/ops/conv_2d_benchmark.cc | 2 +- mace/ops/conv_2d_test.cc | 12 ++++++------ mace/ops/depthwise_conv2d_test.cc | 4 ++-- mace/ops/depthwise_conv_2d_benchmark.cc | 2 +- mace/ops/global_avg_pooling_benchmark.cc | 2 +- mace/ops/global_avg_pooling_test.cc | 4 ++-- mace/ops/ops_test_util.h | 2 +- mace/ops/pooling_benchmark.cc | 2 +- mace/ops/pooling_test.cc | 14 +++++++------- mace/ops/relu_benchmark.cc | 2 +- mace/ops/relu_test.cc | 4 ++-- mace/ops/resize_bilinear_test.cc | 4 ++-- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/mace/ops/addn_benchmark.cc b/mace/ops/addn_benchmark.cc index 9b5ae0ce..ad48f445 100644 --- a/mace/ops/addn_benchmark.cc +++ b/mace/ops/addn_benchmark.cc @@ -17,7 +17,7 @@ static void AddNBenchmark(int iters, int n, int size) { for (int i = 0; i < n; ++i) { op_def_builder.Input(internal::MakeString("Input", i).c_str()); } - op_def_builder.Output("Output").Finalize(net.new_operator_def()); + op_def_builder.Output("Output").Finalize(net.NewOperatorDef()); // Add input data for (int i = 0; i < n; ++i) { diff --git a/mace/ops/addn_test.cc b/mace/ops/addn_test.cc index 2a9763a0..a48d0662 100644 --- a/mace/ops/addn_test.cc +++ b/mace/ops/addn_test.cc @@ -17,7 +17,7 @@ TEST_F(AddnOpTest, AddnOp) { .Input("Input2") .Input("Input3") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input1", {1, 2, 3, 4}); diff --git a/mace/ops/batch_norm_benchmark.cc b/mace/ops/batch_norm_benchmark.cc index 3b23bd6b..499af6f2 100644 --- a/mace/ops/batch_norm_benchmark.cc +++ b/mace/ops/batch_norm_benchmark.cc @@ -21,7 +21,7 @@ static void BatchNorm( .Input("Var") .Input("Epsilon") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/batch_norm_test.cc b/mace/ops/batch_norm_test.cc index 3c71140a..e13df29c 100644 --- a/mace/ops/batch_norm_test.cc +++ b/mace/ops/batch_norm_test.cc @@ -21,7 +21,7 @@ void Simple() { .Input("Var") .Input("Epsilon") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray("Input", {1, 1, 6, 2}, @@ -73,7 +73,7 @@ TEST_F(BatchNormOpTest, SimpleRandomNeon) { .Input("Var") .Input("Epsilon") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); @@ -114,7 +114,7 @@ TEST_F(BatchNormOpTest, ComplexRandomNeon) { .Input("Var") .Input("Epsilon") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); @@ -155,7 +155,7 @@ TEST_F(BatchNormOpTest, SimpleRandomOPENCL) { .Input("Var") .Input("Epsilon") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); @@ -201,7 +201,7 @@ TEST_F(BatchNormOpTest, ComplexRandomOPENCL) { .Input("Var") .Input("Epsilon") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/channel_shuffle_benchmark.cc b/mace/ops/channel_shuffle_benchmark.cc index 782d7bd5..d9f63f3a 100644 --- a/mace/ops/channel_shuffle_benchmark.cc +++ b/mace/ops/channel_shuffle_benchmark.cc @@ -20,7 +20,7 @@ static void ChannelShuffle( .Input("Input") .Output("Output") .AddIntArg("group", group) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/channel_shuffle_test.cc b/mace/ops/channel_shuffle_test.cc index 4a244e9f..ca30029d 100644 --- a/mace/ops/channel_shuffle_test.cc +++ b/mace/ops/channel_shuffle_test.cc @@ -15,7 +15,7 @@ TEST_F(ChannelShuffleOpTest, C8G4) { .Input("Input") .Output("Output") .AddIntArg("group", 4) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data diff --git a/mace/ops/concat_benchmark.cc b/mace/ops/concat_benchmark.cc index a7718714..275886a6 100644 --- a/mace/ops/concat_benchmark.cc +++ b/mace/ops/concat_benchmark.cc @@ -17,7 +17,7 @@ static void ConcatHelper(int iters, int concat_dim, int dim1) { .Input("Input1") .Input("Axis") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data const int kDim0 = 100; diff --git a/mace/ops/concat_test.cc b/mace/ops/concat_test.cc index 52584a69..1d94d467 100644 --- a/mace/ops/concat_test.cc +++ b/mace/ops/concat_test.cc @@ -18,7 +18,7 @@ TEST_F(ConcatOpTest, Simple_Horizon) { .Input("Input1") .Input("Axis") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); std::vector input_shape = {4, 4}; std::vector input0; @@ -56,7 +56,7 @@ TEST_F(ConcatOpTest, Simple_Vertical) { .Input("Input1") .Input("Axis") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); std::vector input_shape = {4, 4}; std::vector input0; @@ -99,7 +99,7 @@ TEST_F(ConcatOpTest, Random) { for (int i = 0; i < num_inputs; ++i) { builder = builder.Input(("Input" + ToString(i)).c_str()); } - builder.Input("Axis").Output("Output").Finalize(net.new_operator_def()); + builder.Input("Axis").Output("Output").Finalize(net.NewOperatorDef()); std::vector shape_data; GenerateRandomIntTypeData({dim}, shape_data, 1, dim); diff --git a/mace/ops/conv_2d_benchmark.cc b/mace/ops/conv_2d_benchmark.cc index 25cdab78..ca3ccf72 100644 --- a/mace/ops/conv_2d_benchmark.cc +++ b/mace/ops/conv_2d_benchmark.cc @@ -35,7 +35,7 @@ static void Conv2d(int iters, .AddIntsArg("strides", {stride, stride}) .AddIntArg("padding", padding) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/conv_2d_test.cc b/mace/ops/conv_2d_test.cc index dbe4b1df..a8e9f189 100644 --- a/mace/ops/conv_2d_test.cc +++ b/mace/ops/conv_2d_test.cc @@ -21,7 +21,7 @@ TEST_F(Conv2dOpTest, Simple_VALID) { .AddIntsArg("strides", {1, 1}) .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add args @@ -55,7 +55,7 @@ TEST_F(Conv2dOpTest, Simple_SAME) { .AddIntsArg("strides", {1, 1}) .AddIntArg("padding", Padding::SAME) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -89,7 +89,7 @@ TEST_F(Conv2dOpTest, Combined) { .AddIntsArg("strides", {2, 2}) .AddIntArg("padding", Padding::SAME) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -126,7 +126,7 @@ void TestConv1x1() { .AddIntsArg("strides", {1, 1}) .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -187,7 +187,7 @@ TEST_F(Conv2dOpTest, AlignedConvNxNS12) { .AddIntsArg("strides", {stride_h, stride_w}) .AddIntArg("padding", type) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, input_channels, height, width}); @@ -236,7 +236,7 @@ TEST_F(Conv2dOpTest, UnalignedConvNxNS12) { .AddIntsArg("strides", {stride_h, stride_w}) .AddIntArg("padding", type) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, input_channels, height, width}); diff --git a/mace/ops/depthwise_conv2d_test.cc b/mace/ops/depthwise_conv2d_test.cc index 03881fb2..05cd5d7a 100644 --- a/mace/ops/depthwise_conv2d_test.cc +++ b/mace/ops/depthwise_conv2d_test.cc @@ -22,7 +22,7 @@ void SimpleValidTest() { .AddIntsArg("strides", {1, 1}) .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray("Input", {1, 2, 2, 3}, @@ -69,7 +69,7 @@ void TestNxNS12(const index_t height, const index_t width) { .AddIntsArg("strides", {stride_h, stride_w}) .AddIntArg("padding", type) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, input_channels, height, width}); diff --git a/mace/ops/depthwise_conv_2d_benchmark.cc b/mace/ops/depthwise_conv_2d_benchmark.cc index 98384c6e..13f64ddf 100644 --- a/mace/ops/depthwise_conv_2d_benchmark.cc +++ b/mace/ops/depthwise_conv_2d_benchmark.cc @@ -33,7 +33,7 @@ static void DepthwiseConv2d(int iters, .AddIntsArg("strides", {stride, stride}) .AddIntArg("padding", padding) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/global_avg_pooling_benchmark.cc b/mace/ops/global_avg_pooling_benchmark.cc index cddb72ee..3638243f 100644 --- a/mace/ops/global_avg_pooling_benchmark.cc +++ b/mace/ops/global_avg_pooling_benchmark.cc @@ -19,7 +19,7 @@ static void GlobalAvgPooling( OpDefBuilder("GlobalAvgPooling", "GlobalAvgPoolingTest") .Input("Input") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/global_avg_pooling_test.cc b/mace/ops/global_avg_pooling_test.cc index 43087a37..da82e534 100644 --- a/mace/ops/global_avg_pooling_test.cc +++ b/mace/ops/global_avg_pooling_test.cc @@ -14,7 +14,7 @@ TEST_F(GlobalAvgPoolingOpTest, 3x7x7_CPU) { OpDefBuilder("GlobalAvgPooling", "GlobalAvgPoolingTest") .Input("Input") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data std::vector input(147); @@ -38,7 +38,7 @@ TEST_F(GlobalAvgPoolingOpTest, 3x7x7_NEON) { OpDefBuilder("GlobalAvgPooling", "GlobalAvgPoolingTest") .Input("Input") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data std::vector input(147); diff --git a/mace/ops/ops_test_util.h b/mace/ops/ops_test_util.h index 62e809d4..dcadf566 100644 --- a/mace/ops/ops_test_util.h +++ b/mace/ops/ops_test_util.h @@ -138,7 +138,7 @@ class OpsTestNet { }); } - OperatorDef *new_operator_def() { + OperatorDef *NewOperatorDef() { op_defs_.emplace_back(OperatorDef()); return &op_defs_[op_defs_.size() - 1]; } diff --git a/mace/ops/pooling_benchmark.cc b/mace/ops/pooling_benchmark.cc index a0b6f4ae..479563ec 100644 --- a/mace/ops/pooling_benchmark.cc +++ b/mace/ops/pooling_benchmark.cc @@ -32,7 +32,7 @@ static void Pooling(int iters, .AddIntsArg("strides", {stride, stride}) .AddIntArg("padding", padding) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {batch, channels, height, width}); diff --git a/mace/ops/pooling_test.cc b/mace/ops/pooling_test.cc index a1f2f99f..cd2dd609 100644 --- a/mace/ops/pooling_test.cc +++ b/mace/ops/pooling_test.cc @@ -24,7 +24,7 @@ TEST_F(PoolingOpTest, MAX_VALID) { .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {1, 1}) .AddIntArg("pooling_type", PoolingType::MAX) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -53,7 +53,7 @@ TEST_F(PoolingOpTest, AVG_VALID) { .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {1, 1}) .AddIntArg("pooling_type", PoolingType::AVG) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -82,7 +82,7 @@ TEST_F(PoolingOpTest, MAX_SAME) { .AddIntArg("padding", Padding::SAME) .AddIntsArg("dilations", {1, 1}) .AddIntArg("pooling_type", PoolingType::MAX) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray("Input", {1, 1, 3, 3}, @@ -108,7 +108,7 @@ TEST_F(PoolingOpTest, MAX_VALID_DILATION) { .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {2, 2}) .AddIntArg("pooling_type", PoolingType::MAX) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -135,7 +135,7 @@ TEST_F(PoolingOpTest, MAX_k2x2s2x2) { .AddIntsArg("strides", {2, 2}) .AddIntArg("padding", Padding::SAME) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -161,7 +161,7 @@ TEST_F(PoolingOpTest, MAX_k3x3s2x2) { .AddIntsArg("strides", {2, 2}) .AddIntArg("padding", Padding::VALID) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( @@ -188,7 +188,7 @@ TEST_F(PoolingOpTest, AVG_k2x2s2x2) { .AddIntsArg("strides", {2, 2}) .AddIntArg("padding", Padding::SAME) .AddIntsArg("dilations", {1, 1}) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddInputFromArray( diff --git a/mace/ops/relu_benchmark.cc b/mace/ops/relu_benchmark.cc index 0a2158d6..a1fc6ed4 100644 --- a/mace/ops/relu_benchmark.cc +++ b/mace/ops/relu_benchmark.cc @@ -16,7 +16,7 @@ static void ReluBenchmark(int iters, int size) { OpDefBuilder("Relu", "ReluBM") .Input("Input") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {size}); diff --git a/mace/ops/relu_test.cc b/mace/ops/relu_test.cc index f59d5eb6..5a6eb7ca 100644 --- a/mace/ops/relu_test.cc +++ b/mace/ops/relu_test.cc @@ -15,7 +15,7 @@ TEST_F(ReluOpTest, ReluOp) { OpDefBuilder("Relu", "ReluTest") .Input("Input") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {1, 2, 3, 5}); @@ -39,7 +39,7 @@ TEST_F(ReluOpTest, ReluOpWithMax) { .Input("Input") .Output("Output") .AddFloatArg("max_limit", 0.5) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data net.AddRandomInput("Input", {1, 2, 3, 5}); diff --git a/mace/ops/resize_bilinear_test.cc b/mace/ops/resize_bilinear_test.cc index 1036da47..9d95564b 100644 --- a/mace/ops/resize_bilinear_test.cc +++ b/mace/ops/resize_bilinear_test.cc @@ -18,7 +18,7 @@ TEST_F(ResizeBilinearTest, ResizeBilinearWOAlignCorners) { .Input("Input") .Input("OutSize") .Output("Output") - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data vector input(24); @@ -44,7 +44,7 @@ TEST_F(ResizeBilinearTest, ResizeBilinearWAlignCorners) { .Input("OutSize") .Output("Output") .AddIntArg("align_corners", 1) - .Finalize(net.new_operator_def()); + .Finalize(net.NewOperatorDef()); // Add input data vector input(24); -- GitLab