From 6416592871a6ef934bca90d4ec5df19cebacffc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/On-Device=20Lab=28SR=29/Princip?= =?utf8?q?al=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 27 Jun 2019 10:24:02 +0900 Subject: [PATCH] [moco-tf] Revisit tests as Import (#3991) This will revisit unit tests as Import and do Import testing Signed-off-by: SaeHie Park --- .../src/Annotations/ShapeInferenceData.test.cpp | 8 +-- contrib/moco-tf/src/Import.test.cpp | 11 +--- contrib/moco-tf/src/NodeShape.test.cpp | 10 ++-- contrib/moco-tf/src/Op/AvgPool2D.test.cpp | 17 +++--- contrib/moco-tf/src/Op/BiasAdd.test.cpp | 24 ++++----- contrib/moco-tf/src/Op/Concat.test.cpp | 38 ++++++-------- contrib/moco-tf/src/Op/Const.test.cpp | 60 ++++++++++------------ contrib/moco-tf/src/Op/Conv2D.test.cpp | 28 ++++------ contrib/moco-tf/src/Op/MaxPool2D.test.cpp | 16 +++--- contrib/moco-tf/src/Op/Placeholder.test.cpp | 45 ++++++++-------- contrib/moco-tf/src/Op/Relu.test.cpp | 15 +++--- 11 files changed, 114 insertions(+), 158 deletions(-) diff --git a/contrib/moco-tf/src/Annotations/ShapeInferenceData.test.cpp b/contrib/moco-tf/src/Annotations/ShapeInferenceData.test.cpp index 54c885b..bf10203 100644 --- a/contrib/moco-tf/src/Annotations/ShapeInferenceData.test.cpp +++ b/contrib/moco-tf/src/Annotations/ShapeInferenceData.test.cpp @@ -18,7 +18,7 @@ #include -TEST(TensorFlowFrontend, shapeinferencedata_tensor_get) +TEST(TensorFlowImport, shapeinferencedata_tensor_get) { moco::tf::ShapeInferenceData shapedata; @@ -37,7 +37,7 @@ TEST(TensorFlowFrontend, shapeinferencedata_tensor_get) ASSERT_EQ(tensor.dim(3), 4); } -TEST(TensorFlowFrontend, shapeinferencedata_feature) +TEST(TensorFlowImport, shapeinferencedata_feature) { loco::FeatureShape feature_s; @@ -58,7 +58,7 @@ TEST(TensorFlowFrontend, shapeinferencedata_feature) ASSERT_EQ(feature_g.depth(), 4); } -TEST(TensorFlowFrontend, shapeinferencedata_filter) +TEST(TensorFlowImport, shapeinferencedata_filter) { loco::FilterShape filter_s; @@ -81,7 +81,7 @@ TEST(TensorFlowFrontend, shapeinferencedata_filter) ASSERT_EQ(filter_g.depth(), 4); } -TEST(TensorFlowFrontend, shapeinferencedata_bias) +TEST(TensorFlowImport, shapeinferencedata_bias) { // Note: this may change when loco::BiasShape becomes available diff --git a/contrib/moco-tf/src/Import.test.cpp b/contrib/moco-tf/src/Import.test.cpp index 412f59d..885e79e 100644 --- a/contrib/moco-tf/src/Import.test.cpp +++ b/contrib/moco-tf/src/Import.test.cpp @@ -22,12 +22,6 @@ #include -#include -#include -#include - -#include - using namespace moco::tf::test; TEST(TensorFlowImport, Dummy) { moco::tf::Import import; } @@ -87,14 +81,11 @@ TEST(TensorFlowImport, load_model_withio) moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(basic_pbtxtdata, std::strlen(basic_pbtxtdata)); - signature.add_input(moco::tf::TensorName("Placeholder", 0)); signature.add_output(moco::tf::TensorName("output/identity", 0)); tensorflow::GraphDef graph_def; - google::protobuf::io::IstreamInputStream iis(&mempb); - google::protobuf::TextFormat::Parse(&iis, &graph_def); + EXPECT_TRUE(parse_graphdef(basic_pbtxtdata, graph_def)); std::unique_ptr graph = import.load(signature, graph_def); loco::Graph::InputContext *inputs = graph->inputs(); diff --git a/contrib/moco-tf/src/NodeShape.test.cpp b/contrib/moco-tf/src/NodeShape.test.cpp index d47f3f9..1f30929 100644 --- a/contrib/moco-tf/src/NodeShape.test.cpp +++ b/contrib/moco-tf/src/NodeShape.test.cpp @@ -23,7 +23,7 @@ #include -TEST(TensorFlowFrontend, nodeshape_tensor_access) +TEST(TensorFlowImport, nodeshape_tensor_access) { loco::TensorShape source; @@ -42,7 +42,7 @@ TEST(TensorFlowFrontend, nodeshape_tensor_access) ASSERT_EQ(tensor.dim(2), 3); } -TEST(TensorFlowFrontend, nodeshape_feature_access) +TEST(TensorFlowImport, nodeshape_feature_access) { loco::FeatureShape source; @@ -61,7 +61,7 @@ TEST(TensorFlowFrontend, nodeshape_feature_access) ASSERT_EQ(feature.depth(), 4); } -TEST(TensorFlowFrontend, nodeshape_filter_access) +TEST(TensorFlowImport, nodeshape_filter_access) { loco::FilterShape source; @@ -80,7 +80,7 @@ TEST(TensorFlowFrontend, nodeshape_filter_access) ASSERT_EQ(filter.depth(), 4); } -TEST(TensorFlowFrontend, nodeshape_bias_access) +TEST(TensorFlowImport, nodeshape_bias_access) { loco_tobe::BiasShape source; @@ -93,7 +93,7 @@ TEST(TensorFlowFrontend, nodeshape_bias_access) ASSERT_EQ(bias.value(), 3); } -TEST(TensorFlowFrontend, featureshape_from_shapeinfdata) +TEST(TensorFlowImport, featureshape_from_shapeinfdata) { // Prepare a node and annotate ShapeInferenceData loco::Graph graph; diff --git a/contrib/moco-tf/src/Op/AvgPool2D.test.cpp b/contrib/moco-tf/src/Op/AvgPool2D.test.cpp index e787147..514e671 100644 --- a/contrib/moco-tf/src/Op/AvgPool2D.test.cpp +++ b/contrib/moco-tf/src/Op/AvgPool2D.test.cpp @@ -16,8 +16,7 @@ #include "TestHelper.h" -#include -#include +#include "Import.h" #include #include @@ -25,9 +24,6 @@ #include -#include - -#include #include using namespace moco::tf::test; @@ -119,17 +115,16 @@ node { } // namespace -TEST(TensorFlowFrontend, AvgPool2D_01) +TEST(TensorFlowImport, AvgPool2D_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(avgpool2d_01_pbtxtdata, std::strlen(avgpool2d_01_pbtxtdata)); - signature.add_output(moco::tf::TensorName("avgpool2d", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(avgpool2d_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // test 1. // loco node : ConstGen - FeatureEncode - AvgPool2D - FeatureDecode - Push diff --git a/contrib/moco-tf/src/Op/BiasAdd.test.cpp b/contrib/moco-tf/src/Op/BiasAdd.test.cpp index 2550f48..6192cac 100644 --- a/contrib/moco-tf/src/Op/BiasAdd.test.cpp +++ b/contrib/moco-tf/src/Op/BiasAdd.test.cpp @@ -16,14 +16,12 @@ #include "TestHelper.h" -#include +#include "Import.h" #include #include -#include - using namespace moco::tf::test; namespace @@ -95,15 +93,15 @@ node { } // namespace -TEST(TensorFlowFrontend, bias_add_01) +TEST(TensorFlowImport, bias_add_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; signature.add_output(moco::tf::TensorName("out", 0)); - imemstream mempb(bias_add_01_pbtxtdata, std::strlen(bias_add_01_pbtxtdata)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(bias_add_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // test 1. // loco node : 1. ConstGen ------------------+-- 4. BiasAdd -- 5. Push @@ -211,15 +209,15 @@ node { } // namespace -TEST(TensorFlowFrontend, bias_add_NCHW_axis) +TEST(TensorFlowImport, bias_add_NCHW_axis) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; signature.add_output(moco::tf::TensorName("out", 0)); - imemstream mempb(bias_add_NCHW_pbtxtdata, std::strlen(bias_add_NCHW_pbtxtdata)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(bias_add_NCHW_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // testing axis value of biasAdd loco::Graph::NodeContext *loco_nodes = graph->nodes(); diff --git a/contrib/moco-tf/src/Op/Concat.test.cpp b/contrib/moco-tf/src/Op/Concat.test.cpp index c247b2c..2d06916 100644 --- a/contrib/moco-tf/src/Op/Concat.test.cpp +++ b/contrib/moco-tf/src/Op/Concat.test.cpp @@ -16,15 +16,12 @@ #include "TestHelper.h" -#include -#include +#include "Import.h" #include #include -#include - using namespace moco::tf::test; namespace @@ -147,18 +144,17 @@ node { } // namespace -TEST(TensorFlowFrontend, concat_01) +TEST(TensorFlowImport, concat_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(concat_01_pbtxtdata, std::strlen(concat_01_pbtxtdata)); - moco::tf::TensorName output("Concat", 0); signature.add_output(output); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(concat_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // check all nodes are created // - 0 input, 3 const, 1 concat, 1 output @@ -341,18 +337,17 @@ node { } // namespace -TEST(TensorFlowFrontend, concat_02) +TEST(TensorFlowImport, concat_02) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(concat_02_pbtxtdata, std::strlen(concat_02_pbtxtdata)); - moco::tf::TensorName output("Concat", 0); signature.add_output(output); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(concat_02_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // check all nodes are created // - 0 input, 4 const, 2 concat, 1 output @@ -490,19 +485,18 @@ node { } // namespace -TEST(TensorFlowFrontend, concat_03) +TEST(TensorFlowImport, concat_03) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(concat_03_pbtxtdata, std::strlen(concat_03_pbtxtdata)); - signature.add_input(moco::tf::TensorName("Input01", 0)); signature.add_input(moco::tf::TensorName("Input02", 0)); signature.add_output(moco::tf::TensorName("Concat", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(concat_03_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // check all nodes are created // - 2 pull, 1 const, 1 concat, 1 output diff --git a/contrib/moco-tf/src/Op/Const.test.cpp b/contrib/moco-tf/src/Op/Const.test.cpp index ef5f23b..9eb35c9 100644 --- a/contrib/moco-tf/src/Op/Const.test.cpp +++ b/contrib/moco-tf/src/Op/Const.test.cpp @@ -16,15 +16,12 @@ #include "TestHelper.h" -#include -#include +#include "Import.h" #include #include -#include - #include #include @@ -73,17 +70,16 @@ node { } // namespace -TEST(TensorFlowFrontend, const_float_01) +TEST(TensorFlowImport, const_float_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(const_float_01_pbtxtdata, std::strlen(const_float_01_pbtxtdata)); - signature.add_output(moco::tf::TensorName("const/float", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(const_float_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); loco::Graph::OutputContext *outputs = graph->outputs(); ASSERT_EQ(outputs->size(), 1); @@ -144,17 +140,16 @@ node { } // namespace -TEST(TensorFlowFrontend, const_float_02) +TEST(TensorFlowImport, const_float_02) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(const_float_02_pbtxtdata, std::strlen(const_float_02_pbtxtdata)); - signature.add_output(moco::tf::TensorName("const/float", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(const_float_02_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); loco::Graph::OutputContext *outputs = graph->outputs(); ASSERT_EQ(outputs->size(), 1); @@ -216,17 +211,16 @@ node { } // namespace -TEST(TensorFlowFrontend, const_float_03) +TEST(TensorFlowImport, const_float_03) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(const_float_03_pbtxtdata, std::strlen(const_float_03_pbtxtdata)); - signature.add_output(moco::tf::TensorName("const/float", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(const_float_03_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); loco::Graph::OutputContext *outputs = graph->outputs(); ASSERT_EQ(outputs->size(), 1); @@ -288,17 +282,16 @@ node { } // namespace -TEST(TensorFlowFrontend, const_float_04) +TEST(TensorFlowImport, const_float_04) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(const_float_04_pbtxtdata, std::strlen(const_float_04_pbtxtdata)); - signature.add_output(moco::tf::TensorName("const/float", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(const_float_04_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); loco::Graph::OutputContext *outputs = graph->outputs(); ASSERT_EQ(outputs->size(), 1); @@ -360,17 +353,16 @@ node { } // namespace -TEST(TensorFlowFrontend, const_int32_04) +TEST(TensorFlowImport, const_int32_04) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(const_int32_04_pbtxtdata, std::strlen(const_int32_04_pbtxtdata)); - signature.add_output(moco::tf::TensorName("const/int", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(const_int32_04_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); loco::Graph::OutputContext *outputs = graph->outputs(); ASSERT_EQ(outputs->size(), 1); diff --git a/contrib/moco-tf/src/Op/Conv2D.test.cpp b/contrib/moco-tf/src/Op/Conv2D.test.cpp index 830ba6f..93b28bd 100644 --- a/contrib/moco-tf/src/Op/Conv2D.test.cpp +++ b/contrib/moco-tf/src/Op/Conv2D.test.cpp @@ -16,8 +16,7 @@ #include "TestHelper.h" -#include -#include +#include "Import.h" #include #include @@ -25,9 +24,6 @@ #include -#include - -#include #include using namespace moco::tf::test; @@ -92,17 +88,16 @@ node { // clang-format on } // namespace -TEST(TensorFlowFrontend, Conv2D_01) +TEST(TensorFlowImport, Conv2D_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(conv2d_01_pbtxtdata, std::strlen(conv2d_01_pbtxtdata)); - signature.add_output(moco::tf::TensorName("conv2d", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(conv2d_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // test 1. // loco node : ConstGen - FeatureEncode -- Conv2D - FeatureDecode - Push @@ -298,18 +293,17 @@ node { ); } // namespace -TEST(TensorFlowFrontend, Conv2D_inception_indexed_tensor_name) +TEST(TensorFlowImport, Conv2D_inception_indexed_tensor_name) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(conv2d_inception_pbtxtdata, std::strlen(conv2d_inception_pbtxtdata)); - signature.add_input(moco::tf::TensorName("input", 0)); signature.add_output(moco::tf::TensorName("InceptionV3/InceptionV3/Conv2d_1a_3x3/Conv2D", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(conv2d_inception_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // test 1. // loco node : Pull - FeatureEncode -- Conv2D - FeatureDecode - Push diff --git a/contrib/moco-tf/src/Op/MaxPool2D.test.cpp b/contrib/moco-tf/src/Op/MaxPool2D.test.cpp index 74f9173..733d936 100644 --- a/contrib/moco-tf/src/Op/MaxPool2D.test.cpp +++ b/contrib/moco-tf/src/Op/MaxPool2D.test.cpp @@ -16,7 +16,7 @@ #include "TestHelper.h" -#include +#include "Import.h" #include #include @@ -24,9 +24,6 @@ #include -#include - -#include #include using namespace moco::tf::test; @@ -118,17 +115,16 @@ node { } // namespace -TEST(TensorFlowFrontend, MaxPool2D_01) +TEST(TensorFlowImport, MaxPool2D_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(maxpool2d_01_pbtxtdata, std::strlen(maxpool2d_01_pbtxtdata)); - signature.add_output(moco::tf::TensorName("maxpool2d", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(maxpool2d_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // test 1. // loco node : ConstGen - FeatureEncode - MaxPull2D - FeatureDecode - Push diff --git a/contrib/moco-tf/src/Op/Placeholder.test.cpp b/contrib/moco-tf/src/Op/Placeholder.test.cpp index df4768c..0607b81 100644 --- a/contrib/moco-tf/src/Op/Placeholder.test.cpp +++ b/contrib/moco-tf/src/Op/Placeholder.test.cpp @@ -17,7 +17,7 @@ #include "TestHelper.h" #include "CompilerArgs.h" -#include +#include "Import.h" #include #include @@ -26,9 +26,6 @@ #include -#include - -#include #include using namespace moco::tf::test; @@ -68,16 +65,16 @@ node { } // namespace -TEST(TensorFlowFrontend, placeholder_knwon_batch) +TEST(TensorFlowImport, placeholder_knwon_batch) { // load graph - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; signature.add_output(moco::tf::TensorName("output", 0)); - imemstream mempb(known_batch_pbtxt, std::strlen(known_batch_pbtxt)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(known_batch_pbtxt, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // get loco::Pull loco::Graph::NodeContext *loco_nodes = graph->nodes(); @@ -90,20 +87,20 @@ TEST(TensorFlowFrontend, placeholder_knwon_batch) ASSERT_TRUE(pull_node->dim(3).known() && pull_node->dim(3).value() == 4); } -TEST(TensorFlowFrontend, placeholder_wrong_user_input_0) +TEST(TensorFlowImport, placeholder_wrong_user_input_0) { // user provides shape info nncc::core::ADT::tensor::Shape shape{1024, 2, 111, 4}; // '111' is not matched with shape in model moco::tf::CompilerArgs::get()->addInput("placeholder", shape); // load graph - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; signature.add_output(moco::tf::TensorName("output", 0)); - imemstream mempb(known_batch_pbtxt, std::strlen(known_batch_pbtxt)); - - ASSERT_ANY_THROW(frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text)); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(known_batch_pbtxt, graph_def)); + ASSERT_ANY_THROW(import.load(signature, graph_def)); moco::tf::CompilerArgs::get()->clear(); } @@ -143,7 +140,7 @@ node { } // namespace -TEST(TensorFlowFrontend, placeholder_unknwon_batch) +TEST(TensorFlowImport, placeholder_unknwon_batch) { constexpr uint32_t USER_PROVIDED_BATCH = 1024; @@ -152,13 +149,13 @@ TEST(TensorFlowFrontend, placeholder_unknwon_batch) moco::tf::CompilerArgs::get()->addInput("placeholder", shape); // load graph - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; signature.add_output(moco::tf::TensorName("output", 0)); - imemstream mempb(unknown_batch_pbtxt, std::strlen(unknown_batch_pbtxt)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(unknown_batch_pbtxt, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // get loco::Pull loco::Graph::NodeContext *loco_nodes = graph->nodes(); @@ -173,7 +170,7 @@ TEST(TensorFlowFrontend, placeholder_unknwon_batch) moco::tf::CompilerArgs::get()->clear(); } -TEST(TensorFlowFrontend, placeholder_wrong_user_input_1) +TEST(TensorFlowImport, placeholder_wrong_user_input_1) { constexpr uint32_t USER_PROVIDED_BATCH = 1024; @@ -182,13 +179,13 @@ TEST(TensorFlowFrontend, placeholder_wrong_user_input_1) moco::tf::CompilerArgs::get()->addInput("placeholder", shape); // load graph - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; signature.add_output(moco::tf::TensorName("output", 0)); - imemstream mempb(unknown_batch_pbtxt, std::strlen(unknown_batch_pbtxt)); - - ASSERT_ANY_THROW(frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text)); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(unknown_batch_pbtxt, graph_def)); + ASSERT_ANY_THROW(import.load(signature, graph_def)); moco::tf::CompilerArgs::get()->clear(); } diff --git a/contrib/moco-tf/src/Op/Relu.test.cpp b/contrib/moco-tf/src/Op/Relu.test.cpp index 230c3ad..a739e30 100644 --- a/contrib/moco-tf/src/Op/Relu.test.cpp +++ b/contrib/moco-tf/src/Op/Relu.test.cpp @@ -16,13 +16,13 @@ #include "TestHelper.h" -#include +#include "Import.h" #include #include -#include +#include using namespace moco::tf::test; @@ -70,18 +70,17 @@ node { } // namespace -TEST(TensorFlowFrontend, relu_01) +TEST(TensorFlowImport, relu_01) { - moco::tf::Frontend frontend; + moco::tf::Import import; moco::tf::ModelSignature signature; - imemstream mempb(relu_01_pbtxtdata, std::strlen(relu_01_pbtxtdata)); - signature.add_input(moco::tf::TensorName("Placeholder", 0)); signature.add_output(moco::tf::TensorName("ReLU", 0)); - std::unique_ptr graph = - frontend.load(signature, &mempb, moco::tf::Frontend::FileType::Text); + tensorflow::GraphDef graph_def; + EXPECT_TRUE(parse_graphdef(relu_01_pbtxtdata, graph_def)); + std::unique_ptr graph = import.load(signature, graph_def); // Check input shape is correct loco::Graph::InputContext *inputs = graph->inputs(); -- 2.7.4