From b5c9fa7a1472421611777fc113e62a8c346471f1 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 25 Feb 2025 18:05:23 +0000 Subject: [PATCH 1/6] Lower the prebuilt version for llvm --- script/install-llvm-prebuilt/customize.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/install-llvm-prebuilt/customize.py b/script/install-llvm-prebuilt/customize.py index 45417febc..3eed5a962 100644 --- a/script/install-llvm-prebuilt/customize.py +++ b/script/install-llvm-prebuilt/customize.py @@ -87,7 +87,7 @@ def preprocess(i): # Treat all Linux flavours as Ubuntu for now ... if True: - default_os = '22.04' + default_os = '20.04' if len(need_version_split) > 0: hver = 0 @@ -141,22 +141,22 @@ def preprocess(i): default_os = '18.04' elif need_version == '16.0.4': - default_os = '22.04' + default_os = '20.04' elif need_version == '17.0.2': - default_os = '22.04' + default_os = '20.04' elif need_version == '17.0.2': - default_os = '22.04' + default_os = '20.04' elif need_version == '17.0.4': - default_os = '22.04' + default_os = '20.04' elif need_version == '17.0.5': - default_os = '22.04' + default_os = '20.04' elif need_version == '17.0.6': - default_os = '22.04' + default_os = '20.04' package_name = 'clang+llvm-' + need_version + \ '-x86_64-linux-gnu-ubuntu-' + default_os + '.tar.xz' From 90a0b1188b628209e4edcc37977b1fa721f5443c Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 25 Feb 2025 18:07:29 +0000 Subject: [PATCH 2/6] Revert "Lower the prebuilt version for llvm" This reverts commit b5c9fa7a1472421611777fc113e62a8c346471f1. --- script/install-llvm-prebuilt/customize.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/install-llvm-prebuilt/customize.py b/script/install-llvm-prebuilt/customize.py index 3eed5a962..45417febc 100644 --- a/script/install-llvm-prebuilt/customize.py +++ b/script/install-llvm-prebuilt/customize.py @@ -87,7 +87,7 @@ def preprocess(i): # Treat all Linux flavours as Ubuntu for now ... if True: - default_os = '20.04' + default_os = '22.04' if len(need_version_split) > 0: hver = 0 @@ -141,22 +141,22 @@ def preprocess(i): default_os = '18.04' elif need_version == '16.0.4': - default_os = '20.04' + default_os = '22.04' elif need_version == '17.0.2': - default_os = '20.04' + default_os = '22.04' elif need_version == '17.0.2': - default_os = '20.04' + default_os = '22.04' elif need_version == '17.0.4': - default_os = '20.04' + default_os = '22.04' elif need_version == '17.0.5': - default_os = '20.04' + default_os = '22.04' elif need_version == '17.0.6': - default_os = '20.04' + default_os = '22.04' package_name = 'clang+llvm-' + need_version + \ '-x86_64-linux-gnu-ubuntu-' + default_os + '.tar.xz' From 8db6dc4ab41f1e8643149595a791629a883d6a14 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 25 Feb 2025 18:20:26 +0000 Subject: [PATCH 3/6] support more tf versions in build from src --- script/install-tensorflow-from-src/meta.yaml | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/script/install-tensorflow-from-src/meta.yaml b/script/install-tensorflow-from-src/meta.yaml index 30821bb38..c219d1179 100644 --- a/script/install-tensorflow-from-src/meta.yaml +++ b/script/install-tensorflow-from-src/meta.yaml @@ -344,3 +344,51 @@ versions: version: 5.0.0 env: MLC_GIT_CHECKOUT: v2.9.0 + v2.12.0: + deps: + - names: + - python + - python3 + tags: get,python + version_max: 3.11.999 + version_max_usable: 3.11.12 + version_min: 3.8.0 + - tags: get,gcc + version_max: '12.9' + version_min: '9' + - tags: get,bazel + version: 5.3.0 + env: + MLC_GIT_CHECKOUT: v2.12.0 + v2.15.0: + deps: + - names: + - python + - python3 + tags: get,python + version_max: 3.11.999 + version_max_usable: 3.11.12 + version_min: 3.9.0 + - tags: get,llvm + version_max: '16.9.999' + version_min: '16.0.0' + - tags: get,bazel + version: 6.1.0 + env: + MLC_GIT_CHECKOUT: v2.15.0 + v2.18.0: + deps: + - names: + - python + - python3 + tags: get,python + version_max: 3.12.999 + version_max_usable: 3.12.12 + version_min: 3.9.0 + - tags: get,llvm + version_max: '17.9.999' + version_min: '17.0.6' + - tags: get,bazel + version: 6.5.0 + env: + MLC_GIT_CHECKOUT: v2.18.0 From e69f190613e627c084d4103da43bc1463c0408e4 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Tue, 25 Feb 2025 23:16:34 +0000 Subject: [PATCH 4/6] Create power-server.conf --- .../run-mlperf-power-server/power-server.conf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 script/run-mlperf-power-server/power-server.conf diff --git a/script/run-mlperf-power-server/power-server.conf b/script/run-mlperf-power-server/power-server.conf new file mode 100644 index 000000000..70797bd62 --- /dev/null +++ b/script/run-mlperf-power-server/power-server.conf @@ -0,0 +1,19 @@ +[server] +ntpserver = time.google.com +listen = 0.0.0.0 4950 + +[ptd] +ptd = C:\Users\arjun\CM\repos\local\cache\5a0a52d578724774\repo\PTD\binaries\ptd-windows-x86.exe +analyzerCount = 2 + +[analyzer1] +interfaceflag = -y +devicetype = 49 +deviceport = C3YD21068E +networkport = 8888 + +[analyzer2] +interfaceflag = -g +devicetype = 8 +deviceport = 20 +networkport = 8889 From 2d6fc4b3487b6dc259092ad9808766e6757068f1 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Wed, 26 Feb 2025 01:08:54 +0000 Subject: [PATCH 5/6] Fix the run command for power runs --- script/benchmark-program-mlperf/customize.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/benchmark-program-mlperf/customize.py b/script/benchmark-program-mlperf/customize.py index 3f92511eb..493505c48 100644 --- a/script/benchmark-program-mlperf/customize.py +++ b/script/benchmark-program-mlperf/customize.py @@ -33,9 +33,9 @@ def postprocess(i): echo \${MLC_MLPERF_RUN_COUNT} > \${MLC_RUN_DIR}/count.txt; if [ \${MLC_MLPERF_RUN_COUNT} -eq 1 ]; then -export MLC_MLPERF_USER_CONF="${MLC_MLPERF_RANGING_USER_CONF}"; +export MLC_MLPERF_USER_CONF="\${MLC_MLPERF_RANGING_USER_CONF}"; else -export MLC_MLPERF_USER_CONF="${MLC_MLPERF_TESTING_USER_CONF}"; +export MLC_MLPERF_USER_CONF="\${MLC_MLPERF_TESTING_USER_CONF}"; fi ; From bb3991b1b2cb1b370696ad3fb60a8641b56485cc Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Wed, 26 Feb 2025 12:18:26 +0000 Subject: [PATCH 6/6] Support min_duration --- .../generate-mlperf-inference-user-conf/customize.py | 10 +++++----- script/run-mlperf-inference-app/meta.yaml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/script/generate-mlperf-inference-user-conf/customize.py b/script/generate-mlperf-inference-user-conf/customize.py index ec1a5fab7..a9f8e3eaa 100644 --- a/script/generate-mlperf-inference-user-conf/customize.py +++ b/script/generate-mlperf-inference-user-conf/customize.py @@ -356,13 +356,13 @@ def preprocess(i): max_duration_ranging_s * 1000) # in milliseconds if scenario == "MultiStream" or scenario == "SingleStream": - if env.get('MLC_MLPERF_USE_MAX_DURATION', 'yes').lower() not in ["no", "false", "0"] and env.get( - 'MLC_MLPERF_MODEL_EQUAL_ISSUE_MODE', 'no').lower() not in ["yes", "1", "true"]: - user_conf += ml_model_name + "." + scenario + \ - f".max_duration = {max_duration_valid}" + "\n" - elif env.get('MLC_MLPERF_INFERENCE_MIN_DURATION', '') != '': + if env.get('MLC_MLPERF_INFERENCE_MIN_DURATION', '') != '': user_conf += ml_model_name + "." + scenario + ".min_duration = " + \ env['MLC_MLPERF_INFERENCE_MIN_DURATION'] + " \n" + elif not is_false(env.get('MLC_MLPERF_USE_MAX_DURATION', 'yes')) and not is_true(env.get( + 'MLC_MLPERF_MODEL_EQUAL_ISSUE_MODE', 'no')): + user_conf += ml_model_name + "." + scenario + \ + f".max_duration = {max_duration_valid}" + "\n" if scenario == "MultiStream": user_conf += ml_model_name + "." + scenario + ".min_query_count = " + \ env.get( diff --git a/script/run-mlperf-inference-app/meta.yaml b/script/run-mlperf-inference-app/meta.yaml index bf8b741a1..b19362ecc 100644 --- a/script/run-mlperf-inference-app/meta.yaml +++ b/script/run-mlperf-inference-app/meta.yaml @@ -67,6 +67,7 @@ input_mapping: imagenet_path: IMAGENET_PATH implementation: MLC_MLPERF_IMPLEMENTATION lang: MLC_MLPERF_IMPLEMENTATION + min_duration: MLC_MLPERF_INFERENCE_MIN_DURATION min_query_count: MLC_MLPERF_INFERENCE_MIN_QUERY_COUNT max_query_count: MLC_MLPERF_INFERENCE_MAX_QUERY_COUNT mode: MLC_MLPERF_LOADGEN_MODE