From 0e4065f0efdacc492c4c96cc55bae71022ee9f2a Mon Sep 17 00:00:00 2001 From: xiefangqi Date: Tue, 28 Jul 2020 16:21:09 +0800 Subject: [PATCH] fix flatbuffer head to r0.6 --- mindspore/ccsrc/minddata/dataset/CMakeLists.txt | 4 +++- mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h | 2 +- mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h | 2 +- mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt index 6ccf0cfb8c5..861caa85eb8 100644 --- a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt @@ -47,7 +47,9 @@ include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/minddata/dataset/include set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-rpath,$ORIGIN:$ORIGIN/lib") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") -ms_build_flatbuffers("engine/cache/de_tensor.fbs" ${CMAKE_CURRENT_SOURCE_DIR} generated_engine_files ${CMAKE_BINARY_DIR}) +include_directories("${CMAKE_BINARY_DIR}/minddata/dataset/engine/cache") +set(MD_FLATBUFFER_OU "${CMAKE_BINARY_DIR}/minddata/dataset/engine/cache") +ms_build_flatbuffers("engine/cache/de_tensor.fbs" ${CMAKE_CURRENT_SOURCE_DIR} generated_engine_files ${MD_FLATBUFFER_OU}) ################## Include sub-modules ############################### add_subdirectory(util) diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h index 10b93fbfa64..963d2e7e890 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h @@ -23,9 +23,9 @@ #include #include -#include "./de_tensor_generated.h" #include "minddata/dataset/engine/data_buffer.h" #include "minddata/dataset/engine/cache/cache_server.h" +#include "minddata/dataset/engine/cache/de_tensor_generated.h" #include "minddata/dataset/util/lock.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h index 7e932af6221..6851cebe0c6 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h @@ -23,8 +23,8 @@ #include #include -#include "./de_tensor_generated.h" #include "minddata/dataset/core/tensor_row.h" +#include "minddata/dataset/engine/cache/de_tensor_generated.h" #include "minddata/dataset/util/slice.h" #include "minddata/dataset/util/wait_post.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h index 034bd719ac7..fc303cdd770 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h @@ -25,10 +25,10 @@ #include #include -#include "./de_tensor_generated.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/core/tensor.h" #include "minddata/dataset/engine/cache/cache_request.h" +#include "minddata/dataset/engine/cache/de_tensor_generated.h" #include "minddata/dataset/util/arena.h" #include "minddata/dataset/util/btree.h" #include "minddata/dataset/util/cache_pool.h"