Skip to content

Commit 2b791f1

Browse files
committed
unify analyzer_face_tester to analyzer_resnet50_tester
test=develop
1 parent 1ead931 commit 2b791f1

File tree

3 files changed

+1
-98
lines changed

3 files changed

+1
-98
lines changed

paddle/fluid/inference/tests/api/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,26 +82,6 @@ inference_analysis_api_test(test_analyzer_ocr ${OCR_INSTALL_DIR} analyzer_vis_te
8282
inference_analysis_api_test_with_fake_data(test_analyzer_resnet50
8383
"${INFERENCE_DEMO_INSTALL_DIR}/resnet50" analyzer_resnet50_tester.cc "resnet50_model.tar.gz")
8484

85-
# face
86-
set(FACE_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/face")
87-
inference_analysis_api_test_with_fake_data(test_analyzer_face_align1
88-
"${FACE_INSTALL_DIR}/align1" analyzer_face_tester.cc "face%2Falign1_model.tar.gz")
89-
inference_analysis_api_test_with_fake_data(test_analyzer_face_align2
90-
"${FACE_INSTALL_DIR}/align2" analyzer_face_tester.cc "face%2Falign2_model.tar.gz")
91-
inference_analysis_api_test_with_fake_data(test_analyzer_face_feature1
92-
"${FACE_INSTALL_DIR}/feature1" analyzer_face_tester.cc "face%2Ffeature_id_model.tar.gz")
93-
# TODO(luotao): Disable this test due to analysis is timeout 10 minutes.
94-
# inference_analysis_api_test_with_fake_data(test_analyzer_face_feature2
95-
# "${FACE_INSTALL_DIR}/feature2" analyzer_face_tester.cc "face%2Ffeature_life_model.tar.gz")
96-
inference_analysis_api_test_with_fake_data(test_analyzer_face_detect
97-
"${FACE_INSTALL_DIR}/detect" analyzer_face_tester.cc "face%2Fdetect_model.tar.gz")
98-
inference_analysis_api_test_with_fake_data(test_analyzer_face_demark
99-
"${FACE_INSTALL_DIR}/demark" analyzer_face_tester.cc "face%2Fdemark_model.tar.gz")
100-
inference_analysis_api_test_with_fake_data(test_analyzer_face_score
101-
"${FACE_INSTALL_DIR}/score" analyzer_face_tester.cc "face%2Fscore_model.tar.gz")
102-
inference_analysis_api_test_with_fake_data(test_analyzer_face_super_res
103-
"${FACE_INSTALL_DIR}/super_res" analyzer_face_tester.cc "face%2Fsuper_res_model.tar.gz")
104-
10585
# anakin
10686
if (WITH_ANAKIN AND WITH_MKL) # only needed in CI
10787
# anakin rnn1

paddle/fluid/inference/tests/api/analyzer_face_tester.cc

Lines changed: 0 additions & 69 deletions
This file was deleted.

paddle/fluid/inference/tests/api/analyzer_resnet50_tester.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ void profile(bool use_mkldnn = false) {
4343
std::vector<std::vector<PaddleTensor>> input_slots_all;
4444
SetInput(&input_slots_all);
4545
TestPrediction(cfg, input_slots_all, &outputs, FLAGS_num_threads);
46-
47-
if (FLAGS_num_threads == 1 && !FLAGS_test_all_data) {
48-
PADDLE_ENFORCE_EQ(outputs.size(), 1UL);
49-
size_t size = GetSize(outputs[0]);
50-
// output is a 512-dimension feature
51-
EXPECT_EQ(size, 512 * FLAGS_batch_size);
52-
}
5346
}
5447

5548
TEST(Analyzer_resnet50, profile) { profile(); }
@@ -65,8 +58,7 @@ TEST(Analyzer_resnet50, fuse_statis) {
6558
auto predictor = CreatePaddlePredictor<AnalysisConfig>(cfg);
6659
auto fuse_statis = GetFuseStatis(
6760
static_cast<AnalysisPredictor *>(predictor.get()), &num_ops);
68-
ASSERT_TRUE(fuse_statis.count("fc_fuse"));
69-
EXPECT_EQ(fuse_statis.at("fc_fuse"), 1);
61+
LOG(INFO) << "num_ops: " << num_ops;
7062
}
7163

7264
// Compare result of NativeConfig and AnalysisConfig

0 commit comments

Comments
 (0)