From 5e1a730461f5efbaa0769f0a3643f6074166d256 Mon Sep 17 00:00:00 2001 From: YangLuo Date: Thu, 10 Dec 2020 17:36:47 +0800 Subject: [PATCH] Address PR9677 comments --- mindspore/ccsrc/minddata/dataset/api/minddata_eager.cc | 2 +- mindspore/ccsrc/minddata/dataset/include/minddata_eager.h | 2 +- tests/cxx_st/dataset/test_de.cc | 4 ++-- tests/cxx_st/runtest.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/api/minddata_eager.cc b/mindspore/ccsrc/minddata/dataset/api/minddata_eager.cc index 13b9abea984..154ec4ab035 100644 --- a/mindspore/ccsrc/minddata/dataset/api/minddata_eager.cc +++ b/mindspore/ccsrc/minddata/dataset/api/minddata_eager.cc @@ -68,7 +68,7 @@ Status MindDataEager::LoadImageFromDir(const std::string &image_dir, std::vector // Check target directory dataset::Path image_dir_(image_dir); if (!image_dir_.Exists() || !image_dir_.IsDirectory()) { - std::string err_msg = "Target directory: " + image_dir + " does not exist or not a dir."; + std::string err_msg = "Target directory: " + image_dir + " does not exist or not a directory."; MS_LOG(ERROR) << err_msg; return Status(StatusCode::FAILED, err_msg); } diff --git a/mindspore/ccsrc/minddata/dataset/include/minddata_eager.h b/mindspore/ccsrc/minddata/dataset/include/minddata_eager.h index 9f20d7f60a8..563ef66e855 100644 --- a/mindspore/ccsrc/minddata/dataset/include/minddata_eager.h +++ b/mindspore/ccsrc/minddata/dataset/include/minddata_eager.h @@ -45,7 +45,7 @@ class MindDataEager { /// \brief Function to read images from local directory /// \param[inout] image_dir Target directory which contains images /// \param[output] images Vector of image Tensor - /// \return Return error status if encounters exception + /// \return Status The status code returned static Status LoadImageFromDir(const std::string &image_dir, std::vector> *images); /// \brief Callable function to execute the TensorOperation in eager mode diff --git a/tests/cxx_st/dataset/test_de.cc b/tests/cxx_st/dataset/test_de.cc index 2ae83c0e04b..242f55a8574 100644 --- a/tests/cxx_st/dataset/test_de.cc +++ b/tests/cxx_st/dataset/test_de.cc @@ -29,9 +29,9 @@ class TestDE : public ST::Common { TestDE() {} }; -TEST_F(TestDE, Test1) { +TEST_F(TestDE, ResNetPreprocess) { std::vector> images; - MindDataEager::LoadImageFromDir("/home/eager/apple", &images); + MindDataEager::LoadImageFromDir("/home/workspace/mindspore_dataset/imagenet/imagenet_original/val/n01440764", &images); MindDataEager Compose({Decode(), Resize({224, 224}), diff --git a/tests/cxx_st/runtest.sh b/tests/cxx_st/runtest.sh index 31bfc85100f..0db46c6216e 100755 --- a/tests/cxx_st/runtest.sh +++ b/tests/cxx_st/runtest.sh @@ -24,7 +24,7 @@ else echo "BUILD_PATH = $BUILD_PATH" fi -cd ${BUILD_PATH}/mindspore/tests/cxx_st2 +cd ${BUILD_PATH}/mindspore/tests/cxx_st export LD_LIBRARY_PATH=${BUILD_PATH}/mindspore/googletest/googlemock/gtest:${PROJECT_PATH}/mindspore:${PROJECT_PATH}/mindspore/lib:$LD_LIBRARY_PATH export PYTHONPATH=${PROJECT_PATH}/tests/ut/cpp/python_input:$PYTHONPATH:${PROJECT_PATH}