From cd91cdfc2397836f33576da2a790e98ba25d3545 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Mon, 19 May 2025 01:20:56 +0530 Subject: [PATCH 1/4] Removed pycuda version fix --- script/app-mlperf-inference-nvidia/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/script/app-mlperf-inference-nvidia/meta.yaml b/script/app-mlperf-inference-nvidia/meta.yaml index 1fbba99d6..15e66aa40 100644 --- a/script/app-mlperf-inference-nvidia/meta.yaml +++ b/script/app-mlperf-inference-nvidia/meta.yaml @@ -274,7 +274,6 @@ deps: - tags: get,generic-python-lib,_package.pycuda names: - pycuda - version: "2022.2.2" - tags: get,generic-python-lib,_package.nvmitten update_tags_from_env_with_prefix: From e6beae0598df2ffda620b5a9035b018a44b2531d Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Mon, 19 May 2025 01:40:00 +0530 Subject: [PATCH 2/4] Upgrade numpy for nvmitten --- script/get-nvidia-mitten/customize.py | 9 ++++----- script/get-nvidia-mitten/meta.yaml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/script/get-nvidia-mitten/customize.py b/script/get-nvidia-mitten/customize.py index 77e4bac46..5466d64b9 100644 --- a/script/get-nvidia-mitten/customize.py +++ b/script/get-nvidia-mitten/customize.py @@ -6,12 +6,11 @@ def preprocess(i): os_info = i['os_info'] env = i['env'] - script_path = i['artifact'].path + script_path = env['MLC_TMP_CURRENT_SCRIPT_PATH'] - if env.get('MLC_MLPERF_INFERENCE_VERSION', '') == "5.0": - extra_run_cmd = 'patch -p1 < {}'.format(os.path.join( - script_path, 'patch', 'numpy-mitten-v5.0.patch')) - env['EXTRA_RUN_CMD'] = extra_run_cmd + extra_run_cmd = 'patch -p1 < {}'.format(os.path.join( + script_path, 'patch', 'numpy-mitten-v5.0.patch')) + env['EXTRA_RUN_CMD'] = extra_run_cmd return {'return': 0} diff --git a/script/get-nvidia-mitten/meta.yaml b/script/get-nvidia-mitten/meta.yaml index c5452c480..0e822f0e4 100644 --- a/script/get-nvidia-mitten/meta.yaml +++ b/script/get-nvidia-mitten/meta.yaml @@ -3,7 +3,7 @@ automation_alias: script automation_uid: 5b4e0237da074764 cache: true category: MLPerf benchmark support -default_version: master +default_version: main deps: - tags: detect,os - names: From a2759a8438162f61cc810718a1c112c1051a1690 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Mon, 19 May 2025 01:59:17 +0530 Subject: [PATCH 3/4] Fix nvidia-mitten install --- script/get-nvidia-mitten/customize.py | 5 ----- script/get-nvidia-mitten/meta.yaml | 12 ++++++++++++ script/get-nvidia-mitten/run.sh | 5 ++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/script/get-nvidia-mitten/customize.py b/script/get-nvidia-mitten/customize.py index 5466d64b9..8d8693ca0 100644 --- a/script/get-nvidia-mitten/customize.py +++ b/script/get-nvidia-mitten/customize.py @@ -6,11 +6,6 @@ def preprocess(i): os_info = i['os_info'] env = i['env'] - script_path = env['MLC_TMP_CURRENT_SCRIPT_PATH'] - - extra_run_cmd = 'patch -p1 < {}'.format(os.path.join( - script_path, 'patch', 'numpy-mitten-v5.0.patch')) - env['EXTRA_RUN_CMD'] = extra_run_cmd return {'return': 0} diff --git a/script/get-nvidia-mitten/meta.yaml b/script/get-nvidia-mitten/meta.yaml index 0e822f0e4..80e414a32 100644 --- a/script/get-nvidia-mitten/meta.yaml +++ b/script/get-nvidia-mitten/meta.yaml @@ -18,6 +18,7 @@ deps: extra_cache_tags: nvidia,mitten,src force_env_keys: - MLC_GIT_CHECKOUT + - MLC_GIT_PATCH_FILEPATHS names: - nvidia-mitten-git-src tags: get,git,_repo.https://github.com/NVIDIA/mitten @@ -32,3 +33,14 @@ tags: - mitten - nvidia-mitten uid: 1c045f2902374de9 +variations: + patched: + group: numpy-patch + default: true + adr: + nvidia-mitten-git-src: + tags: _patch + env: + MLC_GIT_PATCH_FILEPATHS: <<>>/patch/numpy-mitten-v5.0.patch + default: + group: numpy-patch diff --git a/script/get-nvidia-mitten/run.sh b/script/get-nvidia-mitten/run.sh index 81f38f829..33f3f5b90 100644 --- a/script/get-nvidia-mitten/run.sh +++ b/script/get-nvidia-mitten/run.sh @@ -1,7 +1,6 @@ #!/bin/bash cd ${MLC_NVIDIA_MITTEN_SRC} -echo "EXTRA_RUN_CMD = ${EXTRA_RUN_CMD}" -eval "${EXTRA_RUN_CMD}" test $? -eq 0 || exit $? -${MLC_PYTHON_BIN_WITH_PATH} -m pip install . +PIP_EXTRA=`python3 -c "import importlib.metadata; print(' --break-system-packages ' if int(importlib.metadata.version('pip').split('.')[0]) >= 23 else '')"` +${MLC_PYTHON_BIN_WITH_PATH} -m pip install . ${PIP_EXTRA} test $? -eq 0 || exit $? From bf456104cc25683f523fc397f83a20cc570047b0 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Mon, 19 May 2025 02:13:55 +0530 Subject: [PATCH 4/4] detect sudo error --- script/detect-sudo/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/detect-sudo/customize.py b/script/detect-sudo/customize.py index a749acd2a..2a56f6d33 100644 --- a/script/detect-sudo/customize.py +++ b/script/detect-sudo/customize.py @@ -174,7 +174,7 @@ def prompt_sudo(logger): if not prompt_retry(): # If the user chooses not to retry or times out return -1 except subprocess.CalledProcessError as e: - logger.error(f"Command failed: {e.output.decode('utf-8')}") + logger.error(f"Command failed: {e.output}") reset_terminal() # Reset terminal in case of failure return -1 except Exception as e: