提交 1f13b3ef 编写于 作者: E ervinzhang

exclude de_tensor in normal build

上级 344f1c9b
......@@ -13,6 +13,4 @@ add_library(cpp-API OBJECT
iterator.cc
transforms.cc
samplers.cc
de_tensor.cc
execute.cc
)
......@@ -38,18 +38,21 @@
#include "minddata/dataset/core/data_type.h"
#include "minddata/dataset/core/tensor_shape.h"
#include "minddata/dataset/util/status.h"
#include "minddata/dataset/include/de_tensor.h"
#ifndef ENABLE_ANDROID
#include "proto/example.pb.h"
#else
#include "minddata/dataset/include/de_tensor.h"
#endif
#ifdef ENABLE_PYTHON
namespace py = pybind11;
#endif
namespace mindspore {
#ifdef ENABLE_ANDROID
namespace tensor {
class DETensor;
} // namespace tensor
#endif
namespace dataset {
class Tensor;
template <typename T>
......@@ -61,7 +64,9 @@ using offset_t = uint32_t; // type of offset va
using TensorPtr = std::shared_ptr<Tensor>;
class Tensor {
#ifdef ENABLE_ANDROID
friend class tensor::DETensor;
#endif
public:
Tensor() = delete;
Tensor(const Tensor &other) = delete;
......
......@@ -38,18 +38,21 @@
#include "minddata/dataset/core/data_type.h"
#include "minddata/dataset/core/tensor_shape.h"
#include "minddata/dataset/util/status.h"
#include "minddata/dataset/include/de_tensor.h"
#ifndef ENABLE_ANDROID
#include "proto/example.pb.h"
#else
#include "minddata/dataset/include/de_tensor.h"
#endif
#ifdef ENABLE_PYTHON
namespace py = pybind11;
#endif
namespace mindspore {
#ifdef ENABLE_ANDROID
namespace tensor {
class DETensor;
} // namespace tensor
#endif
namespace dataset {
class Tensor;
template <typename T>
......@@ -61,7 +64,9 @@ using offset_t = uint32_t; // type of offset va
using TensorPtr = std::shared_ptr<Tensor>;
class Tensor {
#ifdef ENABLE_ANDROID
friend class tensor::DETensor;
#endif
public:
Tensor() = delete;
Tensor(const Tensor &other) = delete;
......
......@@ -138,7 +138,6 @@ if (BUILD_MINDDATA)
include_directories(${TOP_DIR}/third_party/libjpeg-turbo/include)
add_compile_definitions(ENABLE_ANDROID)
add_compile_definitions(ENABLE_EAGER)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/minddata)
endif()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册