From 9fc5598b7ed36ebdfd4bc05b7d073ae0da44efb2 Mon Sep 17 00:00:00 2001
From: baowenlei <40643946+baowenlei@users.noreply.github.com>
Date: Sun, 29 Sep 2019 23:35:14 -0700
Subject: [PATCH] update nuphar ci llvm version and uncomment unit tests
 (#1954)

---
 onnxruntime/test/onnx/main.cc                      | 14 ++------------
 .../github/linux/docker/scripts/install_ubuntu.sh  |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/onnxruntime/test/onnx/main.cc b/onnxruntime/test/onnx/main.cc
index 5ab1b22444..031913b7ac 100644
--- a/onnxruntime/test/onnx/main.cc
+++ b/onnxruntime/test/onnx/main.cc
@@ -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()));
diff --git a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
index afa037c187..fbdf14e110 100755
--- a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
+++ b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh
@@ -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