From 5e4c314130e5e352bc622c4e17b192e6d7f063d3 Mon Sep 17 00:00:00 2001 From: tony_liu2 Date: Tue, 25 Aug 2020 14:57:54 -0400 Subject: [PATCH] rename dataset dir and image files change references to use path original revert folder name revert graphengine --- .../ut/cpp/dataset/bounding_box_augment_op_test.cc | 2 +- tests/ut/cpp/dataset/common/bboxop_common.cc | 2 +- .../random_crop_and_resize_with_bbox_op_test.cc | 2 +- .../ut/cpp/dataset/random_crop_with_bbox_op_test.cc | 2 +- .../random_horizontal_flip_with_bbox_test.cc | 2 +- .../cpp/dataset/random_resize_with_bbox_op_test.cc | 2 +- .../random_vertical_flip_with_bbox_op_test.cc | 2 +- tests/ut/cpp/dataset/resize_with_bbox_op_test.cc | 2 +- ...pg => apple_expect_bounding_box_augment_op0.jpg} | Bin ...pg => apple_expect_random_crop_with_bbox_c0.jpg} | Bin ..._expect_random_horizontal_flip_with_bbox_c0.jpg} | Bin ... => apple_expect_random_resize_with_bbox_c0.jpg} | Bin ...ple_expect_random_resized_crop_with_bbox_c0.jpg} | Bin ...le_expect_random_vertical_flip_with_bbox_c0.jpg} | Bin ..._C0.jpg => apple_expect_resize_with_bbox_c0.jpg} | Bin 15 files changed, 8 insertions(+), 8 deletions(-) rename tests/ut/data/dataset/imagefolder/{ExpectedBoundingBoxAugmentOp0.jpg => apple_expect_bounding_box_augment_op0.jpg} (100%) rename tests/ut/data/dataset/imagefolder/{ExpectedRandomCropWithBBox_C0.jpg => apple_expect_random_crop_with_bbox_c0.jpg} (100%) rename tests/ut/data/dataset/imagefolder/{ExpectedRandomHorizontalFlipWithBBox0.jpg => apple_expect_random_horizontal_flip_with_bbox_c0.jpg} (100%) rename tests/ut/data/dataset/imagefolder/{ExpectedRandomResizeWithBBox_C0.jpg => apple_expect_random_resize_with_bbox_c0.jpg} (100%) rename tests/ut/data/dataset/imagefolder/{ExpectedRandomResizedCropWithBBox_C0.jpg => apple_expect_random_resized_crop_with_bbox_c0.jpg} (100%) rename tests/ut/data/dataset/imagefolder/{ExpectedRandomVerticalFlipWithBBox_C0.jpg => apple_expect_random_vertical_flip_with_bbox_c0.jpg} (100%) rename tests/ut/data/dataset/imagefolder/{ExpectedResizeWithBBox_C0.jpg => apple_expect_resize_with_bbox_c0.jpg} (100%) diff --git a/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc b/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc index dc59d39fac..ff03481ce5 100644 --- a/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc +++ b/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc @@ -24,7 +24,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::MsLogLevel::INFO; const bool kSaveExpected = false; -const char kOpName[] = "BoundingBoxAugmentOp"; +const char kOpName[] = "bounding_box_augment_op"; class MindDataTestBoundingBoxAugmentOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/cpp/dataset/common/bboxop_common.cc b/tests/ut/cpp/dataset/common/bboxop_common.cc index b16c4c0615..a8be551ba7 100644 --- a/tests/ut/cpp/dataset/common/bboxop_common.cc +++ b/tests/ut/cpp/dataset/common/bboxop_common.cc @@ -39,7 +39,7 @@ using tinyxml2::XMLError; const char kAnnotationsFolder[] = "/Annotations/"; const char kImagesFolder[] = "/JPEGImages/"; -const char kExpectedName[] = "Expected"; +const char kExpectedName[] = "apple_expect_"; const char kActualName[] = "Actual"; const char kAnnotExt[] = ".xml"; const char kImageExt[] = ".jpg"; diff --git a/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc index 4efdcb8b78..b30184d1d2 100644 --- a/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc @@ -26,7 +26,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::MsLogLevel::INFO; const bool kSaveExpected = false; -const char kOpName[] = "RandomResizedCropWithBBox_C"; +const char kOpName[] = "random_resized_crop_with_bbox_c"; class MindDataTestRandomCropAndResizeWithBBoxOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc index b3b46f09ec..50212ac76d 100644 --- a/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc @@ -27,7 +27,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::MsLogLevel::INFO; const bool kSaveExpected = false; -const char kOpName[] = "RandomCropWithBBox_C"; +const char kOpName[] = "random_crop_with_bbox_c"; class MindDataTestRandomCropWithBBoxOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc b/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc index ed4e866478..0dbfbf1ed5 100644 --- a/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc +++ b/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc @@ -23,7 +23,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::LogStream; const bool kSaveExpected = false; -const char kOpName[] = "RandomHorizontalFlipWithBBox"; +const char kOpName[] = "random_horizontal_flip_with_bbox_c"; class MindDataTestRandomHorizontalFlipWithBBoxOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc index e106f57375..98defca486 100644 --- a/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc @@ -27,7 +27,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::MsLogLevel::INFO; const bool kSaveExpected = false; -const char kOpName[] = "RandomResizeWithBBox_C"; +const char kOpName[] = "random_resize_with_bbox_c"; class MindDataTestRandomResizeWithBBoxOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc index d1946ef700..605daec7f8 100644 --- a/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc @@ -24,7 +24,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::MsLogLevel::INFO; const bool kSaveExpected = false; -const char kOpName[] = "RandomVerticalFlipWithBBox_C"; +const char kOpName[] = "random_vertical_flip_with_bbox_c"; class MindDataTestRandomVerticalFlipWithBBoxOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc b/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc index f9eaf85a55..81baa2d9d4 100644 --- a/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc @@ -24,7 +24,7 @@ using mindspore::ExceptionType::NoExceptionType; using mindspore::MsLogLevel::INFO; const bool kSaveExpected = false; -const char kOpName[] = "ResizeWithBBox_C"; +const char kOpName[] = "resize_with_bbox_c"; class MindDataTestResizeWithBBoxOp : public UT::CVOP::BBOXOP::BBoxOpCommon { protected: diff --git a/tests/ut/data/dataset/imagefolder/ExpectedBoundingBoxAugmentOp0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_bounding_box_augment_op0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedBoundingBoxAugmentOp0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_bounding_box_augment_op0.jpg diff --git a/tests/ut/data/dataset/imagefolder/ExpectedRandomCropWithBBox_C0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_random_crop_with_bbox_c0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedRandomCropWithBBox_C0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_random_crop_with_bbox_c0.jpg diff --git a/tests/ut/data/dataset/imagefolder/ExpectedRandomHorizontalFlipWithBBox0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_random_horizontal_flip_with_bbox_c0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedRandomHorizontalFlipWithBBox0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_random_horizontal_flip_with_bbox_c0.jpg diff --git a/tests/ut/data/dataset/imagefolder/ExpectedRandomResizeWithBBox_C0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_random_resize_with_bbox_c0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedRandomResizeWithBBox_C0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_random_resize_with_bbox_c0.jpg diff --git a/tests/ut/data/dataset/imagefolder/ExpectedRandomResizedCropWithBBox_C0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_random_resized_crop_with_bbox_c0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedRandomResizedCropWithBBox_C0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_random_resized_crop_with_bbox_c0.jpg diff --git a/tests/ut/data/dataset/imagefolder/ExpectedRandomVerticalFlipWithBBox_C0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_random_vertical_flip_with_bbox_c0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedRandomVerticalFlipWithBBox_C0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_random_vertical_flip_with_bbox_c0.jpg diff --git a/tests/ut/data/dataset/imagefolder/ExpectedResizeWithBBox_C0.jpg b/tests/ut/data/dataset/imagefolder/apple_expect_resize_with_bbox_c0.jpg similarity index 100% rename from tests/ut/data/dataset/imagefolder/ExpectedResizeWithBBox_C0.jpg rename to tests/ut/data/dataset/imagefolder/apple_expect_resize_with_bbox_c0.jpg