Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with docker for mlperf inference #1

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion automation/script/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -4483,7 +4483,7 @@ def prepare_and_run_script_with_postprocessing(i, postprocess="postprocess"):
posthook_deps = i.get('posthook_deps', [])
add_deps_recursive = i.get('add_deps_recursive', {})
recursion_spaces = i['recursion_spaces']
remembered_selections = i.get('remembered_selections', {})
remembered_selections = i.get('remembered_selections', [])
variation_tags_string = i.get('variation_tags_string', '')
found_cached = i.get('found_cached', False)
script_automation = i['self']
Expand Down
3 changes: 1 addition & 2 deletions automation/script/module_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,6 @@ def dockerfile(i):

run_cmd = r['run_cmd_string']


cm_repo = i.get('docker_cm_repo', docker_settings.get('cm_repo', 'mlcommons@cm4mlops'))
cm_repo_flags = i.get('docker_cm_repo_flags', docker_settings.get('cm_repo_flags', ''))

Expand Down Expand Up @@ -1769,7 +1768,7 @@ def docker(i):
run_state = {'deps':[], 'fake_deps':[], 'parent': None}
run_state['script_id'] = script_alias + "," + script_uid
run_state['script_variation_tags'] = variation_tags
r = script_automation._run_deps(deps, [], env, {}, {}, {}, {}, '', {}, '', False, '', verbose, show_time, ' ', run_state)
r = script_automation._run_deps(deps, [], env, {}, {}, {}, {}, '', [], '', False, '', verbose, show_time, ' ', run_state)
if r['return'] > 0:
return r

Expand Down
1 change: 1 addition & 0 deletions script/app-mlperf-inference/_cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,7 @@ docker:
shm_size: '32gb'
extra_run_args: ' --ulimit memlock=-1 --cap-add SYS_ADMIN --cap-add SYS_TIME --security-opt apparmor=unconfined --security-opt seccomp=unconfined'
docker_os: ubuntu
docker_cm_repo: gateoverflow@cm4mlops
docker_real_run: False
docker_os_version: '22.04'
docker_input_mapping:
Expand Down
4 changes: 4 additions & 0 deletions script/run-mlperf-inference-app/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ def preprocess(i):
r = cm.access(ii)
if r['return'] > 0:
return r
if state.get('docker', {}):
del(state['docker'])

if env.get("CM_MLPERF_LOADGEN_COMPLIANCE", "") == "yes":
for test in test_list:
Expand All @@ -229,6 +231,8 @@ def preprocess(i):
r = cm.access(ii)
if r['return'] > 0:
return r
if state.get('docker', {}):
del(state['docker'])

if state.get("cm-mlperf-inference-results"):
#print(state["cm-mlperf-inference-results"])
Expand Down