diff --git a/script/app-mlperf-inference-mlcommons-python/customize.py b/script/app-mlperf-inference-mlcommons-python/customize.py index d6b1222b0..9d0a64955 100644 --- a/script/app-mlperf-inference-mlcommons-python/customize.py +++ b/script/app-mlperf-inference-mlcommons-python/customize.py @@ -296,6 +296,8 @@ def get_run_cmd_reference(os_info, env, scenario_extra_options, mode_extra_optio scenario_extra_options + mode_extra_options + \ " --output " + env['CM_MLPERF_OUTPUT_DIR'] + \ " --model-path " + env['CM_ML_MODEL_PATH'] + if env.get('CM_COCO2014_SAMPLE_ID_PATH','') != '': + cmd += " --ids-path " + env['CM_COCO2014_SAMPLE_ID_PATH'] elif "llama2-70b" in env['CM_MODEL']: env['RUN_DIR'] = os.path.join(env['CM_MLPERF_INFERENCE_SOURCE'], "language", "llama2-70b") diff --git a/script/get-dataset-coco2014/_cm.yaml b/script/get-dataset-coco2014/_cm.yaml index 690e0926a..aba9b2ea0 100644 --- a/script/get-dataset-coco2014/_cm.yaml +++ b/script/get-dataset-coco2014/_cm.yaml @@ -45,6 +45,7 @@ new_env_keys: - CM_DATASET_ANNOTATIONS_DIR_PATH - CM_DATASET_ANNOTATIONS_FILE_PATH - CM_CALIBRATION_DATASET_PATH +- CM_COCO2014_SAMPLE_ID_PATH posthook_deps: - enable_if_env: diff --git a/script/get-dataset-coco2014/customize.py b/script/get-dataset-coco2014/customize.py index b6984bca1..a38f336bc 100644 --- a/script/get-dataset-coco2014/customize.py +++ b/script/get-dataset-coco2014/customize.py @@ -16,6 +16,9 @@ def preprocess(i): def postprocess(i): env = i['env'] + if env.get('CM_GENERATE_SAMPLE_ID', '') == "yes": + env['CM_COCO2014_SAMPLE_ID_PATH'] = os.path.join(os.getcwd(), 'install', 'sample_ids.txt') + print(env['CM_COCO2014_SAMPLE_ID_PATH']) if env.get('CM_DATASET_CALIBRATION','') == "no": env['CM_DATASET_PATH_ROOT'] = os.path.join(os.getcwd(), 'install') #env['CM_DATASET_PATH'] = os.path.join(os.getcwd(), 'install', 'validation', 'data') diff --git a/script/get-dataset-coco2014/run.sh b/script/get-dataset-coco2014/run.sh index f37ba603b..9668e3abd 100644 --- a/script/get-dataset-coco2014/run.sh +++ b/script/get-dataset-coco2014/run.sh @@ -33,6 +33,12 @@ else eval $cmd test $? -eq 0 || exit 1 fi +if [[ ${CM_GENERATE_SAMPLE_ID} == "yes" ]]; then + cmd="python3 sample_ids.py --tsv-path ${INSTALL_DIR}/captions/captions.tsv --output-path ${INSTALL_DIR}/sample_ids.txt" + echo $cmd + eval $cmd + test $? -eq 0 || exit 1 +fi cd ${INSTALL_DIR} test $? -eq 0 || exit 1 diff --git a/script/run-mlperf-inference-app/_cm.yaml b/script/run-mlperf-inference-app/_cm.yaml index 91c1e2a67..e3dcb5279 100644 --- a/script/run-mlperf-inference-app/_cm.yaml +++ b/script/run-mlperf-inference-app/_cm.yaml @@ -250,8 +250,12 @@ variations: adr: coco2014-preprocessed: tags: _size.50 + env: + CM_GENERATE_SAMPLE_ID: 'yes' coco2014-dataset: tags: _size.50 + env: + CM_GENERATE_SAMPLE_ID: 'yes' nvidia-preprocess-data: extra_cache_tags: "scc24-base" deps: @@ -264,8 +268,12 @@ variations: adr: coco2014-preprocessed: tags: _size.500 + env: + CM_GENERATE_SAMPLE_ID: 'yes' coco2014-dataset: tags: _size.500 + env: + CM_GENERATE_SAMPLE_ID: 'yes' nvidia-preprocess-data: extra_cache_tags: "scc24-main" env: