From f6801bca1632df31d253921976314d99a2fac378 Mon Sep 17 00:00:00 2001 From: hesham Date: Mon, 25 May 2020 23:09:58 -0400 Subject: [PATCH] Fix compilation order problem. --- mindspore/ccsrc/dataset/CMakeLists.txt | 17 ++++++++++++++++- .../ccsrc/dataset/engine/tdt/CMakeLists.txt | 4 ---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mindspore/ccsrc/dataset/CMakeLists.txt b/mindspore/ccsrc/dataset/CMakeLists.txt index 950e83da35..068aec8873 100644 --- a/mindspore/ccsrc/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/dataset/CMakeLists.txt @@ -54,7 +54,22 @@ add_subdirectory(engine) add_subdirectory(api) add_subdirectory(text) ###################################################################### - +add_dependencies(core utils) +add_dependencies(kernels-image core) +add_dependencies(kernels-data core) +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-opt core) +add_dependencies(engine-gnn core) +add_dependencies(engine core) +add_dependencies(text core) +add_dependencies(text-kernels core) +add_dependencies(APItoPython core) +if (ENABLE_TDTQUE) + add_dependencies(engine-tdt core) +endif () ################### Create _c_dataengine Library ###################### set(submodules $ diff --git a/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt b/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt index 1ced7b96b0..50165bb147 100644 --- a/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt +++ b/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt @@ -2,8 +2,4 @@ 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) add_library(engine-tdt OBJECT tdt_plugin.cc - ${EXAMPLE_SRCS} - ${FEATURE_SRCS} ) - -add_dependencies(engine-tdt mindspore::protobuf)