diff --git a/script/app-mlperf-inference-mlcommons-python/meta.yaml b/script/app-mlperf-inference-mlcommons-python/meta.yaml index 720d59514..fe7793e2d 100644 --- a/script/app-mlperf-inference-mlcommons-python/meta.yaml +++ b/script/app-mlperf-inference-mlcommons-python/meta.yaml @@ -1252,6 +1252,7 @@ variations: group: models deps: - tags: get,generic-python-lib,_opencv-python + - tags: get,generic-sys-util,_libgl - tags: get,generic-python-lib,_numpy names: - numpy @@ -1270,6 +1271,7 @@ variations: MLC_MLPERF_USE_MLCOMMONS_RUN_SCRIPT: "yes" deps: - tags: get,generic-python-lib,_opencv-python + - tags: get,generic-sys-util,_libgl - tags: get,generic-python-lib,_numpy names: - numpy diff --git a/script/get-generic-sys-util/customize.py b/script/get-generic-sys-util/customize.py index 74b8c75b6..0efd666bf 100644 --- a/script/get-generic-sys-util/customize.py +++ b/script/get-generic-sys-util/customize.py @@ -11,7 +11,7 @@ def preprocess(i): state = i['state'] automation = i['automation'] - # Use VERSION_CMD and CHECK_CMD if no CHECK_CMD is set + # Use VERSION_CMD as CHECK_CMD if no CHECK_CMD is set if env.get('MLC_SYS_UTIL_VERSION_CMD', '') != '' and env.get( 'MLC_SYS_UTIL_CHECK_CMD', '') == '': env['MLC_SYS_UTIL_CHECK_CMD'] = env['MLC_SYS_UTIL_VERSION_CMD'] diff --git a/script/get-generic-sys-util/meta.yaml b/script/get-generic-sys-util/meta.yaml index 41ed35745..cc278c21f 100644 --- a/script/get-generic-sys-util/meta.yaml +++ b/script/get-generic-sys-util/meta.yaml @@ -110,6 +110,21 @@ variations: brew: '' dnf: '' yum: '' + + libgl: + env: + MLC_SYS_UTIL_NAME: libgl # tbd: regular expression for version as well as whether its installed? + MLC_SYS_UTIL_CHECK_CMD: 'ldconfig -p | grep -i libgl.so.*' + default_env: + MLC_GENERIC_SYS_UTIL_IGNORE_MISSING_PACKAGE: yes + new_env_keys: + - MLC_LIBGL_VERSION + state: + libgl: # tbd: complete for other flavours of linux + apt: libgl1 + brew: '' + dnf: mesa-libGL + yum: mesa-libGL libsm6: env: MLC_SYS_UTIL_NAME: libsm6 # tbd: regular expression for version as well as whether its installed? diff --git a/script/get-preprocessed-dataset-imagenet/meta.yaml b/script/get-preprocessed-dataset-imagenet/meta.yaml index eea817b2f..124f73572 100644 --- a/script/get-preprocessed-dataset-imagenet/meta.yaml +++ b/script/get-preprocessed-dataset-imagenet/meta.yaml @@ -51,6 +51,7 @@ deps: MLC_IMAGENET_PREPROCESSED_PATH: - 'on' tags: mlperf,mlcommons,inference,source,src +- tags: get,generic-sys-util,_libgl docker: run: false env: diff --git a/script/get-sys-utils-cm/run-ubuntu.sh b/script/get-sys-utils-cm/run-ubuntu.sh index df0328c40..df10e4ef3 100644 --- a/script/get-sys-utils-cm/run-ubuntu.sh +++ b/script/get-sys-utils-cm/run-ubuntu.sh @@ -52,7 +52,6 @@ ${MLC_SUDO} ${MLC_APT_TOOL} update && \ libgl1 \ libjpeg9-dev \ unzip \ - libgl1 \ zlib1g-dev # Install Python deps though preference is to install them