Browse Source

!3582 Fix minddata cache include flatbuffer head problem

Merge pull request !3582 from xiefangqi/r0.6
tags/v0.6.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
d7caa7955b
4 changed files with 6 additions and 4 deletions
  1. +3
    -1
      mindspore/ccsrc/minddata/dataset/CMakeLists.txt
  2. +1
    -1
      mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h
  3. +1
    -1
      mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h
  4. +1
    -1
      mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h

+ 3
- 1
mindspore/ccsrc/minddata/dataset/CMakeLists.txt View File

@@ -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)


+ 1
- 1
mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h View File

@@ -23,9 +23,9 @@
#include <utility>
#include <vector>

#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 {


+ 1
- 1
mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h View File

@@ -23,8 +23,8 @@
#include <utility>
#include <vector>

#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"



+ 1
- 1
mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h View File

@@ -25,10 +25,10 @@
#include <utility>
#include <vector>

#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"


Loading…
Cancel
Save