diff --git a/build.sh b/build.sh index af8cd3164a..4191bb8f35 100755 --- a/build.sh +++ b/build.sh @@ -519,6 +519,11 @@ build_opencl() { fi } +build_gtest() { + cd ${BASEPATH} + git submodule update --init --recursive third_party/googletest +} + build_opencv() { cd ${BASEPATH} if [[ "${INC_BUILD}" == "off" ]]; then @@ -561,6 +566,7 @@ build_minddata_lite_deps() build_opencv build_eigen build_jpeg_turbo + build_gtest } build_lite() diff --git a/mindspore/lite/test/CMakeLists.txt b/mindspore/lite/test/CMakeLists.txt index dd909416c2..b17c5662ab 100644 --- a/mindspore/lite/test/CMakeLists.txt +++ b/mindspore/lite/test/CMakeLists.txt @@ -132,7 +132,7 @@ endif() ### minddata lite if (BUILD_MINDDATA) include_directories(${CCSRC_DIR}/minddata) - set(DATASET_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dataset) + set(DATASET_TEST_DIR ${TEST_DIR}/ut/src/dataset) set(TEST_MINDDATA_SRC ${DATASET_TEST_DIR}/de_tensor_test.cc ${DATASET_TEST_DIR}/eager_test.cc @@ -294,6 +294,13 @@ endif () add_executable(lite-test ${TEST_SRC}) target_link_libraries(lite-test dl ${SECUREC_LIBRARY} ${GTEST_LIBRARY} mindspore::json) +if (BUILD_MINDDATA) + target_link_libraries(lite-test + minddata-lite + minddata-eager + log + ) +endif() if (BUILD_CONVERTER) target_link_libraries(lite-test anf_exporter_mid diff --git a/mindspore/lite/test/dataset/de_tensor_test.cc b/mindspore/lite/test/ut/src/dataset/de_tensor_test.cc similarity index 93% rename from mindspore/lite/test/dataset/de_tensor_test.cc rename to mindspore/lite/test/ut/src/dataset/de_tensor_test.cc index a96b7885ba..431216cb94 100644 --- a/mindspore/lite/test/dataset/de_tensor_test.cc +++ b/mindspore/lite/test/ut/src/dataset/de_tensor_test.cc @@ -25,7 +25,7 @@ using namespace mindspore::dataset; -class MindDataTestTensorDE : public UT::Common { +class MindDataTestTensorDE : public mindspore::Common { public: MindDataTestTensorDE() {} }; @@ -42,7 +42,7 @@ TEST_F(MindDataTestTensorDE, MSTensorConvertToLiteTensor) { std::shared_ptr lite_ms_tensor = std::shared_ptr( std::dynamic_pointer_cast(ms_tensor)->ConvertToLiteTensor()); // check if the lite_ms_tensor is the derived LiteTensor - mindspore::tensor::LiteTensor * lite_tensor = static_cast(lite_ms_tensor.get()); + mindspore::lite::tensor::LiteTensor * lite_tensor = static_cast(lite_ms_tensor.get()); ASSERT_EQ(lite_tensor != nullptr, true); } @@ -77,7 +77,7 @@ TEST_F(MindDataTestTensorDE, MSTensorDataType) { TEST_F(MindDataTestTensorDE, MSTensorMutableData) { std::vector x = {2.5, 2.5, 2.5, 2.5}; std::shared_ptr t; - Tensor::CreateTensor(&t, x, TensorShape({2, 2})); + Tensor::CreateFromVector(x, TensorShape({2, 2}), &t); auto ms_tensor = std::shared_ptr(new mindspore::tensor::DETensor(t)); float *data = static_cast(ms_tensor->MutableData()); std::vector tensor_vec(data, data + ms_tensor->ElementsNum()); @@ -88,7 +88,7 @@ TEST_F(MindDataTestTensorDE, MSTensorMutableData) { TEST_F(MindDataTestTensorDE, MSTensorHash) { std::vector x = {2.5, 2.5, 2.5, 2.5}; std::shared_ptr t; - Tensor::CreateTensor(&t, x, TensorShape({2, 2})); + Tensor::CreateFromVector(x, TensorShape({2, 2}), &t); auto ms_tensor = std::shared_ptr(new mindspore::tensor::DETensor(t)); #ifdef ENABLE_ARM64 ASSERT_EQ(ms_tensor->hash() == 11093771382437, true); // arm64 diff --git a/mindspore/lite/test/dataset/eager_test.cc b/mindspore/lite/test/ut/src/dataset/eager_test.cc similarity index 99% rename from mindspore/lite/test/dataset/eager_test.cc rename to mindspore/lite/test/ut/src/dataset/eager_test.cc index 5b28c44d47..2a173a8a0f 100644 --- a/mindspore/lite/test/dataset/eager_test.cc +++ b/mindspore/lite/test/ut/src/dataset/eager_test.cc @@ -27,7 +27,7 @@ using namespace mindspore::dataset; using namespace mindspore::dataset::api; using namespace mindspore; -class MindDataTestEager : public UT::Common { +class MindDataTestEager : public mindspore::Common { public: MindDataTestEager() {} };