Skip to content

Commit d7e33d7

Browse files
Refactored pointpainting model download script (#238)
* refactored pointpainting model download * [Automated Commit] Format Codebase [skip ci] --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent fd8269b commit d7e33d7

File tree

15 files changed

+115
-157
lines changed

15 files changed

+115
-157
lines changed

script/app-mlperf-inference-mlcommons-python/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ def get_run_cmd_reference(
537537
cmd = env['MLC_PYTHON_BIN_WITH_PATH'] + " main.py " \
538538
" --dataset waymo" + \
539539
" --dataset-path " + env['MLC_DATASET_WAYMO_PATH'] + \
540-
" --lidar-path " + env['MLC_ML_MODEL_POINT_PILLARS_PATH'] + \
540+
" --lidar-path " + env['MLC_ML_MODEL_POINT_PAINTING_PATH'] + \
541541
" --segmentor-path " + env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] + \
542542
" --scenario " + env['MLC_MLPERF_LOADGEN_SCENARIO'] + \
543543
" --output " + env['MLC_MLPERF_OUTPUT_DIR'] + \

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ input_mapping:
6666
multistream_target_latency: MLC_MLPERF_LOADGEN_MULTISTREAM_TARGET_LATENCY
6767
network: MLC_NETWORK_LOADGEN
6868
sut_servers: MLC_NETWORK_LOADGEN_SUT_SERVERS
69-
pointpillars_checkpoint_path: MLC_ML_MODEL_POINT_PILLARS_PATH
69+
pointpainting_checkpoint_path: MLC_ML_MODEL_POINT_PAINTING_PATH
7070
deeplab_resnet50_path: MLC_ML_MODEL_DPLAB_RESNET50_PATH
7171
waymo_path: MLC_DATASET_WAYMO_PATH
7272

@@ -505,7 +505,7 @@ deps:
505505
- "yes"
506506

507507
## pointpainting
508-
- tags: get,ml-model,pointpillars
508+
- tags: get,ml-model,pointpainting
509509
names:
510510
- pointpillars-model
511511
enable_if_env:
@@ -514,15 +514,6 @@ deps:
514514
skip_if_env:
515515
MLC_RUN_STATE_DOCKER:
516516
- "yes"
517-
- tags: get,ml-model,resnet50-deeplab
518-
enable_if_env:
519-
MLC_MODEL:
520-
- pointpainting
521-
skip_if_env:
522-
MLC_RUN_STATE_DOCKER:
523-
- "yes"
524-
names:
525-
- resnet50-deeplab-model
526517

527518
########################################################################
528519
# Install datasets

script/app-mlperf-inference/meta.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -846,18 +846,12 @@ variations:
846846
- 'yes'
847847
names:
848848
- waymo-dataset
849-
- tags: get,ml-model,pointpillars
849+
- tags: get,ml-model,pointpainting
850850
enable_if_env:
851851
MLC_USE_DATASET_FROM_HOST:
852852
- 'yes'
853853
names:
854-
- pointpillars-model
855-
- tags: get,ml-model,resnet50-deeplab
856-
enable_if_env:
857-
MLC_USE_DATASET_FROM_HOST:
858-
- 'yes'
859-
names:
860-
- resnet50-deeplab-model
854+
- pointpainting-model
861855
posthook_deps:
862856
- enable_if_env:
863857
MLC_MLPERF_LOADGEN_MODE:
@@ -1956,7 +1950,7 @@ docker:
19561950
- "${{ MLC_DATASET_IGBH_PATH }}:${{ MLC_DATASET_IGBH_PATH }}"
19571951
- "${{ MLC_ML_MODEL_RGAT_CHECKPOINT_PATH }}:${{ MLC_ML_MODEL_RGAT_CHECKPOINT_PATH }}"
19581952
- "${{ MLC_DATASET_WAYMO_PATH }}:${{ MLC_DATASET_WAYMO_PATH }}"
1959-
- "${{ MLC_ML_MODEL_POINT_PILLARS_PATH }}:${{ MLC_ML_MODEL_POINT_PILLARS_PATH }}"
1953+
- "${{ MLC_ML_MODEL_POINT_PAINTING_PATH }}:${{ MLC_ML_MODEL_POINT_PAINTING_PATH }}"
19601954
- "${{ MLC_ML_MODEL_DPLAB_RESNET50_PATH }}:${{ MLC_ML_MODEL_DPLAB_RESNET50_PATH }}"
19611955
skip_run_cmd: 'no'
19621956
shm_size: '32gb'
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
from mlc import utils
2+
import os
3+
4+
5+
def preprocess(i):
6+
7+
os_info = i['os_info']
8+
9+
env = i['env']
10+
11+
if os_info['platform'] == "windows":
12+
return {'return': 1, 'error': 'Script not supported in windows yet!'}
13+
14+
if env.get('MLC_ML_MODEL_POINT_PAINTING_PATH', '') != '':
15+
if not os.path.exists(env['MLC_ML_MODEL_POINT_PAINTING']):
16+
return {
17+
'return': 1, 'error': f"Provided model path {env['MLC_ML_MODEL_POINT_PAINTING']} does not exist."}
18+
19+
if env.get('MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') != '':
20+
if not os.path.exists(env['MLC_ML_MODEL_DPLAB_RESNET50_PATH']):
21+
return {
22+
'return': 1, 'error': f"Provided model path {env['MLC_ML_MODEL_DPLAB_RESNET50_PATH']} does not exist."}
23+
24+
if env.get('MLC_ML_MODEL_POINT_PAINTING_PATH', '') == '' or env.get(
25+
'MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') == '':
26+
env['MLC_TMP_REQUIRE_DOWNLOAD'] = "yes"
27+
if env['MLC_DOWNLOAD_SRC'] == "mlcommons":
28+
i['run_script_input']['script_name'] = 'run-rclone'
29+
if env.get('MLC_OUTDIRNAME', '') != '':
30+
env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'] = env['MLC_OUTDIRNAME']
31+
else:
32+
env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'] = os.path.join(
33+
os.getcwd(), "model")
34+
35+
return {'return': 0}
36+
37+
38+
def postprocess(i):
39+
40+
env = i['env']
41+
42+
if env.get('MLC_ML_MODEL_POINT_PAINTING_PATH', '') == '':
43+
if env['MLC_ML_MODEL_PP_FORMAT'] == "onnx":
44+
env['MLC_ML_MODEL_POINT_PAINTING_PATH'] = os.path.join(
45+
env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], "pp.onnx")
46+
else:
47+
env['MLC_ML_MODEL_POINT_PAINTING_PATH'] = os.path.join(
48+
env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], "pp_ep36.pth")
49+
50+
if env.get('MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') == '':
51+
if env['MLC_ML_MODEL_DPLAB_RESNET50_FORMAT'] == "onnx":
52+
env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] = os.path.join(
53+
env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], "deeplabv3+.onnx")
54+
else:
55+
env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] = os.path.join(
56+
env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'],
57+
"best_deeplabv3plus_resnet50_waymo_os16.pth")
58+
59+
return {'return': 0}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
alias: get-ml-model-pointpillars
2+
automation_alias: script
3+
automation_uid: 5b4e0237da074764
4+
cache: true
5+
tags:
6+
- get
7+
- ml-model
8+
- ml
9+
- model
10+
- pointpainting
11+
uid: 3562621a8994411d
12+
new_env_keys:
13+
- MLC_ML_MODEL_POINT_PAINTING_PATH
14+
- MLC_ML_MODEL_DPLAB_RESNET50_PATH
15+
input_mapping:
16+
pp_path: MLC_ML_MODEL_POINT_PAINTING_PATH
17+
dp_resnet50_path: MLC_ML_MODEL_DPLAB_RESNET50_PATH
18+
variations:
19+
gpu:
20+
default: true
21+
group: device
22+
env:
23+
MLC_ML_MODEL_PP_FORMAT: pth
24+
MLC_ML_MODEL_DPLAB_RESNET50_FORMAT: pth
25+
cpu:
26+
group: device
27+
env:
28+
MLC_ML_MODEL_PP_FORMAT: onnx
29+
MLC_ML_MODEL_DPLAB_RESNET50_FORMAT: onnx
30+
mlc:
31+
group: download-src
32+
default: true
33+
prehook_deps:
34+
- tags: get,rclone
35+
enable_if_env:
36+
MLC_TMP_REQUIRE_DOWNLOAD:
37+
- yes
38+
- tags: get,rclone-config,_waymo
39+
force_cache: true
40+
enable_if_env:
41+
MLC_TMP_REQUIRE_DOWNLOAD:
42+
- yes
43+
env:
44+
MLC_DOWNLOAD_SRC: mlcommons
45+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cmd="rclone sync mlc-waymo:waymo_preprocessed_dataset/model ${MLC_ML_MODEL_POINT_PAINTING_TMP_PATH} -P"
2+
echo $cmd
3+
eval $cmd
4+
test $? -eq 0 || exit $?

script/get-ml-model-pointpillars/customize.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

script/get-ml-model-pointpillars/meta.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)