Skip to content

Commit ed3d96b

Browse files
anandhu-enganandhu-eng
committed
clean code
1 parent 96a6127 commit ed3d96b

File tree

1 file changed

+39
-54
lines changed

1 file changed

+39
-54
lines changed

‎automation/script/module.py

+39-54
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ def _run(self, i):
380380

381381
verbose = False
382382
silent = False
383-
384383
if i.get('verbose', '') != '':
385384
verbose = True if is_true(i.get('verbose', '')) else False
386385
elif i.get('v', '') != '':
@@ -402,14 +401,20 @@ def _run(self, i):
402401

403402
if silent:
404403
env['MLC_TMP_SILENT'] = 'yes'
405-
logger.setLevel(logging.ERROR)
404+
logger.setLevel(logging.WARNING)
406405
run_state['tmp_silent'] = True
407406

408407
if verbose:
409408
env['MLC_TMP_VERBOSE'] = 'yes'
410409
run_state['tmp_verbose'] = True
411410
logger.setLevel(logging.DEBUG)
412411

412+
if not env.get('MLC_TMP_SILENT') and not env.get('MLC_TMP_VERBOSE'):
413+
if logger.level == logging.DEBUG:
414+
env['MLC_TMP_VERBOSE'] = "yes"
415+
elif logger.level == logging.DEBUG:
416+
env['MLC_TMP_SILENT'] = "yes"
417+
413418
print_deps = i.get('print_deps', False)
414419
print_versions = i.get('print_versions', False)
415420
print_readme = i.get('print_readme', False)
@@ -567,9 +572,6 @@ def _run(self, i):
567572
x_variation_tags = ['_' + v for v in variation_tags]
568573
mlc_script_info += y.join(x_variation_tags)
569574

570-
# if verbose:
571-
# logger.info('')
572-
573575
logger.info(recursion_spaces + '* ' + mlc_script_info)
574576

575577
#######################################################################
@@ -731,7 +733,6 @@ def _run(self, i):
731733
False,
732734
script_tags_string,
733735
quiet,
734-
verbose,
735736
logger)
736737

737738
# Remember selection
@@ -916,8 +917,7 @@ def _run(self, i):
916917
new_state_keys_from_meta,
917918
add_deps_recursive,
918919
run_state,
919-
recursion_spaces,
920-
verbose)
920+
recursion_spaces)
921921
if r['return'] > 0:
922922
return r
923923

@@ -1182,7 +1182,6 @@ def _run(self, i):
11821182
'skip_remembered_selections': skip_remembered_selections,
11831183
'remembered_selections': remembered_selections,
11841184
'quiet': quiet,
1185-
'verbose': verbose,
11861185
'show_time': show_time
11871186
})
11881187
if r['return'] > 0:
@@ -1216,7 +1215,6 @@ def _run(self, i):
12161215
True,
12171216
script_tags_string,
12181217
quiet,
1219-
verbose,
12201218
logger)
12211219

12221220
if selection >= 0:
@@ -1244,7 +1242,7 @@ def _run(self, i):
12441242
' - Checking dynamic dependencies on other MLC scripts:')
12451243
r = self._call_run_deps(deps, self.local_env_keys, local_env_keys_from_meta, env, state, const, const_state, add_deps_recursive,
12461244
recursion_spaces + extra_recursion_spaces,
1247-
remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1245+
remembered_selections, variation_tags_string, True, debug_script_tags, show_time, extra_recursion_spaces, run_state)
12481246
if r['return'] > 0:
12491247
return r
12501248

@@ -1264,7 +1262,7 @@ def _run(self, i):
12641262

12651263
r = self._call_run_deps(prehook_deps, self.local_env_keys, local_env_keys_from_meta, env, state, const, const_state, add_deps_recursive,
12661264
recursion_spaces + extra_recursion_spaces,
1267-
remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1265+
remembered_selections, variation_tags_string, True, debug_script_tags, show_time, extra_recursion_spaces, run_state)
12681266
if r['return'] > 0:
12691267
return r
12701268

@@ -1327,7 +1325,7 @@ def _run(self, i):
13271325

13281326
r = self._call_run_deps(posthook_deps, self.local_env_keys, clean_env_keys_post_deps, env, state, const, const_state, add_deps_recursive,
13291327
recursion_spaces + extra_recursion_spaces,
1330-
remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1328+
remembered_selections, variation_tags_string, True, debug_script_tags, show_time, extra_recursion_spaces, run_state)
13311329
if r['return'] > 0:
13321330
return r
13331331

@@ -1338,7 +1336,7 @@ def _run(self, i):
13381336
# Check chain of post dependencies on other MLC scripts
13391337
r = self._call_run_deps(post_deps, self.local_env_keys, clean_env_keys_post_deps, env, state, const, const_state, add_deps_recursive,
13401338
recursion_spaces + extra_recursion_spaces,
1341-
remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1339+
remembered_selections, variation_tags_string, True, debug_script_tags, show_time, extra_recursion_spaces, run_state)
13421340
if r['return'] > 0:
13431341
return r
13441342

@@ -1545,7 +1543,7 @@ def _run(self, i):
15451543

15461544
r = self._call_run_deps(docker_deps, self.local_env_keys, local_env_keys_from_meta, env, state, const, const_state, add_deps_recursive,
15471545
recursion_spaces + extra_recursion_spaces,
1548-
remembered_selections, variation_tags_string, False, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1546+
remembered_selections, variation_tags_string, False, debug_script_tags, show_time, extra_recursion_spaces, run_state)
15491547
if r['return'] > 0:
15501548
return r
15511549

@@ -1582,7 +1580,6 @@ def _run(self, i):
15821580
'variation_tags_string': variation_tags_string,
15831581
'found_cached': False,
15841582
'debug_script_tags': debug_script_tags,
1585-
'verbose': verbose,
15861583
'meta': meta,
15871584
'self': self
15881585
}
@@ -1643,7 +1640,7 @@ def _run(self, i):
16431640

16441641
r = self._call_run_deps(deps, self.local_env_keys, local_env_keys_from_meta, env, state, const, const_state, add_deps_recursive,
16451642
recursion_spaces + extra_recursion_spaces,
1646-
remembered_selections, variation_tags_string, False, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1643+
remembered_selections, variation_tags_string, False, debug_script_tags, show_time, extra_recursion_spaces, run_state)
16471644
if r['return'] > 0:
16481645
return r
16491646

@@ -1686,7 +1683,6 @@ def _run(self, i):
16861683
'variation_tags_string': variation_tags_string,
16871684
'found_cached': False,
16881685
'debug_script_tags': debug_script_tags,
1689-
'verbose': verbose,
16901686
'meta': meta,
16911687
'self': self
16921688
}
@@ -1859,7 +1855,7 @@ def _run(self, i):
18591855

18601856
r = self._call_run_deps(prehook_deps, self.local_env_keys, local_env_keys_from_meta, env, state, const, const_state, add_deps_recursive,
18611857
recursion_spaces + extra_recursion_spaces,
1862-
remembered_selections, variation_tags_string, found_cached, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1858+
remembered_selections, variation_tags_string, found_cached, debug_script_tags, show_time, extra_recursion_spaces, run_state)
18631859
if r['return'] > 0:
18641860
return r
18651861

@@ -1902,7 +1898,7 @@ def _run(self, i):
19021898
'clean_env_keys_post_deps', [])
19031899

19041900
r = self._run_deps(post_deps, clean_env_keys_post_deps, env, state, const, const_state, add_deps_recursive, recursion_spaces,
1905-
remembered_selections, variation_tags_string, found_cached, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
1901+
remembered_selections, variation_tags_string, found_cached, debug_script_tags, show_time, extra_recursion_spaces, run_state)
19061902
if r['return'] > 0:
19071903
return r
19081904

@@ -2181,7 +2177,7 @@ def _run(self, i):
21812177
f.write(readme)
21822178

21832179
if dump_version_info:
2184-
r = self._dump_version_info_for_script(quiet=quiet, silent=silent)
2180+
r = self._dump_version_info_for_script(quiet=quiet)
21852181
if r['return'] > 0:
21862182
return r
21872183

@@ -2231,17 +2227,16 @@ def _run(self, i):
22312227
' - used disk space: {} MB'.format(used_disk_space_in_mb))
22322228

22332229
# Check if need to print some final info such as path to model, etc
2234-
if not run_state.get('tmp_silent', False):
2235-
print_env_at_the_end = meta.get('print_env_at_the_end', {})
2236-
if len(print_env_at_the_end) > 0:
2237-
for p in sorted(print_env_at_the_end):
2238-
t = print_env_at_the_end[p]
2239-
if t == '':
2240-
t = 'ENV[{}]'.format(p)
2230+
print_env_at_the_end = meta.get('print_env_at_the_end', {})
2231+
if len(print_env_at_the_end) > 0:
2232+
for p in sorted(print_env_at_the_end):
2233+
t = print_env_at_the_end[p]
2234+
if t == '':
2235+
t = 'ENV[{}]'.format(p)
22412236

2242-
v = new_env.get(p, None)
2237+
v = new_env.get(p, None)
22432238

2244-
logger.info('{}: {}'.format(t, str(v)))
2239+
logger.info('{}: {}'.format(t, str(v)))
22452240

22462241
# Check if print nice versions
22472242
if print_versions:
@@ -2327,12 +2322,11 @@ def _fix_cache_paths(self, env):
23272322

23282323
##########################################################################
23292324
def _dump_version_info_for_script(
2330-
self, output_dir=os.getcwd(), quiet=False, silent=False):
2325+
self, output_dir=os.getcwd(), quiet=False):
23312326
logger = self.action_object.logger
2332-
if not quiet and not silent:
2333-
pass
23342327
for f in ['mlc-run-script-versions.json', 'version_info.json']:
2335-
logger.info('Dumping versions to {}'.format(f))
2328+
if not quiet:
2329+
logger.info('Dumping versions to {}'.format(f))
23362330
r = utils.save_json(f, self.run_state.get('version_info', []))
23372331
if r['return'] > 0:
23382332
return r
@@ -2341,7 +2335,7 @@ def _dump_version_info_for_script(
23412335

23422336
##########################################################################
23432337
def _update_state_from_variations(self, i, meta, variation_tags, variations, env, state, const, const_state, deps, post_deps, prehook_deps,
2344-
posthook_deps, new_env_keys_from_meta, new_state_keys_from_meta, add_deps_recursive, run_state, recursion_spaces, verbose):
2338+
posthook_deps, new_env_keys_from_meta, new_state_keys_from_meta, add_deps_recursive, run_state, recursion_spaces):
23452339

23462340
logger = self.action_object.logger
23472341
# Save current explicit variations
@@ -3303,7 +3297,7 @@ def _process_variation_tags_in_groups(
33033297

33043298
def _call_run_deps(script, deps, local_env_keys, local_env_keys_from_meta, env, state, const, const_state,
33053299
add_deps_recursive, recursion_spaces, remembered_selections, variation_tags_string, found_cached, debug_script_tags='',
3306-
verbose=False, show_time=False, extra_recursion_spaces=' ', run_state={'deps': [], 'fake_deps': [], 'parent': None}):
3300+
show_time=False, extra_recursion_spaces=' ', run_state={'deps': [], 'fake_deps': [], 'parent': None}):
33073301
if len(deps) == 0:
33083302
return {'return': 0}
33093303

@@ -3317,8 +3311,8 @@ def _call_run_deps(script, deps, local_env_keys, local_env_keys_from_meta, env,
33173311
local_env_keys += local_env_keys_from_meta
33183312

33193313
r = script._run_deps(deps, local_env_keys, env, state, const, const_state, add_deps_recursive, recursion_spaces,
3320-
remembered_selections, variation_tags_string, found_cached, debug_script_tags,
3321-
verbose, show_time, extra_recursion_spaces, run_state)
3314+
remembered_selections, variation_tags_string, found_cached, debug_script_tags,
3315+
show_time, extra_recursion_spaces, run_state)
33223316
if r['return'] > 0:
33233317
return r
33243318

@@ -3327,7 +3321,7 @@ def _call_run_deps(script, deps, local_env_keys, local_env_keys_from_meta, env,
33273321
##########################################################################
33283322
def _run_deps(self, deps, clean_env_keys_deps, env, state, const, const_state, add_deps_recursive, recursion_spaces,
33293323
remembered_selections, variation_tags_string='', from_cache=False, debug_script_tags='',
3330-
verbose=False, show_time=False, extra_recursion_spaces=' ', run_state={'deps': [], 'fake_deps': [], 'parent': None}):
3324+
show_time=False, extra_recursion_spaces=' ', run_state={'deps': [], 'fake_deps': [], 'parent': None}):
33313325
"""
33323326
Runs all the enabled dependencies and pass them env minus local env
33333327
"""
@@ -3470,8 +3464,6 @@ def _run_deps(self, deps, clean_env_keys_deps, env, state, const, const_state, a
34703464
'const_state': copy.deepcopy(const_state),
34713465
'add_deps_recursive': add_deps_recursive,
34723466
'debug_script_tags': debug_script_tags,
3473-
'verbose': verbose,
3474-
'silent': run_state.get('tmp_silent', False),
34753467
'time': show_time,
34763468
'run_state': run_state_copy
34773469

@@ -3764,10 +3756,6 @@ def find_file_in_paths(self, i):
37643756
logger = self.action_object.logger
37653757
hook = i.get('hook', None)
37663758

3767-
verbose = i.get('verbose', False)
3768-
if not verbose:
3769-
verbose = i.get('v', False)
3770-
37713759
file_name = i.get('file_name', '')
37723760
file_name_re = i.get('file_name_re', '')
37733761
file_is_re = False
@@ -5019,9 +5007,6 @@ def prepare_and_run_script_with_postprocessing(i, postprocess="postprocess"):
50195007
state = i.get('state', {})
50205008
const_state = i.get('const_state', {})
50215009
run_state = i.get('run_state', {})
5022-
verbose = i.get('verbose', False)
5023-
if not verbose:
5024-
verbose = i.get('v', False)
50255010

50265011
show_time = i.get('time', False)
50275012
logger = i['self'].action_object.logger
@@ -5275,25 +5260,25 @@ def prepare_and_run_script_with_postprocessing(i, postprocess="postprocess"):
52755260

52765261
if len(posthook_deps) > 0 and (postprocess == "postprocess"):
52775262
r = script_automation._call_run_deps(posthook_deps, local_env_keys, local_env_keys_from_meta, env, state, const, const_state,
5278-
add_deps_recursive, recursion_spaces, remembered_selections, variation_tags_string, found_cached, debug_script_tags, verbose, show_time, ' ', run_state)
5263+
add_deps_recursive, recursion_spaces, remembered_selections, variation_tags_string, found_cached, debug_script_tags, show_time, ' ', run_state)
52795264
if r['return'] > 0:
52805265
return r
52815266

52825267
if (postprocess == "postprocess") and customize_code is not None and 'postprocess' in dir(
52835268
customize_code):
52845269
rr = run_postprocess(customize_code, customize_common_input, recursion_spaces, env, state, const,
5285-
const_state, meta, verbose, i) # i as run_script_input
5270+
const_state, meta, i) # i as run_script_input
52865271
elif (postprocess == "detect_version") and customize_code is not None and 'detect_version' in dir(customize_code):
52875272
rr = run_detect_version(customize_code, customize_common_input, recursion_spaces, env, state, const,
5288-
const_state, meta, verbose)
5273+
const_state, meta)
52895274

52905275
return rr
52915276

52925277
##############################################################################
52935278

52945279

52955280
def run_detect_version(customize_code, customize_common_input,
5296-
recursion_spaces, env, state, const, const_state, meta, verbose=False):
5281+
recursion_spaces, env, state, const, const_state, meta):
52975282

52985283
if customize_code is not None and 'detect_version' in dir(customize_code):
52995284
import copy
@@ -5324,7 +5309,7 @@ def run_detect_version(customize_code, customize_common_input,
53245309

53255310

53265311
def run_postprocess(customize_code, customize_common_input, recursion_spaces,
5327-
env, state, const, const_state, meta, verbose=False, run_script_input=None):
5312+
env, state, const, const_state, meta, run_script_input=None):
53285313

53295314
if customize_code is not None and 'postprocess' in dir(customize_code):
53305315
import copy
@@ -5962,7 +5947,7 @@ def detect_state_diff(env, saved_env, new_env_keys,
59625947

59635948

59645949
def select_script_item(lst, text, recursion_spaces,
5965-
can_skip, script_tags_string, quiet, verbose, logger=None):
5950+
can_skip, script_tags_string, quiet, logger=None):
59665951
"""
59675952
Internal: select script
59685953
"""

0 commit comments

Comments
 (0)