Skip to content

Added libgl deps for imagenet preprocessing #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions script/app-mlperf-inference-mlcommons-python/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/get-generic-sys-util/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
15 changes: 15 additions & 0 deletions script/get-generic-sys-util/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
1 change: 1 addition & 0 deletions script/get-preprocessed-dataset-imagenet/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion script/get-sys-utils-cm/run-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading