diff --git a/ppdet/core/workspace.py b/ppdet/core/workspace.py index c922b3b3cde39e3908c41446b2e5c9f4b231762d..64c0be1fcec9617072b1e60dca685ebb182139dd 100644 --- a/ppdet/core/workspace.py +++ b/ppdet/core/workspace.py @@ -59,7 +59,8 @@ def load_config(file_path): """ _, ext = os.path.splitext(file_path) assert ext in ['.yml', '.yaml'], "only support yaml files for now" - merge_config(yaml.load(open(file_path), Loader=yaml.Loader)) + with open(file_path) as f: + merge_config(yaml.load(f, Loader=yaml.Loader)) return global_config diff --git a/ppdet/data/data_feed.py b/ppdet/data/data_feed.py index dd85e83fe13e9c05b24ff6d906d3ee549f0d624e..238b100671d289a63cec3d6c204ab09f05f08953 100644 --- a/ppdet/data/data_feed.py +++ b/ppdet/data/data_feed.py @@ -58,12 +58,6 @@ def _prepare_data_config(feed, args_path): mixup_epoch = -1 if getattr(feed, 'mixup_epoch', None) is not None: mixup_epoch = feed.mixup_epoch - bufsize = 10 - use_process = False - if getattr(feed, 'bufsize', None) is not None: - bufsize = feed.bufsize - if getattr(feed, 'use_process', None) is not None: - use_process = feed.use_process data_config = { 'ANNO_FILE': feed.dataset.annotation, @@ -96,6 +90,13 @@ def create_reader(feed, max_iter=0, args_path=None, my_source=None): # named `DATASET_DIR` (e.g., coco, pascal), if not present either, download data_config = _prepare_data_config(feed, args_path) + bufsize = 10 + use_process = False + if getattr(feed, 'bufsize', None) is not None: + bufsize = feed.bufsize + if getattr(feed, 'use_process', None) is not None: + use_process = feed.use_process + transform_config = { 'WORKER_CONF': { 'bufsize': bufsize,