Merge pull request #838 from will-jl944/develop_jf

deal with requirements conflict during installation

dygraph/paddlex/cv/datasets/voc.py

@@ -113,11 +113,11 @@ class VOCDetection(Dataset):
                 if not osp.isfile(xml_file):
                     continue
                 if not osp.exists(img_file):
-                    logging.warning('The image file {} is not exist!'.format(
+                    logging.warning('The image file {} does not exist!'.format(
                         img_file))
                     continue
                 if not osp.exists(xml_file):
-                    logging.warning('The annotation file {} is not exist!'.
+                    logging.warning('The annotation file {} does not exist!'.
                                     format(xml_file))
                     continue
                 tree = ET.parse(xml_file)

dygraph/requirements.txt

@@ -1,8 +1,6 @@
 -r ./PaddleClas/requirements.txt
 -r ./PaddleSeg/requirements.txt
-./PaddleSeg
 -r ./PaddleDetection/requirements.txt
-./PaddleDetection
 tqdm
 scipy
 colorama

dygraph/submodules.txt

@@ -0,0 +1,2 @@
+./PaddleSeg
+./PaddleDetection