From 1310ad4926a490492816cce75317967c8d8c46f0 Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Wed, 16 Sep 2020 15:19:57 +0800 Subject: [PATCH] feat(dnn): add memory manager for enflame GitOrigin-RevId: 72a810d959777ac84275210861d525af8767e009 --- src/CMakeLists.txt | 1 + src/core/include/megbrain/comp_node.h | 1 + src/core/include/megbrain/comp_node_env.h | 1 + src/core/test/comp_node.cpp | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5fddd520e..382f36d43 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,6 +64,7 @@ target_include_directories(megbrain PUBLIC $ PRIVATE ${PROJECT_SOURCE_DIR}/third_party/midout/src ) + foreach (INCPATH IN LISTS MGB_INC) target_include_directories(megbrain PUBLIC $ diff --git a/src/core/include/megbrain/comp_node.h b/src/core/include/megbrain/comp_node.h index 647f74662..0b2250a88 100644 --- a/src/core/include/megbrain/comp_node.h +++ b/src/core/include/megbrain/comp_node.h @@ -119,6 +119,7 @@ class CompNode { * * device == -1 means logical default device (maps to 0 by default, * and can be changed by set_device_map) + * */ int device = -1; diff --git a/src/core/include/megbrain/comp_node_env.h b/src/core/include/megbrain/comp_node_env.h index 2d04a1cc0..3b9f1af8b 100644 --- a/src/core/include/megbrain/comp_node_env.h +++ b/src/core/include/megbrain/comp_node_env.h @@ -20,6 +20,7 @@ #include "megdnn/handle.h" + #if MGB_CUDA #include #include diff --git a/src/core/test/comp_node.cpp b/src/core/test/comp_node.cpp index 663d80b6d..05bd4c658 100644 --- a/src/core/test/comp_node.cpp +++ b/src/core/test/comp_node.cpp @@ -481,7 +481,6 @@ void test_peer_copy_from_device(const char* comp_node) { opr::Sleep::sleep(cn_gpu, 0.1); dev_a.copy_from(dev_c); wait_event->record(); - cn_cpu.device_wait_event(*wait_event); dev_b.copy_from(dev_a); -- GitLab