Skip to content

Commit 7e54b55

Browse files
authored
Added libgl deps for imagenet preprocessing (#304)
* Added libgl deps for imagenet preprocessing
1 parent 826ec33 commit 7e54b55

File tree

5 files changed

+19
-2
lines changed

5 files changed

+19
-2
lines changed

script/app-mlperf-inference-mlcommons-python/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,6 +1252,7 @@ variations:
12521252
group: models
12531253
deps:
12541254
- tags: get,generic-python-lib,_opencv-python
1255+
- tags: get,generic-sys-util,_libgl
12551256
- tags: get,generic-python-lib,_numpy
12561257
names:
12571258
- numpy
@@ -1270,6 +1271,7 @@ variations:
12701271
MLC_MLPERF_USE_MLCOMMONS_RUN_SCRIPT: "yes"
12711272
deps:
12721273
- tags: get,generic-python-lib,_opencv-python
1274+
- tags: get,generic-sys-util,_libgl
12731275
- tags: get,generic-python-lib,_numpy
12741276
names:
12751277
- numpy

script/get-generic-sys-util/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def preprocess(i):
1111
state = i['state']
1212
automation = i['automation']
1313

14-
# Use VERSION_CMD and CHECK_CMD if no CHECK_CMD is set
14+
# Use VERSION_CMD as CHECK_CMD if no CHECK_CMD is set
1515
if env.get('MLC_SYS_UTIL_VERSION_CMD', '') != '' and env.get(
1616
'MLC_SYS_UTIL_CHECK_CMD', '') == '':
1717
env['MLC_SYS_UTIL_CHECK_CMD'] = env['MLC_SYS_UTIL_VERSION_CMD']

script/get-generic-sys-util/meta.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,21 @@ variations:
110110
brew: ''
111111
dnf: ''
112112
yum: ''
113+
114+
libgl:
115+
env:
116+
MLC_SYS_UTIL_NAME: libgl # tbd: regular expression for version as well as whether its installed?
117+
MLC_SYS_UTIL_CHECK_CMD: 'ldconfig -p | grep -i libgl.so.*'
118+
default_env:
119+
MLC_GENERIC_SYS_UTIL_IGNORE_MISSING_PACKAGE: yes
120+
new_env_keys:
121+
- MLC_LIBGL_VERSION
122+
state:
123+
libgl: # tbd: complete for other flavours of linux
124+
apt: libgl1
125+
brew: ''
126+
dnf: mesa-libGL
127+
yum: mesa-libGL
113128
libsm6:
114129
env:
115130
MLC_SYS_UTIL_NAME: libsm6 # tbd: regular expression for version as well as whether its installed?

script/get-preprocessed-dataset-imagenet/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ deps:
5151
MLC_IMAGENET_PREPROCESSED_PATH:
5252
- 'on'
5353
tags: mlperf,mlcommons,inference,source,src
54+
- tags: get,generic-sys-util,_libgl
5455
docker:
5556
run: false
5657
env:

script/get-sys-utils-cm/run-ubuntu.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ ${MLC_SUDO} ${MLC_APT_TOOL} update && \
5252
libgl1 \
5353
libjpeg9-dev \
5454
unzip \
55-
libgl1 \
5655
zlib1g-dev
5756

5857
# Install Python deps though preference is to install them

0 commit comments

Comments
 (0)