diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-12-11 17:49:18 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:42:33 +0000 |
commit | 284c2045de0811f423a44d2e665f4f45a9e702fa (patch) | |
tree | 4114492054252d4a78fd03be8d86990c34d2d922 /src/graph | |
parent | 5962f137e4d0291fee336967b333e2bbc7ae3f8a (diff) | |
download | ComputeLibrary-284c2045de0811f423a44d2e665f4f45a9e702fa.tar.gz |
COMPMID-556: Allocate trainable data tensor after configuration
Change-Id: I8a5fd2418dd104a06a0972abf088f64d7c2796d3
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/112779
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'src/graph')
-rw-r--r-- | src/graph/nodes/BatchNormalizationLayer.cpp | 5 | ||||
-rw-r--r-- | src/graph/nodes/DepthwiseConvolutionLayer.cpp | 5 | ||||
-rw-r--r-- | src/graph/nodes/FullyConnectedLayer.cpp | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/graph/nodes/BatchNormalizationLayer.cpp b/src/graph/nodes/BatchNormalizationLayer.cpp index 927ce5e728..7851aa5b9e 100644 --- a/src/graph/nodes/BatchNormalizationLayer.cpp +++ b/src/graph/nodes/BatchNormalizationLayer.cpp @@ -78,6 +78,9 @@ std::unique_ptr<arm_compute::IFunction> BatchNormalizationLayer::instantiate_nod node_ctx.add_output(out); node_ctx.add_parameter<float>("epsilon", _epsilon); + // Configure operation + auto func = OperationRegistry::get().find_operation(OperationType::BatchNormalizationLayer, _target_hint)->configure(node_ctx); + // Fill tensors if(!mean_is_loaded) { @@ -97,5 +100,5 @@ std::unique_ptr<arm_compute::IFunction> BatchNormalizationLayer::instantiate_nod } // Get function - return OperationRegistry::get().find_operation(OperationType::BatchNormalizationLayer, _target_hint)->configure(node_ctx); + return func; }
\ No newline at end of file diff --git a/src/graph/nodes/DepthwiseConvolutionLayer.cpp b/src/graph/nodes/DepthwiseConvolutionLayer.cpp index ceac2a2def..b4598538c1 100644 --- a/src/graph/nodes/DepthwiseConvolutionLayer.cpp +++ b/src/graph/nodes/DepthwiseConvolutionLayer.cpp @@ -72,6 +72,9 @@ std::unique_ptr<arm_compute::IFunction> DepthwiseConvolutionLayer::instantiate_n node_ctx.add_parameter<PadStrideInfo>("ConvolutionInfo", _conv_info); node_ctx.add_parameter<bool>("Optimized3x3", _opt3x3); + // Configure operation + auto func = OperationRegistry::get().find_operation(OperationType::DepthwiseConvolutionLayer, _target_hint)->configure(node_ctx); + // Fill tensors if(!weights_is_loaded) { @@ -83,5 +86,5 @@ std::unique_ptr<arm_compute::IFunction> DepthwiseConvolutionLayer::instantiate_n } // Get function - return OperationRegistry::get().find_operation(OperationType::DepthwiseConvolutionLayer, _target_hint)->configure(node_ctx); + return func; } diff --git a/src/graph/nodes/FullyConnectedLayer.cpp b/src/graph/nodes/FullyConnectedLayer.cpp index 41f679b4ec..219e0f9a93 100644 --- a/src/graph/nodes/FullyConnectedLayer.cpp +++ b/src/graph/nodes/FullyConnectedLayer.cpp @@ -88,6 +88,9 @@ std::unique_ptr<arm_compute::IFunction> FullyConnectedLayer::instantiate_node(Gr node_ctx.add_input(_biases.set_target(_target_hint)); node_ctx.add_output(out); + // Configure operation + auto func = OperationRegistry::get().find_operation(OperationType::FullyConnectedLayer, _target_hint)->configure(node_ctx); + // Fill biases if(!weights_are_loaded) { @@ -99,5 +102,5 @@ std::unique_ptr<arm_compute::IFunction> FullyConnectedLayer::instantiate_node(Gr } // Get function - return OperationRegistry::get().find_operation(OperationType::FullyConnectedLayer, _target_hint)->configure(node_ctx); + return func; } |