diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-04-17 13:23:26 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:37 +0000 |
commit | 41c482d672ca971c9ff49c9aec32591fcffd7b1c (patch) | |
tree | a7773e7b07304cc3ef773f67e9d0a4efb8376a1a /examples/graph_inception_v4.cpp | |
parent | ecb1c62635b04600de0d04e8fe054283847449a0 (diff) | |
download | ComputeLibrary-41c482d672ca971c9ff49c9aec32591fcffd7b1c.tar.gz |
COMPMID-1042: Graph / Stream not working on x86
Avoid unspecified behavior in graph construction.
This is fixed in C++17.
Change-Id: I4ef45cb139bbd838103a9922441e32d2d16c33d2
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/127975
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'examples/graph_inception_v4.cpp')
-rw-r--r-- | examples/graph_inception_v4.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/examples/graph_inception_v4.cpp b/examples/graph_inception_v4.cpp index 1f7875176f..d505133833 100644 --- a/examples/graph_inception_v4.cpp +++ b/examples/graph_inception_v4.cpp @@ -123,33 +123,33 @@ public: get_random_accessor(1.f, 1.f), get_weights_accessor(data_path, "/cnn_data/inceptionv4_model/Conv2d_2b_3x3_BatchNorm_beta.npy"), 0.001f) - << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)) - - << get_mixed_3a(data_path) - << get_mixed_4a(data_path) - << get_mixed_5a(data_path) - // 4 inception A blocks - << get_inceptionA_block(data_path, "Mixed_5b") - << get_inceptionA_block(data_path, "Mixed_5c") - << get_inceptionA_block(data_path, "Mixed_5d") - << get_inceptionA_block(data_path, "Mixed_5e") - // reduction A block - << get_reductionA_block(data_path) - // 7 inception B blocks - << get_inceptionB_block(data_path, "Mixed_6b") - << get_inceptionB_block(data_path, "Mixed_6c") - << get_inceptionB_block(data_path, "Mixed_6d") - << get_inceptionB_block(data_path, "Mixed_6e") - << get_inceptionB_block(data_path, "Mixed_6f") - << get_inceptionB_block(data_path, "Mixed_6g") - << get_inceptionB_block(data_path, "Mixed_6h") - // reduction B block - << get_reductionB_block(data_path) - // 3 inception C blocks - << get_inceptionC_block(data_path, "Mixed_7b") - << get_inceptionC_block(data_path, "Mixed_7c") - << get_inceptionC_block(data_path, "Mixed_7d") - << PoolingLayer(PoolingLayerInfo(PoolingType::AVG)) + << ActivationLayer(ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)); + + graph << get_mixed_3a(data_path); + graph << get_mixed_4a(data_path); + graph << get_mixed_5a(data_path); + // 4 inception A blocks + graph << get_inceptionA_block(data_path, "Mixed_5b"); + graph << get_inceptionA_block(data_path, "Mixed_5c"); + graph << get_inceptionA_block(data_path, "Mixed_5d"); + graph << get_inceptionA_block(data_path, "Mixed_5e"); + // reduction A block + graph << get_reductionA_block(data_path); + // 7 inception B blocks + graph << get_inceptionB_block(data_path, "Mixed_6b"); + graph << get_inceptionB_block(data_path, "Mixed_6c"); + graph << get_inceptionB_block(data_path, "Mixed_6d"); + graph << get_inceptionB_block(data_path, "Mixed_6e"); + graph << get_inceptionB_block(data_path, "Mixed_6f"); + graph << get_inceptionB_block(data_path, "Mixed_6g"); + graph << get_inceptionB_block(data_path, "Mixed_6h"); + // reduction B block + graph << get_reductionB_block(data_path); + // 3 inception C blocks + graph << get_inceptionC_block(data_path, "Mixed_7b"); + graph << get_inceptionC_block(data_path, "Mixed_7c"); + graph << get_inceptionC_block(data_path, "Mixed_7d"); + graph << PoolingLayer(PoolingLayerInfo(PoolingType::AVG)) << FlattenLayer() << FullyConnectedLayer( 1001U, |