diff --git a/dnn/src/arm_common/conv_bias/f16/direct_nchw88_algo.cpp b/dnn/src/arm_common/conv_bias/f16/direct_nchw88_algo.cpp index ce256662cce8ae5aeb9c5b5cef79bfe4e22bb248..df72f4be768c161e92a986598f210a31bed3b571 100644 --- a/dnn/src/arm_common/conv_bias/f16/direct_nchw88_algo.cpp +++ b/dnn/src/arm_common/conv_bias/f16/direct_nchw88_algo.cpp @@ -15,6 +15,7 @@ using conv_fun = std::function; MIDOUT_DECL(megdnn_arm_common_conv_bias_fp16_nchw88) +MIDOUT_DECL(megdnn_arm_common_conv_bias_fp16_nchw88_stride1) namespace { static WorkspaceBundle get_bundle(const ConvBiasImpl::NCBKernSizeParam& param) { diff --git a/dnn/src/common/rounding_converter.cuh b/dnn/src/common/rounding_converter.cuh index 9b50eca9b380208f7a9ff033353e9ee86b727cdc..d605fae2da9f775aacc760ba5067ee038809288e 100644 --- a/dnn/src/common/rounding_converter.cuh +++ b/dnn/src/common/rounding_converter.cuh @@ -14,7 +14,7 @@ struct RoundingConverter { } }; -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 template <> struct RoundingConverter { @@ -32,7 +32,7 @@ struct RoundingConverter { } }; -#endif // #ifdef MEGDNN_DISABLE_FLOAT16 +#endif // #if !MEGDNN_DISABLE_FLOAT16 template <> struct RoundingConverter { diff --git a/dnn/src/cuda/warp_perspective/forward.cpp b/dnn/src/cuda/warp_perspective/forward.cpp index 03af174517506a4277e59d9b14fe13217513881d..37f5c44e41a65f3e9d5a07a0106094179b59c629 100644 --- a/dnn/src/cuda/warp_perspective/forward.cpp +++ b/dnn/src/cuda/warp_perspective/forward.cpp @@ -295,7 +295,7 @@ void WarpPerspectiveForwardImpl::exec( m_error_tracker, stream); } else if (DNN_FLOAT16_SELECT( src.layout.dtype == dtype::Float16(), false)) { -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 warp_perspective::forward_proxy( is_nhwc, src.ptr(), mat.ptr(), mat_idx.raw_ptr() ? mat_idx.ptr() : nullptr, @@ -563,7 +563,7 @@ void WarpPerspectiveForwardImpl::exec( m_error_tracker, stream); } else if (DNN_FLOAT16_SELECT( src.layout.dtype == dtype::Float16(), false)) { -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 SmallVector workspace_sizes{sizeof(dt_float16*) * srcs.size()}; WorkspaceBundle workspace_cpu(nullptr, workspace_sizes); auto total_workspace_size = workspace_cpu.total_size_in_bytes(); diff --git a/dnn/src/cuda/warp_perspective/forward.cu b/dnn/src/cuda/warp_perspective/forward.cu index b2adf8869cdad489466da571942d3d82901ab4c5..13c1b5c78cb189206bffeba48dcf5ef2f86f3596 100644 --- a/dnn/src/cuda/warp_perspective/forward.cu +++ b/dnn/src/cuda/warp_perspective/forward.cu @@ -1924,7 +1924,7 @@ void forward_proxy_nchw64( cudaStream_t); INST(float) INST(uint8_t) -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 INST(dt_float16) #endif INST(int8_t) @@ -1936,7 +1936,7 @@ INST(int8_t) int, int, int, ctype, BorderMode, megcore::AsyncErrorInfo*, void*, \ cudaStream_t); INST(float) -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 INST(dt_float16) #endif #undef INST diff --git a/dnn/src/fallback/powc/opr_impl.cpp b/dnn/src/fallback/powc/opr_impl.cpp index 170a466f09c904e287f23c915811921944379160..1cf062bbd9a4fcac2b92fd6ddbb43ea9f1c9a4b4 100644 --- a/dnn/src/fallback/powc/opr_impl.cpp +++ b/dnn/src/fallback/powc/opr_impl.cpp @@ -73,7 +73,7 @@ struct powci_general_even { template struct float_itype; -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 template <> struct float_itype<2> { using type = uint16_t; diff --git a/dnn/src/naive/resize/opr_impl.cpp b/dnn/src/naive/resize/opr_impl.cpp index 661d7dc560038170c7ae84bceeaa00fd65066877..59ed5e027e8dd5484b19ce43d7709ea1796f72c3 100644 --- a/dnn/src/naive/resize/opr_impl.cpp +++ b/dnn/src/naive/resize/opr_impl.cpp @@ -84,7 +84,7 @@ ResizeImpl::KernParam ResizeImpl::KernParam::from_tensors( #define INST(_dtype) template struct ResizeImpl::KernParam<_dtype>; INST(dt_float32); -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 INST(dt_float16); #endif INST(dt_int8); diff --git a/src/opr-mm/impl/megray_helper.cpp b/src/opr-mm/impl/megray_helper.cpp index d3591a3789af606e02e1a81750459c6b329bc170..aa8f8c10c43b976125357f158b4c4178def3a35f 100644 --- a/src/opr-mm/impl/megray_helper.cpp +++ b/src/opr-mm/impl/megray_helper.cpp @@ -15,7 +15,7 @@ MegRay::DType mgb::opr::get_megray_dtype(megdnn::DType dtype) { return MegRay::DType::MEGRAY_INT32; case DTypeEnum::Float32: return MegRay::DType::MEGRAY_FLOAT32; -#ifndef MEGDNN_DISABLE_FLOAT16 +#if !MEGDNN_DISABLE_FLOAT16 case DTypeEnum::Float16: return MegRay::DType::MEGRAY_FLOAT16; #endif