Skip to content

Commit cd96a8d

Browse files
authored
Fix GET_DEPENDENT_CACHED_PATH
* Handle --quiet for docker deps
1 parent a940f5e commit cd96a8d

File tree

7 files changed

+14
-4
lines changed

7 files changed

+14
-4
lines changed

.github/workflows/build_wheels.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
types: [published]
66
workflow_dispatch: {}
77

8+
89
jobs:
910
build_wheels:
1011
if: github.repository_owner == 'mlcommons'

automation/script/docker.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ def dockerfile(self_module, input_params):
3030
tag_values = input_params.get('tags', '').split(",")
3131
variation_tags = [tag[1:] for tag in tag_values if tag.startswith("_")]
3232

33+
if is_quiet_mode:
34+
env['MLC_QUIET'] = 'yes'
35+
3336
r = self_module._select_script(input_params)
3437
if r['return'] > 0:
3538
return r
@@ -251,6 +254,9 @@ def docker_run(self_module, i):
251254
logger = self_module.logger
252255
env = i.get('env', {})
253256

257+
if quiet:
258+
env['MLC_QUIET'] = 'yes'
259+
254260
regenerate_docker_file = not i.get('docker_noregenerate', False)
255261
rebuild_docker_image = i.get('docker_rebuild', False)
256262

script/get-oneapi/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def postprocess(i):
9797
env['MLC_ONEAPI_COMPILER_WITH_PATH'] = found_file_path
9898
env['MLC_ONEAPI_COMPILER_FLAG_VERSION'] = 'version'
9999

100-
env['MLC_DEPENDENT_CACHED_PATH'] = found_file_path
100+
env['MLC_GET_DEPENDENT_CACHED_PATH'] = found_file_path
101101

102102
list_keys = ['+LD_LIBRARY_PATH']
103103
for key in list_keys:

script/get-python3/customize.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,7 @@ def postprocess(i):
143143
env['MLC_PYTHON_MINOR_VERSION'] = python_minor_version
144144
env['MLC_PYTHON_PATCH_VERSION'] = python_patch_version
145145

146+
env['MLC_GET_DEPENDENT_CACHED_PATH'] = env['MLC_PYTHON_BIN_PATH']
147+
146148
return {'return': 0, 'version': version,
147149
'add_extra_cache_tags': add_extra_cache_tags}

script/install-gflags-from-src/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ def postprocess(i):
2323
env = i['env']
2424

2525
env['MLC_GFLAGS_BUILD_PATH'] = os.path.join(os.getcwd(), "gflags", "build")
26-
env['MLC_DEPENDENT_CACHED_PATH'] = env['MLC_GFLAGS_BUILD_PATH']
26+
env['MLC_GET_DEPENDENT_CACHED_PATH'] = env['MLC_GFLAGS_BUILD_PATH']
2727

2828
return {'return': 0}

script/install-ipex-from-src/customize.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def postprocess(i):
3636
"Release",
3737
"packages",
3838
"intel_extension_for_pytorch")
39-
env['MLC_DEPENDENT_CACHED_PATH'] = env['MLC_IPEX_INSTALLED_PATH']
39+
40+
env['MLC_GET_DEPENDENT_CACHED_PATH'] = env['MLC_IPEX_INSTALLED_PATH']
4041

4142
return {'return': 0}

script/install-opencv-from-src/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ def postprocess(i):
2323
env = i['env']
2424

2525
env['MLC_OPENCV_BUILD_PATH'] = os.path.join(os.getcwd(), "opencv", "build")
26-
env['MLC_DEPENDENT_CACHED_PATH'] = env['MLC_OPENCV_BUILD_PATH']
26+
env['MLC_GET_DEPENDENT_CACHED_PATH'] = env['MLC_OPENCV_BUILD_PATH']
2727

2828
return {'return': 0}

0 commit comments

Comments
 (0)