Skip to content

Fix dangling softlink issue with nvidia-mlperf-inference-bert #64

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

Merged
merged 6 commits into from
Dec 21, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: MLPerf Inference Nvidia implementations

on:
schedule:
- cron: "15 02 * * *" #to be adjusted
- cron: "08 13 * * *" #to be adjusted

jobs:
run_nvidia:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-scc24-sdxl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: MLPerf inference SDXL (SCC)

on:
schedule:
- cron: "40 12 * * *"
- cron: "56 12 * * *"

jobs:
build_reference:
Expand Down
30 changes: 17 additions & 13 deletions script/app-mlperf-inference-nvidia/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ def preprocess(i):
make_command = env['MLPERF_NVIDIA_RUN_COMMAND']

if make_command == "prebuild":
cmds.append(f"make prebuild NETWORK_NODE=SUT")
cmds.append(f"""make prebuild NETWORK_NODE=SUT""")

if env['CM_MODEL'] == "resnet50":
target_data_path = os.path.join(
env['MLPERF_SCRATCH_PATH'], 'data', 'imagenet')
if not os.path.exists(target_data_path):
cmds.append(
f"ln -sf {env['CM_DATASET_IMAGENET_PATH']} {target_data_path}")
f"""ln -sf {env['CM_DATASET_IMAGENET_PATH']} {target_data_path}""")

model_path = os.path.join(
env['MLPERF_SCRATCH_PATH'],
Expand All @@ -53,11 +53,11 @@ def preprocess(i):
'resnet50_v1.onnx')

if not os.path.exists(os.path.dirname(model_path)):
cmds.append(f"mkdir -p {os.path.dirname(model_path)}")
cmds.append(f"""mkdir -p {os.path.dirname(model_path)}""")

if not os.path.exists(model_path):
cmds.append(
f"ln -sf {env['CM_ML_MODEL_FILE_WITH_PATH']} {model_path}")
f"""ln -sf {env['CM_ML_MODEL_FILE_WITH_PATH']} {model_path}""")
model_name = "resnet50"

elif "bert" in env['CM_MODEL']:
Expand All @@ -83,17 +83,17 @@ def preprocess(i):
'vocab.txt')

if not os.path.exists(os.path.dirname(fp32_model_path)):
cmds.append(f"mkdir -p {os.path.dirname(fp32_model_path)}")
cmds.append(f"""mkdir -p {os.path.dirname(fp32_model_path)}""")

if not os.path.exists(fp32_model_path):
cmds.append(
f"cp -r {env['CM_ML_MODEL_BERT_LARGE_FP32_PATH']} {fp32_model_path}")
f"""cp -r --remove-destination {env['CM_ML_MODEL_BERT_LARGE_FP32_PATH']} {fp32_model_path}""")
if not os.path.exists(int8_model_path):
cmds.append(
f"cp -r {env['CM_ML_MODEL_BERT_LARGE_INT8_PATH']} {int8_model_path}")
f"""cp -r --remove-destination {env['CM_ML_MODEL_BERT_LARGE_INT8_PATH']} {int8_model_path}""")
if not os.path.exists(vocab_path):
cmds.append(
f"cp -r {env['CM_ML_MODEL_BERT_VOCAB_FILE_WITH_PATH']} {vocab_path}")
f"""cp -r --remove-destination {env['CM_ML_MODEL_BERT_VOCAB_FILE_WITH_PATH']} {vocab_path}""")
model_name = "bert"
model_path = fp32_model_path

Expand All @@ -112,9 +112,9 @@ def preprocess(i):
# cmds.append("make download_data BENCHMARKS='stable-diffusion-xl'")
env['CM_REQUIRE_COCO2014_DOWNLOAD'] = 'yes'
cmds.append(
f"cp -r \\$CM_DATASET_PATH_ROOT/captions/captions.tsv {target_data_path}/captions_5k_final.tsv")
f"""cp -r \\$CM_DATASET_PATH_ROOT/captions/captions.tsv {target_data_path}/captions_5k_final.tsv""")
cmds.append(
f"cp -r \\$CM_DATASET_PATH_ROOT/latents/latents.pt {target_data_path}/latents.pt")
f"""cp -r \\$CM_DATASET_PATH_ROOT/latents/latents.pt {target_data_path}/latents.pt""")
fp16_model_path = os.path.join(
env['MLPERF_SCRATCH_PATH'],
'models',
Expand All @@ -124,7 +124,7 @@ def preprocess(i):
'stable_diffusion_fp16')

if not os.path.exists(os.path.dirname(fp16_model_path)):
cmds.append(f"mkdir -p {os.path.dirname(fp16_model_path)}")
cmds.append(f"""mkdir -p {os.path.dirname(fp16_model_path)}""")

if not os.path.exists(fp16_model_path):
if os.path.islink(fp16_model_path):
Expand Down Expand Up @@ -687,11 +687,15 @@ def preprocess(i):
'') # will be ignored during build engine

if "stable-diffusion" in env["CM_MODEL"]:
extra_build_engine_options_string += f" --model_path {os.path.join(env['MLPERF_SCRATCH_PATH'], 'models', 'SDXL/')}"
extra_build_engine_options_string += f""" --model_path {
os.path.join(
env['MLPERF_SCRATCH_PATH'],
'models',
'SDXL/')}"""

run_config += " --no_audit_verify"

cmds.append(f"make {make_command} RUN_ARGS=' --benchmarks={model_name} --scenarios={scenario} {test_mode_string} {run_config} {extra_build_engine_options_string} {extra_run_options_string}'")
cmds.append(f"""make {make_command} RUN_ARGS=' --benchmarks={model_name} --scenarios={scenario} {test_mode_string} {run_config} {extra_build_engine_options_string} {extra_run_options_string}'""")

run_cmd = " && ".join(cmds)
env['CM_MLPERF_RUN_CMD'] = run_cmd
Expand Down
2 changes: 1 addition & 1 deletion script/get-mlperf-inference-utils/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def preprocess(i):

quiet = (env.get('CM_QUIET', False) == 'yes')

utils_path = i['run_script_input']['path']
utils_path = env['CM_TMP_CURRENT_SCRIPT_PATH']

env['+PYTHONPATH'] = [utils_path]

Expand Down
Loading