fix(build): fix naive build

GitOrigin-RevId: 0050ff5d9c760564c179219cf7164fdc2c49c1f3

dnn/src/common/handle.cpp

@@ -6,7 +6,8 @@
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT ARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * "AS IS" BASIS, WITHOUT ARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
  */
 
 #include "megdnn/basic_types.h"
@@ -90,9 +91,10 @@ std::unique_ptr<Handle> Handle::make(megcoreComputingHandle_t computing_handle,
             } else {
                 megdnn_throw("Debug level must be 0/1/2.");
             }
+#endif
         }
         MIDOUT_END();
-#endif
+
     }
     else if (platform == megcorePlatformROCM) {
 #if MEGDNN_WITH_ROCM
@@ -100,15 +102,13 @@ std::unique_ptr<Handle> Handle::make(megcoreComputingHandle_t computing_handle,
 #else
         return nullptr;
 #endif
-        }
-        else if (platform == megcorePlatformCambricon) {
+    } else if (platform == megcorePlatformCambricon) {
 #if MEGDNN_WITH_CAMBRICON
         return make_unique<cambricon::HandleImpl>(computing_handle);
 #else
         return nullptr;
 #endif
-        }
-        else if (platform == megcorePlatformAtlas) {
+    } else if (platform == megcorePlatformAtlas) {
 #if MEGDNN_WITH_ATLAS
         return make_unique<atlas::HandleImpl>(computing_handle);
 #else
@@ -126,38 +126,38 @@ std::unique_ptr<Handle> Handle::make(megcoreComputingHandle_t computing_handle,
 #endif
     }
     return nullptr;
-    }
+}
 
 
-    void Handle::set_destructor(const thin_function<void()>& d) {
+void Handle::set_destructor(const thin_function<void()>& d) {
     megdnn_assert(!m_destructor, "destructor can be set only once");
     m_destructor = d;
-    }
+}
 
-    Handle::~Handle() {
+Handle::~Handle() {
     if (m_destructor)
         m_destructor();
     m_alive_magic = 0;
-    }
+}
 
-    size_t Handle::alignment_requirement() const {
+size_t Handle::alignment_requirement() const {
     // default to 32
     return 32;
-    }
+}
 
-    size_t Handle::image2d_pitch_alignment() const {
+size_t Handle::image2d_pitch_alignment() const {
     megdnn_throw("image2d tensor format not supported on this handle");
-    }
+}
 
-    megdnn::HandleImplHelper::HandleVendorType Handle::vendor_type() const {
+megdnn::HandleImplHelper::HandleVendorType Handle::vendor_type() const {
     return HandleVendorType::NOT_SPEC;
-    }
+}
 
-    bool Handle::check_cross_dev_copy_constraint(const TensorLayout& src) {
+bool Handle::check_cross_dev_copy_constraint(const TensorLayout& src) {
     return src.is_contiguous();
-    }
+}
 
-    void Handle::on_opr_destructed(OperatorBase * opr) {
+void Handle::on_opr_destructed(OperatorBase* opr) {
     if (m_alive_magic != ALIVE_MAGIC) {
         megdnn_log_error(
                 "Handle is destructed before opr gets destructed. "
@@ -169,12 +169,14 @@ std::unique_ptr<Handle> Handle::make(megcoreComputingHandle_t computing_handle,
     if (m_on_opr_destructed) {
         m_on_opr_destructed(opr);
     }
-    }
+}
 
-    OperatorBase::~OperatorBase() { m_handle->on_opr_destructed(this); }
+OperatorBase::~OperatorBase() {
+    m_handle->on_opr_destructed(this);
+}
 
-    template <typename Opr>
-    std::unique_ptr<Opr> Handle::create_operator() {
+template <typename Opr>
+std::unique_ptr<Opr> Handle::create_operator() {
 #define CASE(etype, nm)                                                        \
     case HandleType::etype: {                                                  \
         MIDOUT_BEGIN(HandleOpr, Opr, midout_iv(HandleType::etype)) {           \
@@ -201,7 +203,7 @@ std::unique_ptr<Handle> Handle::make(megcoreComputingHandle_t computing_handle,
 #endif
 #endif  // !MEGDNN_NAIVE
 #if MEGDNN_WITH_CUDA
-            CASE(CUDA,cuda);
+        CASE(CUDA, cuda);
 #endif
 #if MEGDNN_WITH_ATLAS
         CASE(ATLAS, atlas);
@@ -221,10 +223,9 @@ std::unique_ptr<Handle> Handle::make(megcoreComputingHandle_t computing_handle,
             megdnn_throw("bad handle type");
     }
 #undef CASE
-    }
+}
 
 #define INST(opr) template std::unique_ptr<opr> Handle::create_operator();
-        MEGDNN_FOREACH_OPR_CLASS(INST)
+MEGDNN_FOREACH_OPR_CLASS(INST)
 #undef INST
 // vim: syntax=cpp.doxygen
-

dnn/src/common/relayout_helper.h

@@ -41,7 +41,7 @@ bool is_transpose(const TensorLayout& src, const TensorLayout& dst,
 
 namespace transpose_fallback {
 
-#if MEGDNN_X86
+#if MEGDNN_X86 || MEGDNN_NAIVE
 constexpr size_t BLOCK_LINE_SIZE_BYTES = 64;
 #elif MEGDNN_AARCH64 || MEGDNN_ARMV7 /*BEGIN-INLINE-INTERNAL*/ || \
         MEGDNN_MIPS /*END-INLINE-INTERNAL*/