From d339bc6ba043a8684d0ba556576f404457a617bf Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Fri, 24 Jan 2025 18:50:04 +0530 Subject: [PATCH 1/3] Fix ABTF run --- script/run-mlperf-automotive-app/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/run-mlperf-automotive-app/customize.py b/script/run-mlperf-automotive-app/customize.py index d9ca6f3e0..6f8398743 100644 --- a/script/run-mlperf-automotive-app/customize.py +++ b/script/run-mlperf-automotive-app/customize.py @@ -3,7 +3,6 @@ import json import shutil import subprocess -import mlc import copy from tabulate import tabulate @@ -20,6 +19,7 @@ def preprocess(i): inp = i['input'] state = i['state'] script_path = i['run_script_input']['path'] + mlc = i['automation'].action_object if env.get('MLC_RUN_DOCKER_CONTAINER', '') == "yes": return {'return': 0} From a81a668e7406f5625bedfe4fa6a851c18c742e25 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Fri, 24 Jan 2025 18:55:27 +0530 Subject: [PATCH 2/3] Fix PATH export in dockerfile --- script/build-dockerfile/customize.py | 2 ++ script/build-dockerfile/dockerinfo.json | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/script/build-dockerfile/customize.py b/script/build-dockerfile/customize.py index fe680c3b1..a526c8f46 100644 --- a/script/build-dockerfile/customize.py +++ b/script/build-dockerfile/customize.py @@ -296,6 +296,8 @@ def preprocess(i): f.write('RUN {} -m venv $HOME/venv/mlc'.format(python) + " " + EOL) f.write('ENV PATH="$HOME/venv/mlc/bin:$PATH"' + EOL) # f.write('RUN . /opt/venv/mlc/bin/activate' + EOL) + + f.write('ENV PATH="$PATH:$HOME/.local/bin"' + EOL) f.write( 'RUN {} -m pip install '.format(python) + diff --git a/script/build-dockerfile/dockerinfo.json b/script/build-dockerfile/dockerinfo.json index a189267a8..cfb739e77 100644 --- a/script/build-dockerfile/dockerinfo.json +++ b/script/build-dockerfile/dockerinfo.json @@ -11,8 +11,7 @@ }, "ENTRYPOINT": "[\"/bin/bash\", \"-c\"]", "ENV": { - "TZ": "US/Pacific", - "PATH": "${PATH}:/home/mlcuser/.local/bin" + "TZ": "US/Pacific" }, "RUN_CMDS": [ "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone" From 59c81d49c845950f052cd482fb6df616be5cac40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 24 Jan 2025 13:25:45 +0000 Subject: [PATCH 3/3] [Automated Commit] Format Codebase --- script/build-dockerfile/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build-dockerfile/customize.py b/script/build-dockerfile/customize.py index a526c8f46..23e7891dc 100644 --- a/script/build-dockerfile/customize.py +++ b/script/build-dockerfile/customize.py @@ -296,7 +296,7 @@ def preprocess(i): f.write('RUN {} -m venv $HOME/venv/mlc'.format(python) + " " + EOL) f.write('ENV PATH="$HOME/venv/mlc/bin:$PATH"' + EOL) # f.write('RUN . /opt/venv/mlc/bin/activate' + EOL) - + f.write('ENV PATH="$PATH:$HOME/.local/bin"' + EOL) f.write(