like20
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!19447 disable benchmark in runtest 

Merge pull request !19447 from ling/pr
This commit is contained in:
i-robot 2021-07-06 10:55:54 +00:00 committed by Gitee
parent 24b9b69b50 ac7716fa9a
commit a6a65ed8fa
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mindspore/lite/test/CMakeLists.txt
View File

@ -111,11 +111,13 @@ set(TEST_LITE_SRC
file(GLOB KERNEL_REG_SRC ${LITE_DIR}/src/registry/*.cc)
set(TEST_LITE_SRC ${TEST_LITE_SRC} ${KERNEL_REG_SRC})
set(TEST_LITE_SRC
${TEST_LITE_SRC}
${LITE_DIR}/tools/benchmark/benchmark.cc
${LITE_DIR}/test/st/benchmark_test.cc
)
if(ENABLE_TOOLS)
set(TEST_LITE_SRC
${TEST_LITE_SRC}
${LITE_DIR}/tools/benchmark/benchmark.cc
${LITE_DIR}/test/st/benchmark_test.cc
)
endif()
### gpu runtime
if(MSLITE_GPU_BACKEND STREQUAL opencl)

4
mindspore/lite/test/runtest.sh
View File

@ -24,9 +24,6 @@ echo 'run common ut tests'
# test cases of Converter
## ./lite-test --gtest_filter="TestTfliteParser*"
# test cases with benchmark
## ./lite-test --gtest_filter="*TestHebing*"
# test cases of framework
# test cases of FP32 OP
@ -71,3 +68,4 @@ echo 'run inference ut tests'
echo 'run mindrt parallel ut test'
./lite-test --gtest_filter="MindrtParallelTest.*"
./lite-test --gtest_filter="BenchmarkTest.mindrtParallelOffline*"

33
mindspore/lite/test/st/benchmark_test.cc
View File

@ -75,5 +75,38 @@ TEST_F(BenchmarkTest, TestHebing) {
auto status = RunBenchmark(4, argv);
ASSERT_EQ(status, RET_OK);
}
TEST_F(BenchmarkTest, mindrtParallelOffline1) {
const char *benchmark_argv1[] = {"./benchmark",
"--enableParallel=true",
"--numThreads=3",
"--modelFile=./mindrtParallel/mindrt_parallel_model_split.ms",
"--inDataFile=./mindrtParallel/mindrt_parallel_model.bin",
"--benchmarkDataFile=./mindrtParallel/mindrt_parallel_model.out"};
int converter_ret = mindspore::lite::RunBenchmark(6, benchmark_argv1);
ASSERT_EQ(converter_ret, lite::RET_OK);
}
TEST_F(BenchmarkTest, mindrtParallelOffline2) {
const char *benchmark_argv2[] = {"./benchmark",
"--enableParallel=true",
"--numThreads=4",
"--modelFile=./mindrtParallel/mindrt_parallel_model_split.ms",
"--inDataFile=./mindrtParallel/mindrt_parallel_model.bin",
"--benchmarkDataFile=./mindrtParallel/mindrt_parallel_model.out"};
int converter_ret = mindspore::lite::RunBenchmark(6, benchmark_argv2);
ASSERT_EQ(converter_ret, lite::RET_OK);
}
TEST_F(BenchmarkTest, mindrtParallelOffline3) {
const char *benchmark_argv3[] = {"./benchmark",
"--enableParallel=false",
"--numThreads=1",
"--modelFile=./mindrtParallel/mindrt_parallel_model_split.ms",
"--inDataFile=./mindrtParallel/mindrt_parallel_model.bin",
"--benchmarkDataFile=./mindrtParallel/mindrt_parallel_model.out"};
int converter_ret = mindspore::lite::RunBenchmark(6, benchmark_argv3);
ASSERT_EQ(converter_ret, lite::RET_OK);
}
} // namespace lite
} // namespace mindspore

33
mindspore/lite/test/st/mindrt_parallel_test.cc
View File

@ -132,39 +132,6 @@ TEST_F(MindrtParallelTest, offline1) {
delete session;
}
TEST_F(MindrtParallelTest, offline2) {
const char *benchmark_argv1[] = {"./benchmark",
"--enableParallel=true",
"--numThreads=3",
"--modelFile=./mindrtParallel/mindrt_parallel_model_split.ms",
"--inDataFile=./mindrtParallel/mindrt_parallel_model.bin",
"--benchmarkDataFile=./mindrtParallel/mindrt_parallel_model.out"};
int converter_ret = mindspore::lite::RunBenchmark(6, benchmark_argv1);
ASSERT_EQ(converter_ret, lite::RET_OK);
}
TEST_F(MindrtParallelTest, offline3) {
const char *benchmark_argv2[] = {"./benchmark",
"--enableParallel=true",
"--numThreads=4",
"--modelFile=./mindrtParallel/mindrt_parallel_model_split.ms",
"--inDataFile=./mindrtParallel/mindrt_parallel_model.bin",
"--benchmarkDataFile=./mindrtParallel/mindrt_parallel_model.out"};
int converter_ret = mindspore::lite::RunBenchmark(6, benchmark_argv2);
ASSERT_EQ(converter_ret, lite::RET_OK);
}
TEST_F(MindrtParallelTest, offline4) {
const char *benchmark_argv3[] = {"./benchmark",
"--enableParallel=false",
"--numThreads=1",
"--modelFile=./mindrtParallel/mindrt_parallel_model_split.ms",
"--inDataFile=./mindrtParallel/mindrt_parallel_model.bin",
"--benchmarkDataFile=./mindrtParallel/mindrt_parallel_model.out"};
int converter_ret = mindspore::lite::RunBenchmark(6, benchmark_argv3);
ASSERT_EQ(converter_ret, lite::RET_OK);
}
TEST_F(MindrtParallelTest, runtime1) {
const char *converter_argv[] = {"./converter", "--fmk=TFLITE",
"--modelFile=./mindrtParallel/mindrt_parallel_model.tflite",