[LITE][NPU][XPU] Move subgraph bridge registry and engine to kernels/…

…npu to fix the compiling error on tiny publish mode test=develop
PaddlePaddle · Dec 11, 2019 · 843c6fb · 843c6fb
1 parent 2b5a8a9
commit 843c6fb
Show file tree

Hide file tree

Showing 47 changed files with 465 additions and 575 deletions.
diff --git a/lite/core/mir/subgraph/CMakeLists.txt b/lite/core/mir/subgraph/CMakeLists.txt
@@ -27,14 +27,5 @@ if (WITH_TESTING)
     set_target_properties(test_subgraph_pass PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
 endif()
 
-if(LITE_WITH_NPU OR LITE_WITH_XPU)
-    lite_cc_library(subgraph_bridge_registry
-        SRCS subgraph_bridge_registry.cc
-        DEPS op)
-    lite_cc_library(subgraph_engine_base
-        SRCS subgraph_engine_base.cc
-        DEPS tensor op scope program)
-endif()
-
 set(mir_subgraphs subgraph_pass CACHE INTERNAL "mir_subgraphs")
 message(STATUS "----> mir_subgraphs: ${mir_subgraphs}")
diff --git a/lite/core/mir/subgraph/subgraph_engine_base.cc b/lite/core/mir/subgraph/subgraph_engine_base.cc
diff --git a/lite/core/mir/subgraph/subgraph_engine_base.h b/lite/core/mir/subgraph/subgraph_engine_base.h
diff --git a/lite/kernels/npu/CMakeLists.txt b/lite/kernels/npu/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(bridges)
 
-add_kernel(subgraph_compute_npu NPU basic SRCS subgraph_compute.cc DEPS ${lite_kernel_deps} subgraph_engine_npu)
+add_kernel(subgraph_compute_npu NPU basic SRCS subgraph_compute.cc DEPS ${lite_kernel_deps} device_npu subgraph_bridge_engine ${npu_subgraph_bridges})
diff --git a/lite/kernels/npu/bridges/CMakeLists.txt b/lite/kernels/npu/bridges/CMakeLists.txt
@@ -1,3 +1,14 @@
+if(NOT LITE_WITH_NPU AND NOT LITE_WITH_XPU)
+  return()
+endif()
+
+lite_cc_library(subgraph_bridge_registry
+    SRCS registry.cc
+    DEPS op)
+lite_cc_library(subgraph_bridge_engine
+    SRCS engine.cc
+    DEPS tensor op scope program)
+
 if(NOT LITE_WITH_NPU)
   return()
 endif()
@@ -59,5 +70,3 @@ set(npu_subgraph_bridges
         CACHE INTERNAL "npu_subgraph_bridges")
 
 message(STATUS "+++++ npu_subgraph_bridges: ${npu_subgraph_bridges}")
-
-lite_cc_library(subgraph_engine_npu SRCS engine.cc DEPS subgraph_engine_base device_npu ${npu_subgraph_bridges})
diff --git a/lite/kernels/npu/bridges/act_op.cc b/lite/kernels/npu/bridges/act_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {

diff --git a/lite/kernels/npu/bridges/argmax_op.cc b/lite/kernels/npu/bridges/argmax_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {

diff --git a/lite/kernels/npu/bridges/batch_norm_op.cc b/lite/kernels/npu/bridges/batch_norm_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {

diff --git a/lite/kernels/npu/bridges/concat_op.cc b/lite/kernels/npu/bridges/concat_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {

diff --git a/lite/kernels/npu/bridges/conv_op.cc b/lite/kernels/npu/bridges/conv_op.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "lite/operators/conv_op.h"
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {

diff --git a/lite/kernels/npu/bridges/conv_transpose_op.cc b/lite/kernels/npu/bridges/conv_transpose_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {

diff --git a/lite/kernels/npu/bridges/elementwise_ops.cc b/lite/kernels/npu/bridges/elementwise_ops.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/core/mir/subgraph/subgraph_bridge_registry.h"
 #include "lite/kernels/npu/bridges/graph.h"
+#include "lite/kernels/npu/bridges/registry.h"
 #include "lite/kernels/npu/bridges/utility.h"
 
 namespace paddle {