diff --git a/script/app-mlperf-inference-mlcommons-python/customize.py b/script/app-mlperf-inference-mlcommons-python/customize.py index 8144df6e7..80eb8ba57 100644 --- a/script/app-mlperf-inference-mlcommons-python/customize.py +++ b/script/app-mlperf-inference-mlcommons-python/customize.py @@ -537,7 +537,7 @@ def get_run_cmd_reference( cmd = env['MLC_PYTHON_BIN_WITH_PATH'] + " main.py " \ " --dataset waymo" + \ " --dataset-path " + env['MLC_DATASET_WAYMO_PATH'] + \ - " --lidar-path " + env['MLC_ML_MODEL_POINT_PILLARS_PATH'] + \ + " --lidar-path " + env['MLC_ML_MODEL_POINT_PAINTING_PATH'] + \ " --segmentor-path " + env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] + \ " --scenario " + env['MLC_MLPERF_LOADGEN_SCENARIO'] + \ " --output " + env['MLC_MLPERF_OUTPUT_DIR'] + \ diff --git a/script/app-mlperf-inference-mlcommons-python/meta.yaml b/script/app-mlperf-inference-mlcommons-python/meta.yaml index 2b6795b00..011e46b99 100644 --- a/script/app-mlperf-inference-mlcommons-python/meta.yaml +++ b/script/app-mlperf-inference-mlcommons-python/meta.yaml @@ -66,7 +66,7 @@ input_mapping: multistream_target_latency: MLC_MLPERF_LOADGEN_MULTISTREAM_TARGET_LATENCY network: MLC_NETWORK_LOADGEN sut_servers: MLC_NETWORK_LOADGEN_SUT_SERVERS - pointpillars_checkpoint_path: MLC_ML_MODEL_POINT_PILLARS_PATH + pointpainting_checkpoint_path: MLC_ML_MODEL_POINT_PAINTING_PATH deeplab_resnet50_path: MLC_ML_MODEL_DPLAB_RESNET50_PATH waymo_path: MLC_DATASET_WAYMO_PATH @@ -505,7 +505,7 @@ deps: - "yes" ## pointpainting - - tags: get,ml-model,pointpillars + - tags: get,ml-model,pointpainting names: - pointpillars-model enable_if_env: @@ -514,15 +514,6 @@ deps: skip_if_env: MLC_RUN_STATE_DOCKER: - "yes" - - tags: get,ml-model,resnet50-deeplab - enable_if_env: - MLC_MODEL: - - pointpainting - skip_if_env: - MLC_RUN_STATE_DOCKER: - - "yes" - names: - - resnet50-deeplab-model ######################################################################## # Install datasets diff --git a/script/app-mlperf-inference/meta.yaml b/script/app-mlperf-inference/meta.yaml index 7049671d7..867b5e6c8 100644 --- a/script/app-mlperf-inference/meta.yaml +++ b/script/app-mlperf-inference/meta.yaml @@ -846,18 +846,12 @@ variations: - 'yes' names: - waymo-dataset - - tags: get,ml-model,pointpillars + - tags: get,ml-model,pointpainting enable_if_env: MLC_USE_DATASET_FROM_HOST: - 'yes' names: - - pointpillars-model - - tags: get,ml-model,resnet50-deeplab - enable_if_env: - MLC_USE_DATASET_FROM_HOST: - - 'yes' - names: - - resnet50-deeplab-model + - pointpainting-model posthook_deps: - enable_if_env: MLC_MLPERF_LOADGEN_MODE: @@ -1956,7 +1950,7 @@ docker: - "${{ MLC_DATASET_IGBH_PATH }}:${{ MLC_DATASET_IGBH_PATH }}" - "${{ MLC_ML_MODEL_RGAT_CHECKPOINT_PATH }}:${{ MLC_ML_MODEL_RGAT_CHECKPOINT_PATH }}" - "${{ MLC_DATASET_WAYMO_PATH }}:${{ MLC_DATASET_WAYMO_PATH }}" - - "${{ MLC_ML_MODEL_POINT_PILLARS_PATH }}:${{ MLC_ML_MODEL_POINT_PILLARS_PATH }}" + - "${{ MLC_ML_MODEL_POINT_PAINTING_PATH }}:${{ MLC_ML_MODEL_POINT_PAINTING_PATH }}" - "${{ MLC_ML_MODEL_DPLAB_RESNET50_PATH }}:${{ MLC_ML_MODEL_DPLAB_RESNET50_PATH }}" skip_run_cmd: 'no' shm_size: '32gb' diff --git a/script/get-ml-model-pointpillars/COPYRIGHT.md b/script/get-ml-model-pointpainting/COPYRIGHT.md similarity index 100% rename from script/get-ml-model-pointpillars/COPYRIGHT.md rename to script/get-ml-model-pointpainting/COPYRIGHT.md diff --git a/script/get-ml-model-pointpainting/customize.py b/script/get-ml-model-pointpainting/customize.py new file mode 100644 index 000000000..07b18602d --- /dev/null +++ b/script/get-ml-model-pointpainting/customize.py @@ -0,0 +1,59 @@ +from mlc import utils +import os + + +def preprocess(i): + + os_info = i['os_info'] + + env = i['env'] + + if os_info['platform'] == "windows": + return {'return': 1, 'error': 'Script not supported in windows yet!'} + + if env.get('MLC_ML_MODEL_POINT_PAINTING_PATH', '') != '': + if not os.path.exists(env['MLC_ML_MODEL_POINT_PAINTING']): + return { + 'return': 1, 'error': f"Provided model path {env['MLC_ML_MODEL_POINT_PAINTING']} does not exist."} + + if env.get('MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') != '': + if not os.path.exists(env['MLC_ML_MODEL_DPLAB_RESNET50_PATH']): + return { + 'return': 1, 'error': f"Provided model path {env['MLC_ML_MODEL_DPLAB_RESNET50_PATH']} does not exist."} + + if env.get('MLC_ML_MODEL_POINT_PAINTING_PATH', '') == '' or env.get( + 'MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') == '': + env['MLC_TMP_REQUIRE_DOWNLOAD'] = "yes" + if env['MLC_DOWNLOAD_SRC'] == "mlcommons": + i['run_script_input']['script_name'] = 'run-rclone' + if env.get('MLC_OUTDIRNAME', '') != '': + env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'] = env['MLC_OUTDIRNAME'] + else: + env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'] = os.path.join( + os.getcwd(), "model") + + return {'return': 0} + + +def postprocess(i): + + env = i['env'] + + if env.get('MLC_ML_MODEL_POINT_PAINTING_PATH', '') == '': + if env['MLC_ML_MODEL_PP_FORMAT'] == "onnx": + env['MLC_ML_MODEL_POINT_PAINTING_PATH'] = os.path.join( + env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], "pp.onnx") + else: + env['MLC_ML_MODEL_POINT_PAINTING_PATH'] = os.path.join( + env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], "pp_ep36.pth") + + if env.get('MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') == '': + if env['MLC_ML_MODEL_DPLAB_RESNET50_FORMAT'] == "onnx": + env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] = os.path.join( + env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], "deeplabv3+.onnx") + else: + env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] = os.path.join( + env['MLC_ML_MODEL_POINT_PAINTING_TMP_PATH'], + "best_deeplabv3plus_resnet50_waymo_os16.pth") + + return {'return': 0} diff --git a/script/get-ml-model-pointpainting/meta.yaml b/script/get-ml-model-pointpainting/meta.yaml new file mode 100644 index 000000000..b811d58d6 --- /dev/null +++ b/script/get-ml-model-pointpainting/meta.yaml @@ -0,0 +1,45 @@ +alias: get-ml-model-pointpillars +automation_alias: script +automation_uid: 5b4e0237da074764 +cache: true +tags: +- get +- ml-model +- ml +- model +- pointpainting +uid: 3562621a8994411d +new_env_keys: + - MLC_ML_MODEL_POINT_PAINTING_PATH + - MLC_ML_MODEL_DPLAB_RESNET50_PATH +input_mapping: + pp_path: MLC_ML_MODEL_POINT_PAINTING_PATH + dp_resnet50_path: MLC_ML_MODEL_DPLAB_RESNET50_PATH +variations: + gpu: + default: true + group: device + env: + MLC_ML_MODEL_PP_FORMAT: pth + MLC_ML_MODEL_DPLAB_RESNET50_FORMAT: pth + cpu: + group: device + env: + MLC_ML_MODEL_PP_FORMAT: onnx + MLC_ML_MODEL_DPLAB_RESNET50_FORMAT: onnx + mlc: + group: download-src + default: true + prehook_deps: + - tags: get,rclone + enable_if_env: + MLC_TMP_REQUIRE_DOWNLOAD: + - yes + - tags: get,rclone-config,_waymo + force_cache: true + enable_if_env: + MLC_TMP_REQUIRE_DOWNLOAD: + - yes + env: + MLC_DOWNLOAD_SRC: mlcommons + diff --git a/script/get-ml-model-pointpainting/run-rclone.sh b/script/get-ml-model-pointpainting/run-rclone.sh new file mode 100644 index 000000000..9b76a1511 --- /dev/null +++ b/script/get-ml-model-pointpainting/run-rclone.sh @@ -0,0 +1,4 @@ +cmd="rclone sync mlc-waymo:waymo_preprocessed_dataset/model ${MLC_ML_MODEL_POINT_PAINTING_TMP_PATH} -P" +echo $cmd +eval $cmd +test $? -eq 0 || exit $? \ No newline at end of file diff --git a/script/get-ml-model-pointpillars/run.sh b/script/get-ml-model-pointpainting/run.sh similarity index 100% rename from script/get-ml-model-pointpillars/run.sh rename to script/get-ml-model-pointpainting/run.sh diff --git a/script/get-ml-model-pointpillars/customize.py b/script/get-ml-model-pointpillars/customize.py deleted file mode 100644 index b6685c889..000000000 --- a/script/get-ml-model-pointpillars/customize.py +++ /dev/null @@ -1,32 +0,0 @@ -from mlc import utils -import os - - -def preprocess(i): - - os_info = i['os_info'] - - env = i['env'] - - if os_info['platform'] == "windows": - return {'return': 1, 'error': 'Script not supported in windows yet!'} - - if env.get('MLC_ML_MODEL_POINT_PILLARS_PATH', '') == '': - return {'return': 1, 'error': 'Please provide path to pointpillars model using tag \\`--pp_path\\`as automatic download of this model is not supported yet.'} - - if os.path.isdir(env['MLC_ML_MODEL_POINT_PILLARS_PATH']): - if env['MLC_ML_MODEL_PP_FORMAT'] == "onnx": - env['MLC_ML_MODEL_POINT_PILLARS_PATH'] = os.path.join( - env['MLC_ML_MODEL_POINT_PILLARS_PATH'], "pp.onnx") - else: - env['MLC_ML_MODEL_POINT_PILLARS_PATH'] = os.path.join( - env['MLC_ML_MODEL_POINT_PILLARS_PATH'], "pp_ep36.pth") - - return {'return': 0} - - -def postprocess(i): - - env = i['env'] - - return {'return': 0} diff --git a/script/get-ml-model-pointpillars/meta.yaml b/script/get-ml-model-pointpillars/meta.yaml deleted file mode 100644 index 18470e4c0..000000000 --- a/script/get-ml-model-pointpillars/meta.yaml +++ /dev/null @@ -1,26 +0,0 @@ -alias: get-ml-model-pointpillars -automation_alias: script -automation_uid: 5b4e0237da074764 -cache: true -tags: -- get -- ml-model -- ml -- model -- pointpillars -uid: 3562621a8994411d -new_env_keys: - - MLC_ML_MODEL_POINT_PILLARS_PATH -input_mapping: - pp_path: MLC_ML_MODEL_POINT_PILLARS_PATH -variations: - gpu: - default: true - group: device - env: - MLC_ML_MODEL_PP_FORMAT: pth - cpu: - group: device - env: - MLC_ML_MODEL_PP_FORMAT: onnx - diff --git a/script/get-ml-model-resnet50-deeplab/COPYRIGHT.md b/script/get-ml-model-resnet50-deeplab/COPYRIGHT.md deleted file mode 100644 index d2ceead84..000000000 --- a/script/get-ml-model-resnet50-deeplab/COPYRIGHT.md +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright Notice - -© 2025-2026 MLCommons. All Rights Reserved. - -This file is licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the License. A copy of the License can be obtained at: - -[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) - -Unless required by applicable law or agreed to in writing, software distributed under the License is provided on an "AS IS" basis, without warranties or conditions of any kind, either express or implied. Please refer to the License for the specific language governing permissions and limitations under the License. diff --git a/script/get-ml-model-resnet50-deeplab/customize.py b/script/get-ml-model-resnet50-deeplab/customize.py deleted file mode 100644 index 0df3b1c3f..000000000 --- a/script/get-ml-model-resnet50-deeplab/customize.py +++ /dev/null @@ -1,33 +0,0 @@ -from mlc import utils -import os - - -def preprocess(i): - - os_info = i['os_info'] - - env = i['env'] - - if os_info['platform'] == "windows": - return {'return': 1, 'error': 'Script not supported in windows yet!'} - - if env.get('MLC_ML_MODEL_DPLAB_RESNET50_PATH', '') == '': - return {'return': 1, 'error': 'Please provide path to deeplab resnet 50 model using tag \\`--dp_resnet50_path\\`as automatic download of this dataset is not supported yet.'} - - if os.path.isdir(env['MLC_ML_MODEL_DPLAB_RESNET50_PATH']): - if env['MLC_ML_MODEL_DPLAB_RESNET50_FORMAT'] == "onnx": - env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] = os.path.join( - env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'], "deeplabv3+.onnx") - else: - env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'] = os.path.join( - env['MLC_ML_MODEL_DPLAB_RESNET50_PATH'], - "best_deeplabv3plus_resnet50_waymo_os16.pth") - - return {'return': 0} - - -def postprocess(i): - - env = i['env'] - - return {'return': 0} diff --git a/script/get-ml-model-resnet50-deeplab/meta.yaml b/script/get-ml-model-resnet50-deeplab/meta.yaml deleted file mode 100644 index c8c8b84e1..000000000 --- a/script/get-ml-model-resnet50-deeplab/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -alias: get-dataset-deeplab-resnet50 -automation_alias: script -automation_uid: 5b4e0237da074764 -cache: true -tags: -- get -- ml-model -- ml -- model -- resnet50-deeplab -- resnet50 -- deeplab -uid: 93097b691a6a4fce -new_env_keys: - - MLC_ML_MODEL_DPLAB_RESNET50_PATH -input_mapping: - dp_resnet50_path: MLC_ML_MODEL_DPLAB_RESNET50_PATH -variations: - gpu: - default: true - group: device - env: - MLC_ML_MODEL_DPLAB_RESNET50_FORMAT: pth - cpu: - group: device - env: - MLC_ML_MODEL_DPLAB_RESNET50_FORMAT: onnx diff --git a/script/get-ml-model-resnet50-deeplab/run.sh b/script/get-ml-model-resnet50-deeplab/run.sh deleted file mode 100644 index 3197bb8ad..000000000 --- a/script/get-ml-model-resnet50-deeplab/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -#CM Script location: ${MLC_TMP_CURRENT_SCRIPT_PATH} - -#To export any variable -#echo "VARIABLE_NAME=VARIABLE_VALUE" >>tmp-run-env.out - -#${MLC_PYTHON_BIN_WITH_PATH} contains the path to python binary if "get,python" is added as a dependency diff --git a/script/run-mlperf-inference-app/meta.yaml b/script/run-mlperf-inference-app/meta.yaml index cc8404fbd..1dc6ef242 100644 --- a/script/run-mlperf-inference-app/meta.yaml +++ b/script/run-mlperf-inference-app/meta.yaml @@ -119,7 +119,7 @@ input_mapping: use_dataset_from_host: MLC_USE_DATASET_FROM_HOST use_model_from_host: MLC_USE_MODEL_FROM_HOST rgat_checkpoint_path: RGAT_CHECKPOINT_PATH - pointpillars_checkpoint_path: MLC_ML_MODEL_POINT_PILLARS_PATH + pointpainting_checkpoint_path: MLC_ML_MODEL_POINT_PILLARS_PATH deeplab_resnet50_path: MLC_ML_MODEL_DPLAB_RESNET50_PATH waymo_path: MLC_DATASET_WAYMO_PATH nm_model_zoo_stub: MLC_MLPERF_NEURALMAGIC_MODEL_ZOO_STUB