fix for log leveling inside docker

Author: anandhu-eng

automation/script/docker.py

@@ -178,8 +178,32 @@ def dockerfile(self_module, input_params):
             'comments': comments, 'run_cmd': f"{run_command_string} --quiet",
             'script_tags': input_params.get('tags'), 'env': env,
             'dockerfile_env': dockerfile_env,
-            'quiet': True, 'real_run': True, '-v': is_true(input_params.get('v', input_params.get('verbose', False))), '-s': is_true(input_params.get('s', input_params.get('silent', False)))
+            'quiet': True, 'real_run': True
         }
+
+        docker_v = False
+        docker_s = False
+        if is_true(input_params.get('docker_v', input_params.get('docker_verbose', False))):
+            docker_v = True
+        if is_true(input_params.get('docker_s', input_params.get('docker_silent', False))):
+            docker_s = True
+        
+        if docker_s and docker_v:
+            logger.warning(
+                "Both verbose and silent is set to True. Verbose will take precedence.")
+            docker_s = False
+
+        if not docker_s and not docker_v:
+            if logger.level == logging.DEBUG:
+                docker_v = True
+            elif logger.level == logging.WARNING:
+                docker_s = True
+        
+        if docker_s:
+            mlc_docker_input['run_cmd'] += ' -s'
+        elif docker_v:
+            mlc_docker_input['run_cmd'] += ' -v'
+
         mlc_docker_input.update(docker_inputs)
 
         dockerfile_result = self_module.action_object.access(mlc_docker_input)

script/run-mlperf-inference-app/customize.py

@@ -159,7 +159,7 @@ def preprocess(i):
     tags = "app,mlperf,inference,generic," + variation_implementation + variation_model + variation_backend + variation_device + \
         variation_run_style + variation_reproducibility + \
         variation_quantization_string + power_variation + variation_all_models
-    verbose = inp.get('v', False)
+
     print_env = inp.get('print_env', False)
     print_deps = inp.get('print_deps', False)
     add_deps_recursive = inp.get('add_deps_recursive', {})
@@ -273,7 +273,7 @@ def preprocess(i):
             print(f"\nRunning loadgen scenario: {scenario} and mode: {mode}")
             ii = {'action': action, 'automation': 'script', 'tags': scenario_tags, 'quiet': 'true',
                   'env': env_copy, 'const': const_copy, 'input': inp, 'state': state, 'add_deps': copy.deepcopy(add_deps), 'add_deps_recursive':
-                  copy.deepcopy(add_deps_recursive), 'ad': ad, 'adr': copy.deepcopy(adr), 'v': verbose, 'print_env': print_env, 'print_deps': print_deps, 'dump_version_info': dump_version_info}
+                  copy.deepcopy(add_deps_recursive), 'ad': ad, 'adr': copy.deepcopy(adr), 'print_env': print_env, 'print_deps': print_deps, 'dump_version_info': dump_version_info}
 
             if action == "docker":
                 for k in docker_extra_input:
@@ -311,7 +311,7 @@ def preprocess(i):
                 env['MLC_MLPERF_LOADGEN_MODE'] = "compliance"
                 ii = {'action': action, 'automation': 'script', 'tags': scenario_tags, 'quiet': 'true',
                       'env': copy.deepcopy(env), 'const': copy.deepcopy(const), 'input': inp, 'state': state, 'add_deps': copy.deepcopy(add_deps), 'add_deps_recursive':
-                      copy.deepcopy(add_deps_recursive), 'adr': copy.deepcopy(adr), 'ad': ad, 'v': verbose, 'print_env': print_env, 'print_deps': print_deps, 'dump_version_info': dump_version_info}
+                      copy.deepcopy(add_deps_recursive), 'adr': copy.deepcopy(adr), 'ad': ad, 'print_env': print_env, 'print_deps': print_deps, 'dump_version_info': dump_version_info}
                 if action == "docker":
                     for k in docker_extra_input:
                         ii[k] = docker_extra_input[k]