From 98920b47133f1e35d602a4f326855ae0fad74bbd Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 4 Feb 2025 23:29:59 +0000 Subject: [PATCH 1/3] Fix automatic submission via CLI (thanks to Pablo) --- .../customize.py | 2 -- .../run-mlperf-inference-submission-checker/meta.yaml | 10 +++++++--- script/submit-mlperf-results/customize.py | 11 ++++++++--- script/tar-my-folder/customize.py | 1 + script/tar-my-folder/meta.yaml | 2 ++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/script/run-mlperf-inference-submission-checker/customize.py b/script/run-mlperf-inference-submission-checker/customize.py index 818981d72..0ecc0217f 100644 --- a/script/run-mlperf-inference-submission-checker/customize.py +++ b/script/run-mlperf-inference-submission-checker/customize.py @@ -96,8 +96,6 @@ def preprocess(i): def postprocess(i): env = i['env'] - if env.get('MLC_TAR_SUBMISSION_DIR', ''): - env['MLC_TAR_INPUT_DIR'] = env['MLC_MLPERF_INFERENCE_SUBMISSION_DIR'] x = env.get('MLPERF_INFERENCE_SUBMISSION_TAR_FILE', '') if x != '': diff --git a/script/run-mlperf-inference-submission-checker/meta.yaml b/script/run-mlperf-inference-submission-checker/meta.yaml index 0edef3341..d5971b146 100644 --- a/script/run-mlperf-inference-submission-checker/meta.yaml +++ b/script/run-mlperf-inference-submission-checker/meta.yaml @@ -72,16 +72,20 @@ post_deps: names: - push-to-github tags: publish-results,github -- enable_if_env: +- enable_if_any_env: MLC_TAR_SUBMISSION_DIR: - 'yes' + MLC_MLPERF_SUBMITTER_ID: + - 'yes' tags: run,tar + env: + MLC_TAR_INPUT_DIR: <<>> - enable_if_env: - MLC_SUBMITTER_ID: + MLC_MLPERF_SUBMITTER_ID: - 'yes' tags: submit,mlperf,results,_inference env: - MLC_MLPERF_SUBMISSION_FILE: <<>> + MLC_MLPERF_SUBMISSION_FILE: <<>> tags: - run - mlc diff --git a/script/submit-mlperf-results/customize.py b/script/submit-mlperf-results/customize.py index be2125325..cfd3fdfbb 100644 --- a/script/submit-mlperf-results/customize.py +++ b/script/submit-mlperf-results/customize.py @@ -15,8 +15,9 @@ def preprocess(i): benchmark = env['MLC_MLPERF_BENCHMARK'] submitter_id = env['MLC_MLPERF_SUBMITTER_ID'] file_path = env['MLC_MLPERF_SUBMISSION_FILE'] + submitter_name = env.get('MLC_MLPERF_SUBMITTER', '') - r = get_signed_url(server, benchmark, submitter_id, file_path) + r = get_signed_url(server, benchmark, submitter_id, submitter_name, file_path) if r['return'] > 0: return r @@ -37,7 +38,7 @@ def preprocess(i): return {'return': 0} -def get_signed_url(server, benchmark, submitter_id, file_path): +def get_signed_url(server, benchmark, submitter_id, submitter_name, file_path): # Define the URL url = f"{server}/index/url" @@ -72,15 +73,19 @@ def get_signed_url(server, benchmark, submitter_id, file_path): "error": f"An error occurred in connecting to the server: {e}"} response_json = response.json() - # print(response_json) # response = json.loads(response_json) try: signed_url = response_json['signed_url'] submission_id = response_json['submission_id'] + submitter_name_from_id = response_json['submitter_name'] except Exception as e: return { "return": 1, "error": f"An error occurred while processing the response: {e}"} + if submitter_name != '': + if submitter_name != submitter_name_from_id: + return {'return': 1, 'error': f"""Submitter name mismatch, given = {submitter_name}, name mapped to ID = {submitter_name_from_id}"""} + return {'return': 0, 'signed_url': signed_url, 'submission_id': submission_id} diff --git a/script/tar-my-folder/customize.py b/script/tar-my-folder/customize.py index e5a8eca9b..9013a3431 100644 --- a/script/tar-my-folder/customize.py +++ b/script/tar-my-folder/customize.py @@ -18,6 +18,7 @@ def preprocess(i): input_dirname = os.path.basename(input_dir) if output_file == "": output_file = input_dirname + ".tar.gz" + env['MLC_TAR_OUTFILE'] = output_file from pathlib import Path input_path = Path(input_dir) cd_dir = input_path.parent.absolute() diff --git a/script/tar-my-folder/meta.yaml b/script/tar-my-folder/meta.yaml index 505b3452b..900475310 100644 --- a/script/tar-my-folder/meta.yaml +++ b/script/tar-my-folder/meta.yaml @@ -9,6 +9,8 @@ input_mapping: input_dir: MLC_TAR_INPUT_DIR outfile: MLC_TAR_OUTFILE output_dir: MLC_TAR_OUTPUT_DIR +new_env_keys: + - MLC_TAR_OUTFILE tags: - run - tar From a5237186bae626588e7363fc07e9cc8daee26230 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 4 Feb 2025 23:30:19 +0000 Subject: [PATCH 2/3] [Automated Commit] Format Codebase --- script/submit-mlperf-results/customize.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/submit-mlperf-results/customize.py b/script/submit-mlperf-results/customize.py index cfd3fdfbb..0936ec560 100644 --- a/script/submit-mlperf-results/customize.py +++ b/script/submit-mlperf-results/customize.py @@ -17,7 +17,12 @@ def preprocess(i): file_path = env['MLC_MLPERF_SUBMISSION_FILE'] submitter_name = env.get('MLC_MLPERF_SUBMITTER', '') - r = get_signed_url(server, benchmark, submitter_id, submitter_name, file_path) + r = get_signed_url( + server, + benchmark, + submitter_id, + submitter_name, + file_path) if r['return'] > 0: return r From 16de19027fa9dc0d9c8e5a2c235d92e869e5f28a Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 4 Feb 2025 23:58:30 +0000 Subject: [PATCH 3/3] Delete script/generate-docs-for-all-scripts.cmd --- script/generate-docs-for-all-scripts.cmd | 1 - 1 file changed, 1 deletion(-) delete mode 100644 script/generate-docs-for-all-scripts.cmd diff --git a/script/generate-docs-for-all-scripts.cmd b/script/generate-docs-for-all-scripts.cmd deleted file mode 100644 index c21a77b71..000000000 --- a/script/generate-docs-for-all-scripts.cmd +++ /dev/null @@ -1 +0,0 @@ -cm doc script --repos=mlcommons@cm4mlops --output_dir=.. \ No newline at end of file