From 1b52955ca6b68be1d97d815b2e52f99eccad5047 Mon Sep 17 00:00:00 2001 From: Jesse Lee Date: Mon, 2 Nov 2020 21:43:15 -0500 Subject: [PATCH] Undo PR 8140 --- .../ccsrc/minddata/dataset/CMakeLists.txt | 51 +++++++++++++++---- .../minddata/dataset/core/CMakeLists.txt | 3 -- .../dataset/engine/cache/CMakeLists.txt | 11 ++-- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt index be2b7262b6..c37d104576 100644 --- a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt @@ -60,7 +60,44 @@ add_subdirectory(engine) add_subdirectory(api) add_subdirectory(text) add_subdirectory(callback) +###################################################################### +add_dependencies(utils core) +add_dependencies(kernels-image core) +add_dependencies(kernels-data core) +add_dependencies(kernels-soft-dvpp-image core soft-dvpp-utils) +add_dependencies(kernels core) +add_dependencies(engine-datasetops-source core) +add_dependencies(engine-datasetops-source-sampler core) +add_dependencies(engine-datasetops core) +add_dependencies(engine-datasetops-mapop core) +add_dependencies(engine-opt core) +add_dependencies(engine-perf core) +add_dependencies(engine-gnn core) +add_dependencies(engine core) +add_dependencies(callback core) +add_dependencies(text core) +add_dependencies(text-kernels core) +add_dependencies(cpp-API core) +add_dependencies(engine-ir-datasetops core) +add_dependencies(engine-ir-datasetops-source core) +add_dependencies(engine-ir-cache core) +if (ENABLE_PYTHON) + add_dependencies(APItoPython core) +endif() +if (ENABLE_TDTQUE) + add_dependencies(engine-tdt core) +endif () +if (ENABLE_CACHE) + add_dependencies(APItoPython engine-cache-client) + add_dependencies(cpp-API engine-cache-client) + add_dependencies(engine-ir-cache engine-cache-client) + add_dependencies(engine-ir-datasetops engine-cache-client) + add_dependencies(engine-opt engine-cache-client) + add_dependencies(engine-datasetops engine-cache-client) + add_dependencies(engine-cache-client core) + add_dependencies(engine-cache-server core) +endif () ################### Create _c_dataengine Library ###################### set(submodules $ @@ -72,9 +109,9 @@ set(submodules $ $ $ - $ - $ - $ + $ + $ + $ $ $ $ @@ -167,11 +204,3 @@ endif() if (MS_BUILD_GRPC) target_link_libraries(_c_dataengine PRIVATE mindspore::grpc++) endif() - -add_dependencies(_c_dataengine core_generated_proto) -add_dependencies(_c_dataengine cache_generated_fbb) -if (ENABLE_CACHE) - add_dependencies(_c_dataengine cache_generated_grpc) -else() - add_dependencies(_c_dataengine cache_generated_proto) -endif() diff --git a/mindspore/ccsrc/minddata/dataset/core/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/core/CMakeLists.txt index 592c754046..23e8ab7e64 100644 --- a/mindspore/ccsrc/minddata/dataset/core/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/core/CMakeLists.txt @@ -14,11 +14,8 @@ set(DATASET_CORE_SRC_FILES ms_protobuf_generate(EXAMPLE_SRCS EXAMPLE_HDRS example.proto) ms_protobuf_generate(FEATURE_SRCS FEATURE_HDRS feature.proto) -add_custom_target(core_generated_proto ALL - DEPENDS ${EXAMPLE_SRCS} ${FEATURE_SRCS}) add_library(core OBJECT ${DATASET_CORE_SRC_FILES} ${EXAMPLE_SRCS} ${FEATURE_SRCS}) add_dependencies(core mindspore::protobuf) -add_dependencies(core core_generated_proto) if (ENABLE_PYTHON) target_include_directories(core PRIVATE ${pybind11_INCLUDE_DIRS}) diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt index 3e195ee500..a0b4382dfd 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(perf EXCLUDE_FROM_ALL) include_directories("${CMAKE_BINARY_DIR}/minddata/dataset/engine/cache") set(MD_FLATBUFFER_OU "${CMAKE_BINARY_DIR}/minddata/dataset/engine/cache") -ms_build_flatbuffers("de_tensor.fbs" ${CMAKE_CURRENT_SOURCE_DIR} cache_generated_fbb ${MD_FLATBUFFER_OU}) +ms_build_flatbuffers("de_tensor.fbs" ${CMAKE_CURRENT_SOURCE_DIR} generated_engine_files ${MD_FLATBUFFER_OU}) file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD) @@ -25,7 +25,6 @@ add_library(engine-cache-client OBJECT if (ENABLE_CACHE) ms_grpc_generate(CACHE_GRPC_SRCS CACHE_GRPC_HDRS cache_grpc.proto) - add_custom_target(cache_generated_grpc ALL DEPENDS ${CACHE_GRPC_SRCS} ${CACHE_GRPC_HDRS} VERBATIM) target_sources(engine-cache-client PUBLIC ${CACHE_GRPC_SRCS} cache_grpc_client.cc cache_ipc.cc) @@ -69,15 +68,11 @@ if (ENABLE_CACHE) target_link_libraries(cache_admin mindspore::glog) endif () - add_dependencies(engine-cache-server cache_generated_fbb) - add_dependencies(engine-cache-server cache_generated_grpc) - add_dependencies(engine-cache-client cache_generated_grpc) + add_dependencies(engine-cache-server generated_engine_files) else () ms_protobuf_generate(CACHE_PROTO_SRCS CACHE_PROTO_HDRS cache_grpc.proto) - add_custom_target(cache_generated_proto ALL DEPENDS ${CACHE_PROTO_SRCS} ${CACHE_PROTO_HDRS} VERBATIM) target_sources(engine-cache-client PUBLIC ${CACHE_PROTO_SRCS}) - add_dependencies(engine-cache-client cache_generated_proto) endif () -add_dependencies(engine-cache-client cache_generated_fbb) +add_dependencies(engine-cache-client generated_engine_files)