mamingjie-China 5 years ago
parent
commit
adf637949d
2 changed files with 11 additions and 10 deletions
  1. 5 5
      paddlex/command.py
  2. 6 5
      paddlex/tools/split.py

+ 5 - 5
paddlex/command.py

@@ -93,7 +93,7 @@ def arg_parser():
         default=False,
         default=False,
         help="split dataset with the split value")
         help="split dataset with the split value")
     parser.add_argument(
     parser.add_argument(
-        "--form",
+        "--format",
         "-f",
         "-f",
         default=None,
         default=None,
         help="define dataset format(ImageNet/COCO/VOC/Seg)")
         help="define dataset format(ImageNet/COCO/VOC/Seg)")
@@ -187,22 +187,22 @@ def main():
         assert args.val_value is not None, "--val_value should be defined while spliting dataset"
         assert args.val_value is not None, "--val_value should be defined while spliting dataset"
 
 
         dataset_dir = args.dataset_dir
         dataset_dir = args.dataset_dir
-        dataset_form = args.form.lower()
+        dataset_format = args.format.lower()
         val_value = float(args.val_value)
         val_value = float(args.val_value)
         test_value = float(args.test_value
         test_value = float(args.test_value
                            if args.test_value is not None else 0)
                            if args.test_value is not None else 0)
         save_dir = dataset_dir
         save_dir = dataset_dir
 
 
-        if not dataset_form in ["coco", "imagenet", "voc", "seg"]:
+        if not dataset_format in ["coco", "imagenet", "voc", "seg"]:
             logging.error(
             logging.error(
-                "The dataset form is not correct defined.(support COCO/ImageNet/VOC/Seg)"
+                "The dataset format is not correct defined.(support COCO/ImageNet/VOC/Seg)"
             )
             )
         if not osp.exists(dataset_dir):
         if not osp.exists(dataset_dir):
             logging.error("The path of dataset to be splited doesn't exist.")
             logging.error("The path of dataset to be splited doesn't exist.")
         if val_value <= 0 or val_value >= 1 or test_value < 0 or test_value >= 1 or val_value + test_value >= 1:
         if val_value <= 0 or val_value >= 1 or test_value < 0 or test_value >= 1 or val_value + test_value >= 1:
             logging.error("The value of split is not correct.")
             logging.error("The value of split is not correct.")
 
 
-        pdx.tools.split.dataset_split(dataset_dir, dataset_form, val_value,
+        pdx.tools.split.dataset_split(dataset_dir, dataset_format, val_value,
                                       test_value, save_dir)
                                       test_value, save_dir)
 
 
 
 

+ 6 - 5
paddlex/tools/split.py

@@ -20,17 +20,18 @@ from .dataset_split.imagenet_split import split_imagenet_dataset
 from .dataset_split.seg_split import split_seg_dataset
 from .dataset_split.seg_split import split_seg_dataset
 
 
 
 
-def dataset_split(dataset_dir, dataset_form, val_value, test_value, save_dir):
-    if dataset_form == "coco":
+def dataset_split(dataset_dir, dataset_format, val_value, test_value,
+                  save_dir):
+    if dataset_format == "coco":
         train_num, val_num, test_num = split_coco_dataset(
         train_num, val_num, test_num = split_coco_dataset(
             dataset_dir, val_value, test_value, save_dir)
             dataset_dir, val_value, test_value, save_dir)
-    elif dataset_form == "voc":
+    elif dataset_format == "voc":
         train_num, val_num, test_num = split_voc_dataset(
         train_num, val_num, test_num = split_voc_dataset(
             dataset_dir, val_value, test_value, save_dir)
             dataset_dir, val_value, test_value, save_dir)
-    elif dataset_form == "seg":
+    elif dataset_format == "seg":
         train_num, val_num, test_num = split_seg_dataset(
         train_num, val_num, test_num = split_seg_dataset(
             dataset_dir, val_value, test_value, save_dir)
             dataset_dir, val_value, test_value, save_dir)
-    elif dataset_form == "imagenet":
+    elif dataset_format == "imagenet":
         train_num, val_num, test_num = split_imagenet_dataset(
         train_num, val_num, test_num = split_imagenet_dataset(
             dataset_dir, val_value, test_value, save_dir)
             dataset_dir, val_value, test_value, save_dir)
     print("Dataset Split Done.")
     print("Dataset Split Done.")