Pre Merge pull request !170 from 储星/inline_so

ge/CMakeLists.txt

@@ -329,6 +329,12 @@ set(TRAIN_SRC_LIST
     "client/ge_api.cc"
     "client/ge_prof.cc"
     "analyzer/analyzer.cc"
+    "ge_local_engine/ops_kernel_store/ge_local_ops_kernel_builder.cc"
+    "ge_local_engine/ops_kernel_store/op/op_factory.cc"
+    "ge_local_engine/ops_kernel_store/op/op.cc"
+    "ge_local_engine/ops_kernel_store/op/ge_deleted_op.cc"
+    "ge_local_engine/ops_kernel_store/op/no_op.cc"
+    "host_cpu_engine/ops_kernel_store/host_cpu_ops_kernel_builder.cc"
 )
 
 add_library(ge_runner SHARED ${TRAIN_SRC_LIST} ${PROTO_SRCS} ${PROTO_CLIENT_SRCS})
@@ -657,6 +663,12 @@ set(INFER_SRC_LIST
     "graph/label/while_label_maker.cc"
     "graph/label/partitioned_call_label_maker.cc"
     "analyzer/analyzer.cc"
+    "ge_local_engine/ops_kernel_store/ge_local_ops_kernel_builder.cc"
+    "ge_local_engine/ops_kernel_store/op/op_factory.cc"
+    "ge_local_engine/ops_kernel_store/op/op.cc"
+    "ge_local_engine/ops_kernel_store/op/ge_deleted_op.cc"
+    "ge_local_engine/ops_kernel_store/op/no_op.cc"
+    "host_cpu_engine/ops_kernel_store/host_cpu_ops_kernel_builder.cc"
 )
 
 add_library(ge_compiler SHARED ${INFER_SRC_LIST} ${PROTO_SRCS})

ge/ge_inference.mk

@@ -318,6 +318,12 @@ NEW_OMG_HOST_SRC_FILES := \
     graph/label/case_label_maker.cc \
     graph/label/while_label_maker.cc \
     graph/label/partitioned_call_label_maker.cc \
+    ge_local_engine/ops_kernel_store/ge_local_ops_kernel_builder.cc \
+    ge_local_engine/ops_kernel_store/op/op_factory.cc \
+    ge_local_engine/ops_kernel_store/op/op.cc \
+    ge_local_engine/ops_kernel_store/op/ge_deleted_op.cc \
+    ge_local_engine/ops_kernel_store/op/no_op.cc \
+    host_cpu_engine/ops_kernel_store/host_cpu_ops_kernel_builder.cc \
 
 OME_HOST_SRC_FILES += $(NEW_OMG_HOST_SRC_FILES)
 OMG_DEVICE_SRC_FILES += $(NEW_OMG_HOST_SRC_FILES)

ge/ge_runner.mk

@@ -300,6 +300,12 @@ LIBGE_LOCAL_SRC_FILES := \
     hybrid/hybrid_davinci_model.cc                                       \
     executor/ge_executor.cc \
     analyzer/analyzer.cc \
+    ge_local_engine/ops_kernel_store/ge_local_ops_kernel_builder.cc \
+    ge_local_engine/ops_kernel_store/op/op_factory.cc \
+    ge_local_engine/ops_kernel_store/op/op.cc \
+    ge_local_engine/ops_kernel_store/op/ge_deleted_op.cc \
+    ge_local_engine/ops_kernel_store/op/no_op.cc \
+    host_cpu_engine/ops_kernel_store/host_cpu_ops_kernel_builder.cc \
 
 LIBCLIENT_LOCAL_SRC_FILES := \
     proto/ge_api.proto \

ge/opskernel_manager/ops_kernel_builder_manager.cc

@@ -21,8 +21,6 @@
 namespace ge {
 namespace {
 const std::vector<std::string> kBasicBuilderLibs = {
-    "libge_local_opskernel_builder.so",
-    "libhost_cpu_opskernel_builder.so",
     "librts_kernel_builder.so",
     "libaicpu_ascend_builder.so",
     "libaicpu_tf_builder.so"
@@ -166,4 +164,4 @@ Status OpsKernelBuilderManager::GenerateTask(const Node &node,
   GELOGD("Done invoking GenerateTask successfully");
   return SUCCESS;
 }
-}  // namespace ge
+}  // namespace ge