From 1c01128ff5b0c62bf242d4e39771087b0b3261f3 Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Fri, 19 Mar 2021 04:21:14 +0800
Subject: [PATCH] fix SASS cu111

GitOrigin-RevId: cb075ad15412ceccdb18a0d23acb6c0581b05e3d
---
 dnn/test/common/checker.cpp | 16 +++++++++++++++-
 dnn/test/common/checker.h   |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dnn/test/common/checker.cpp b/dnn/test/common/checker.cpp
index 5462d348..7d396ab1 100644
--- a/dnn/test/common/checker.cpp
+++ b/dnn/test/common/checker.cpp
@@ -273,10 +273,20 @@ namespace {
 }
 
 CheckerHelper::CheckerHelper(Handle *handle, bool check_dispatch):
-    m_handle_naive(create_cpu_handle(2, check_dispatch)),
     m_handle_cur(handle),
     m_default_rng(new NormalRNG())
 {
+    //! set MGB_NO_NAIVE_CHECK=1 to close megdnn test check with naive
+    const char* env_p = std::getenv("MGB_NO_NAIVE_CHECK");
+    if (env_p) {
+        int no_naive_flag = atoi(env_p);
+        no_naive_and_check = no_naive_flag > 0 ? true : false;
+        check_dispatch = false;
+    } else {
+        no_naive_and_check = false;
+    }
+    auto tmp_handle = create_cpu_handle(2, check_dispatch);
+    m_handle_naive = std::move(tmp_handle);
 }
 
 CheckerHelper::~CheckerHelper() noexcept = default;
@@ -370,6 +380,10 @@ void CheckerHelper::do_exec(const TensorLayoutArray &user_layouts,
         m_expect_exec_fail = {};
         return;
     }
+    if (no_naive_and_check){
+        m_prev_succ = !::testing::Test::HasFailure();
+        return;
+    }
     exec_naive(tensors_naive);
     if (m_extra_opr_impl) {
         m_extra_opr_impl(*tensors_extra_opr_impl);
diff --git a/dnn/test/common/checker.h b/dnn/test/common/checker.h
index ba9d1681..f6cf1784 100644
--- a/dnn/test/common/checker.h
+++ b/dnn/test/common/checker.h
@@ -75,6 +75,7 @@ protected:
     ExtraOprImpl m_extra_opr_impl;
     OutputCanonizer m_output_canonizer;
     TensorsConstriant m_tensor_constraint;
+    bool no_naive_and_check = false;
     /**
      * the offset from the start of malloc memory
      *
-- 
GitLab