diff --git a/script/app-mlperf-inference-nvidia/customize.py b/script/app-mlperf-inference-nvidia/customize.py index d15298f85..e2fd387c8 100644 --- a/script/app-mlperf-inference-nvidia/customize.py +++ b/script/app-mlperf-inference-nvidia/customize.py @@ -141,7 +141,7 @@ def preprocess(i): dataset_path = env['CM_DATASET_OPENIMAGES_PATH'] #return {'return': 1, 'error': 'error'} - annotations_path = env['CM_DATASET_OPENIMAGES_VALIDATION_ANNOTATIONS_FILE_PATH'] + annotations_path = env['CM_DATASET_OPENIMAGES_ANNOTATIONS_DIR_PATH'] target_data_path_dir = os.path.join(env['MLPERF_SCRATCH_PATH'], 'data', 'open-images-v6-mlperf') if not os.path.exists(target_data_path_dir): cmds.append(f"mkdir -p {target_data_path_dir}") diff --git a/script/app-mlperf-inference/_cm.yaml b/script/app-mlperf-inference/_cm.yaml index c6b480efc..54d7e3073 100644 --- a/script/app-mlperf-inference/_cm.yaml +++ b/script/app-mlperf-inference/_cm.yaml @@ -1658,7 +1658,7 @@ docker: - "${{ CM_DATASET_IMAGENET_PATH }}:${{ CM_DATASET_IMAGENET_PATH }}" - "${{ CM_DATASET_OPENIMAGES_PATH }}:${{ CM_DATASET_OPENIMAGES_PATH }}" - "${{ CM_OPENIMAGES_CALIBRATION_DATASET_PATH }}:${{ CM_OPENIMAGES_CALIBRATION_DATASET_PATH }}" - - "${{ CM_DATASET_OPENIMAGES_VALIDATION_ANNOTATIONS_FILE_PATH }}:${{ CM_DATASET_OPENIMAGES_VALIDATION_ANNOTATIONS_FILE_PATH }}" + - "${{ CM_DATASET_OPENIMAGES_ANNOTATIONS_DIR_PATH }}:${{ CM_DATASET_OPENIMAGES_ANNOTATIONS_DIR_PATH }}" - "${{ CM_MLPERF_INFERENCE_RESULTS_DIR }}:${{ CM_MLPERF_INFERENCE_RESULTS_DIR }}" - "${{ OUTPUT_BASE_DIR }}:${{ OUTPUT_BASE_DIR }}" - "${{ CM_MLPERF_INFERENCE_SUBMISSION_DIR }}:${{ CM_MLPERF_INFERENCE_SUBMISSION_DIR }}" diff --git a/script/get-dataset-openimages/_cm.json b/script/get-dataset-openimages/_cm.json index c57f5ffbc..b93cf8aa0 100644 --- a/script/get-dataset-openimages/_cm.json +++ b/script/get-dataset-openimages/_cm.json @@ -79,6 +79,7 @@ "CM_CALIBRATION_DATASET_PATH", "CM_CALIBRATION_DATASET_PATH_ROOT", "CM_OPENIMAGES_CALIBRATION_DATASET_PATH", + "CM_DATASET_OPENIMAGES_ANNOTATIONS_DIR_PATH", "CM_DATASET_OPENIMAGES_VALIDATION_ANNOTATIONS_FILE_PATH" ], "tags": [ diff --git a/script/get-dataset-openimages/customize.py b/script/get-dataset-openimages/customize.py index 2d788b853..84d1f5231 100644 --- a/script/get-dataset-openimages/customize.py +++ b/script/get-dataset-openimages/customize.py @@ -69,8 +69,8 @@ def postprocess(i): env['CM_DATASET_PATH'] = os.path.join(os.getcwd(), 'install', 'validation', 'data') annotations_file_path = os.path.join(env['CM_DATASET_ANNOTATIONS_DIR_PATH'], "openimages-mlperf.json") env['CM_DATASET_VALIDATION_ANNOTATIONS_FILE_PATH'] = annotations_file_path - env['CM_DATASET_OPENIMAGES_VALIDATION_ANNOTATIONS_FILE_PATH'] = annotations_file_path env['CM_DATASET_ANNOTATIONS_FILE_PATH'] = annotations_file_path + env['CM_DATASET_OPENIMAGES_VALIDATION_ANNOTATIONS_FILE_PATH'] = annotations_file_path if env.get("CM_DATASET_OPENIMAGES_CUSTOM_ANNOTATIONS",'') == "yes": annotations_file_src = env['CM_DATASET_OPENIMAGES_ANNOTATIONS_FILE_PATH'] shutil.copy(annotations_file_src, env['CM_DATASET_ANNOTATIONS_DIR_PATH'])