提交 94f1f634 编写于 作者: M Megvii Engine Team

refactor(mgb/build): remove MGB_ENABLE_IMPERATIVE macro

GitOrigin-RevId: 94a40798ab49ac7e046ae6d9ab7fd47850e2e249
上级 74b1d300
......@@ -295,7 +295,6 @@ if(MGE_WITH_TEST)
endif()
if(MGE_BUILD_IMPERATIVE_RT)
add_compile_definitions(MGB_ENABLE_IMPERATIVE_RUNTIME)
set(CMAKE_CXX_STANDARD 17)
endif()
......@@ -711,7 +710,6 @@ endif()
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH}")
set(MGB_ENABLE_IMPERATIVE ${MGE_BUILD_IMPERATIVE_RT})
# Write out megbrain_build_config.h
# It defines macros needed by both megbrain and dnn
configure_file(src/megbrain_build_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/genfiles/megbrain_build_config.h)
......
......@@ -125,9 +125,7 @@ public:
template<typename T> static ComputingGraphImpl* downcast(T* ptr) = delete;
inline static ComputingGraphImpl* downcast(ComputingGraph* graph) {
#ifdef MGB_ENABLE_IMPERATIVE_RUNTIME
mgb_assert(!graph->options().imperative_proxy_graph);
#endif
return static_cast<ComputingGraphImpl*>(graph);
}
......
......@@ -34,8 +34,6 @@
#cmakedefine01 MGB_ENABLE_FBS_SERIALIZATION
#cmakedefine01 MGB_IS_DEV
#cmakedefine01 MGB_ENABLE_IMPERATIVE
// DNN related flags
// Platform macro's
#cmakedefine01 MEGDNN_WITH_CUDA
......
......@@ -140,7 +140,6 @@ void BatchNormForward::scn_do_execute() {
auto &&y = output(4)->dev_tensor();
mgb_assert(x.layout().is_contiguous() &&
y.layout().is_contiguous());
#if MGB_ENABLE_IMPERATIVE
if (input().size() == 5) { // need running mean/variance
auto &&o0 = output(0)->dev_tensor(),
&&o1 = output(1)->dev_tensor(),
......@@ -163,7 +162,6 @@ void BatchNormForward::scn_do_execute() {
&& o1.raw_ptr() == i1.raw_ptr());
}
}
#endif
auto scale = input(1)->dev_tensor().as_megdnn();
auto bias = input(2)->dev_tensor().as_megdnn();
auto mean = output(0)->dev_tensor().as_megdnn();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册