update nuphar ci llvm version and uncomment unit tests (#1954)

This commit is contained in:
baowenlei 2019-09-29 23:35:14 -07:00 committed by GitHub
parent 611dd3ea0c
commit 9fc5598b7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions

View file

@ -314,7 +314,7 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
std::unordered_set<std::string> cuda_flaky_tests = {
"fp16_inception_v1", "fp16_shufflenet", "fp16_tiny_yolov2"};
std::unordered_set<std::string> nuphar_flaky_tests = {"logsoftmax_axis_0", "softmax_axis_0"};
#if (defined(_WIN32) && !defined(_WIN64)) || (defined(__GNUG__) && !defined(__LP64__))
//Minimize mem consumption
LoadTests(data_dirs, whitelisted_test_cases, per_sample_tolerance, relative_per_sample_tolerance, [&stat, &sf, enable_cuda, &cuda_flaky_tests, &env](ITestCase* l) {
@ -342,17 +342,7 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
}
}
}
if (enable_nuphar) {
for (auto it = tests.begin(); it != tests.end();) {
auto iter = nuphar_flaky_tests.find((*it)->GetTestCaseName());
if (iter != nuphar_flaky_tests.end()) {
delete *it;
it = tests.erase(it);
} else {
++it;
}
}
}
TestEnv args(tests, stat, env, sf);
Status st = RunTests(args, p_models, concurrent_session_runs, static_cast<size_t>(repeat_count),
GetDefaultThreadPool(Env::Default()));

View file

@ -89,6 +89,6 @@ fi
rm -rf /var/lib/apt/lists/*
if [ $DEVICE_TYPE = "Normal" ]; then
aria2c -q -d /tmp -o llvm.tar.xz http://releases.llvm.org/6.0.1/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
aria2c -q -d /tmp -o llvm.tar.xz http://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
tar --strip 1 -Jxf /tmp/llvm.tar.xz -C /usr
fi