Commitdd50135

committed

add yaml_load

1 parentb0ee3c8 commitdd50135Copy full SHA for dd50135

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`from .img_utilimportcrop_border,imfrombytes,img2tensor,imwrite,tensor2img`
`6`	`6`	`from .loggerimportAvgTimer,MessageLogger,get_env_info,get_root_logger,init_tb_logger,init_wandb_logger`
`7`	`7`	`from .miscimportcheck_resume,get_time_str,make_exp_dirs,mkdir_and_rename,scandir,set_random_seed,sizeof_fmt`
	`8`	`+from .optionsimportyaml_load`
`8`	`9`
`9`	`10`	`__all__= [`
`10`	`11`	`# color_util.py`
`@@ -40,5 +41,7 @@`
`40`	`41`	`'DiffJPEG',`
`41`	`42`	`# img_process_util`
`42`	`43`	`'USMSharp',`
`43`		`-'usm_sharp'`
	`44`	`+'usm_sharp',`
	`45`	`+# options`
	`46`	`+'yaml_load'`
`44`	`47`	`]`

Lines changed: 19 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importargparse`
	`2`	`+importos`
`2`	`3`	`importrandom`
`3`	`4`	`importtorch`
`4`	`5`	`importyaml`
`@@ -13,7 +14,7 @@ def ordered_yaml():`
`13`	`14`	`"""Support OrderedDict for yaml.`
`14`	`15`
`15`	`16`	`Returns:`
`16`		`- yaml Loader and Dumper.`
	`17`	`+tuple:yaml Loader and Dumper.`
`17`	`18`	`"""`
`18`	`19`	`try:`
`19`	`20`	`fromyamlimportCDumperasDumper`
`@@ -34,6 +35,22 @@ def dict_constructor(loader, node):`
`34`	`35`	`returnLoader,Dumper`
`35`	`36`
`36`	`37`
	`38`	`+defyaml_load(f):`
	`39`	`+"""Load yaml file or string.`
	`40`	`+`
	`41`	`+ Args:`
	`42`	`+ f (str): File path or a python string.`
	`43`	`+`
	`44`	`+ Returns:`
	`45`	`+ dict: Loaded dict.`
	`46`	`+ """`
	`47`	`+ifos.path.isfile(f):`
	`48`	`+withopen(f,'r')asf:`
	`49`	`+returnyaml.load(f,Loader=ordered_yaml()[0])`
	`50`	`+else:`
	`51`	`+returnyaml.load(f,Loader=ordered_yaml()[0])`
	`52`	`+`
	`53`	`+`
`37`	`54`	`defdict2str(opt,indent_level=1):`
`38`	`55`	`"""dict to string for printing options.`
`39`	`56`
`@@ -91,8 +108,7 @@ def parse_options(root_path, is_train=True):`
`91`	`108`	`args=parser.parse_args()`
`92`	`109`
`93`	`110`	`# parse yml to dict`
`94`		`-withopen(args.opt,mode='r')asf:`
`95`		`-opt=yaml.load(f,Loader=ordered_yaml()[0])`
	`111`	`+opt=yaml_load(args.opt)`
`96`	`112`
`97`	`113`	`# distributed settings`
`98`	`114`	`ifargs.launcher=='none':`

Comments

(0)