From 772e17f8a6683cf3f19cba15c7a1e677fe07a559 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 13 Jul 2018 12:25:33 +0100 Subject: COMPMID-1188: Substream copy constructor primitives. Change-Id: I50b0d9d2f6bfbcd7bfacf31090b94f551fa00bbe Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139876 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- arm_compute/graph/frontend/SubStream.h | 8 -------- examples/graph_inception_v3.cpp | 8 ++++---- examples/graph_inception_v4.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/arm_compute/graph/frontend/SubStream.h b/arm_compute/graph/frontend/SubStream.h index c084899c66..b75953482e 100644 --- a/arm_compute/graph/frontend/SubStream.h +++ b/arm_compute/graph/frontend/SubStream.h @@ -52,14 +52,6 @@ public: * @param[in] s Parent stream */ SubStream(IStream &s); - /** Prevent instances of this class from being copied (As this class contains pointers) */ - SubStream(const SubStream &) = delete; - /** Default move constructor */ - SubStream(SubStream &&) = default; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - SubStream &operator=(const SubStream &) = delete; - /** Default move assignment operator */ - SubStream &operator=(SubStream &&) = default; // Inherited overridden methods void add_layer(ILayer &layer) override; diff --git a/examples/graph_inception_v3.cpp b/examples/graph_inception_v3.cpp index 30b1b7d7ce..639554ebfc 100644 --- a/examples/graph_inception_v3.cpp +++ b/examples/graph_inception_v3.cpp @@ -719,7 +719,7 @@ private: .set_name(param_path + "/Branch_1/Conv2d_0a_1x1/BatchNorm/batchnorm") << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)).set_name(param_path + "/Branch_1/Conv2d_0a_1x1/Relu"); - SubStream i_b1(static_cast(i_b)); + SubStream i_b1(i_b); i_b1 << ConvolutionLayer( 3U, 1U, std::get<1>(b_filters), get_weights_accessor(data_path, total_path + "Branch_1_Conv2d_0b_1x3_weights.npy"), @@ -735,7 +735,7 @@ private: .set_name(param_path + "/Branch_1/Conv2d_0b_1x3/BatchNorm/batchnorm") << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)).set_name(param_path + "/Branch_1/Conv2d_0b_1x3/Relu"); - SubStream i_b2(static_cast(i_b)); + SubStream i_b2(i_b); i_b2 << ConvolutionLayer( 1U, 3U, std::get<2>(b_filters), get_weights_accessor(data_path, total_path + "Branch_1_Conv2d" + conv_id + "3x1_weights.npy"), @@ -784,7 +784,7 @@ private: .set_name(param_path + "/Branch_2/Conv2d_0b_3x3/BatchNorm/batchnorm") << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)).set_name(param_path + "/Branch_2/Conv2d_0b_3x3/Relu"); - SubStream i_c1(static_cast(i_c)); + SubStream i_c1(i_c); i_c1 << ConvolutionLayer( 3U, 1U, std::get<2>(c_filters), get_weights_accessor(data_path, total_path + "Branch_2_Conv2d_0c_1x3_weights.npy"), @@ -800,7 +800,7 @@ private: .set_name(param_path + "/Branch_2/Conv2d_0c_1x3/BatchNorm/batchnorm") << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)).set_name(param_path + "/Branch_2/Conv2d_0c_1x3/Relu"); - SubStream i_c2(static_cast(i_c)); + SubStream i_c2(i_c); i_c2 << ConvolutionLayer( 1U, 3U, std::get<3>(c_filters), get_weights_accessor(data_path, total_path + "Branch_2_Conv2d_0d_3x1_weights.npy"), diff --git a/examples/graph_inception_v4.cpp b/examples/graph_inception_v4.cpp index e7c1bc69e2..e048766634 100644 --- a/examples/graph_inception_v4.cpp +++ b/examples/graph_inception_v4.cpp @@ -598,7 +598,7 @@ private: 0.001f) << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)); - SubStream i_b1(static_cast(i_b)); + SubStream i_b1(i_b); i_b1 << ConvolutionLayer( 3U, 1U, 256U, get_weights_accessor(data_path, total_path + "Branch_1_Conv2d_0b_1x3_weights.npy"), @@ -612,7 +612,7 @@ private: 0.001f) << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)); - SubStream i_b2(static_cast(i_b)); + SubStream i_b2(i_b); i_b2 << ConvolutionLayer( 1U, 3U, 256U, get_weights_accessor(data_path, total_path + "Branch_1_Conv2d_0c_3x1_weights.npy"), @@ -667,7 +667,7 @@ private: 0.001f) << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)); - SubStream i_c1(static_cast(i_c)); + SubStream i_c1(i_c); i_c1 << ConvolutionLayer( 3U, 1U, 256U, get_weights_accessor(data_path, total_path + "Branch_2_Conv2d_0d_1x3_weights.npy"), @@ -681,7 +681,7 @@ private: 0.001f) << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)); - SubStream i_c2(static_cast(i_c)); + SubStream i_c2(i_c); i_c2 << ConvolutionLayer( 1U, 3U, 256U, get_weights_accessor(data_path, total_path + "Branch_2_Conv2d_0e_3x1_weights.npy"), -- cgit v1.2.1