Skip to content

Commit 840adcf

Browse files
authored
mmcls -> mmpretrain (#2003)
* mmcls -> mmpretrain * add constraints.txt * fix lint * fix lint * remove constraints.txt * fix windows ci * modify requirements * fix mdlink and mmpretrain version * fix dead link * modify codebase cmakelist * fix rename
1 parent bc79c0d commit 840adcf

File tree

121 files changed

+536
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+536
-520
lines changed

.github/scripts/linux/test_full_pipeline.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ mkdir -p $work_dir $mmdeploy_dir/data
1414

1515
model_cfg=$work_dir/resnet18_8xb32_in1k.py
1616
checkpoint=$work_dir/resnet18_8xb32_in1k_20210831-fbbb1da6.pth
17-
sdk_cfg=configs/mmcls/classification_sdk_dynamic.py
17+
sdk_cfg=configs/mmpretrain/classification_sdk_dynamic.py
1818
input_img=tests/data/tiger.jpeg
1919

20-
python3 -m mim download mmcls --config resnet18_8xb32_in1k --dest $work_dir
20+
python3 -m mim download mmpretrain --config resnet18_8xb32_in1k --dest $work_dir
2121

2222
if [ $backend == "ort" ]; then
23-
deploy_cfg=configs/mmcls/classification_onnxruntime_dynamic.py
23+
deploy_cfg=configs/mmpretrain/classification_onnxruntime_dynamic.py
2424
model=$work_dir/end2end.onnx
2525
elif [ $backend == "trt" ]; then
26-
deploy_cfg=configs/mmcls/classification_tensorrt-fp16_dynamic-224x224-224x224.py
26+
deploy_cfg=configs/mmpretrain/classification_tensorrt-fp16_dynamic-224x224-224x224.py
2727
model=$work_dir/end2end.engine
2828
elif [ $backend == "ncnn" ]; then
29-
deploy_cfg=configs/mmcls/classification_ncnn_static.py
29+
deploy_cfg=configs/mmpretrain/classification_ncnn_static.py
3030
model="$work_dir/end2end.param $work_dir/end2end.bin"
3131
else
3232
echo "Unsupported Backend=$backend"

.github/scripts/quantize_to_ncnn.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
[
1010
'hrnet.onnx',
1111
'https://media.githubusercontent.com/media/tpoisonooo/mmdeploy-onnx2ncnn-testdata/main/hrnet.onnx', # noqa: E501
12-
'~/mmclassification/configs/hrnet/hrnet-w18_4xb32_in1k.py',
12+
'~/mmpretrain/configs/hrnet/hrnet-w18_4xb32_in1k.py',
1313
],
1414
[
1515
'resnet18.onnx',
1616
'https://media.githubusercontent.com/media/tpoisonooo/mmdeploy-onnx2ncnn-testdata/main/resnet18.onnx', # noqa: E501
17-
'~/mmclassification/configs/resnet/resnet18_8xb16_cifar10.py',
17+
'~/mmpretrain/configs/resnet/resnet18_8xb16_cifar10.py',
1818
],
1919
[
2020
'mobilenet-v2.onnx',
2121
'https://media.githubusercontent.com/media/tpoisonooo/mmdeploy-onnx2ncnn-testdata/main/mobilenet-v2.onnx', # noqa: E501
22-
'~/mmclassification/configs/mobilenet_v2/mobilenet-v2_8xb32_in1k.py',
22+
'~/mmpretrain/configs/mobilenet_v2/mobilenet-v2_8xb32_in1k.py',
2323
]
2424
]
2525

@@ -45,7 +45,7 @@ def main():
4545
model = conf[0]
4646
os.system('wget {}'.format(conf[1]))
4747
model_cfg = conf[2]
48-
deploy_cfg = 'configs/mmcls/classification_ncnn-int8_static.py'
48+
deploy_cfg = 'configs/mmpretrain/classification_ncnn-int8_static.py'
4949
quant_cmd = [
5050
'python', 'tools/onnx2ncnn_quant_table.py', '--onnx', model,
5151
'--deploy-cfg', deploy_cfg, '--model-cfg', model_cfg, '--out-onnx',

.github/scripts/test_onnx2ncnn.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
# list of tuple: config, pretrained model, onnx filename
88
CONFIGS = [
99
(
10-
'mmclassification/configs/vision_transformer/vit-base-p32_ft-64xb64_in1k-384.py', # noqa: E501
10+
'mmpretrain/configs/vision_transformer/vit-base-p32_ft-64xb64_in1k-384.py', # noqa: E501
1111
'https://download.openmmlab.com/mmclassification/v0/vit/finetune/vit-base-p32_in21k-pre-3rdparty_ft-64xb64_in1k-384_20210928-9cea8599.pth', # noqa: E501
1212
'vit.onnx'),
1313
(
14-
'mmclassification/configs/resnet/resnet50_8xb32_in1k.py',
14+
'mmpretrain/configs/resnet/resnet50_8xb32_in1k.py',
1515
'https://download.openmmlab.com/mmclassification/v0/resnet/resnet50_8xb32_in1k_20210831-ea4938fc.pth', # noqa: E501
1616
'resnet50.onnx',
1717
),
1818
(
19-
'mmclassification/configs/resnet/resnet18_8xb32_in1k.py',
19+
'mmpretrain/configs/resnet/resnet18_8xb32_in1k.py',
2020
'https://download.openmmlab.com/mmclassification/v0/resnet/resnet18_8xb32_in1k_20210831-fbbb1da6.pth', # noqa: E501
2121
'resnet18.onnx',
2222
'https://media.githubusercontent.com/media/tpoisonooo/mmdeploy-onnx2ncnn-testdata/main/resnet18.onnx', # noqa: E501
2323
),
2424
(
25-
'mmclassification/configs/mobilenet_v2/mobilenet-v2_8xb32_in1k.py',
25+
'mmpretrain/configs/mobilenet_v2/mobilenet-v2_8xb32_in1k.py',
2626
'https://download.openmmlab.com/mmclassification/v0/mobilenet_v2/mobilenet_v2_batch256_imagenet_20200708-3b2dc3af.pth', # noqa: E501
2727
'mobilenet-v2.onnx',
2828
'https://media.githubusercontent.com/media/tpoisonooo/mmdeploy-onnx2ncnn-testdata/main/mobilenet-v2.onnx', # noqa: E501
@@ -36,7 +36,7 @@ def parse_args():
3636
parser.add_argument(
3737
'--run', type=bool, help='Execute mmdeploy_onnx2ncnn bin.')
3838
parser.add_argument(
39-
'--repo-dir', type=str, default='~/', help='mmcls directory.')
39+
'--repo-dir', type=str, default='~/', help='mmpretrain directory.')
4040
parser.add_argument(
4141
'--out',
4242
type=str,
@@ -56,7 +56,7 @@ def generate_onnx(args):
5656
model = conf[1]
5757
convert_cmd = [
5858
'python', 'tools/deploy.py',
59-
'configs/mmcls/classification_ncnn_static.py', config, model,
59+
'configs/mmpretrain/classification_ncnn_static.py', config, model,
6060
'cat-dog.png', '--work-dir', 'work_dir', '--device', 'cpu'
6161
]
6262
print(subprocess.call(convert_cmd))

.github/scripts/windows/test_full_pipeline.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ $work_dir="work_dir"
2323
New-Item -Path $work_dir, .\data -ItemType Directory -Force
2424
$model_cfg="$work_dir\resnet18_8xb32_in1k.py"
2525
$checkpoint="$work_dir\resnet18_8xb32_in1k_20210831-fbbb1da6.pth"
26-
$sdk_cfg="configs\mmcls\classification_sdk_dynamic.py"
26+
$sdk_cfg="configs\mmpretrain\classification_sdk_dynamic.py"
2727
$input_img="tests\data\tiger.jpeg"
2828

29-
python -m mim download mmcls --config resnet18_8xb32_in1k --dest $work_dir
29+
python -m mim download mmpretrain --config resnet18_8xb32_in1k --dest $work_dir
3030

3131
if ($Backend -eq "ort") {
32-
$deploy_cfg="configs\mmcls\classification_onnxruntime_dynamic.py"
32+
$deploy_cfg="configs\mmpretrain\classification_onnxruntime_dynamic.py"
3333
$model="$work_dir\end2end.onnx"
3434
} elseif ($Backend -eq "trt") {
35-
$deploy_cfg="configs\mmcls\classification_tensorrt-fp16_dynamic-224x224-224x224.py"
35+
$deploy_cfg="configs\mmpretrain\classification_tensorrt-fp16_dynamic-224x224-224x224.py"
3636
$model="$work_dir\end2end.engine"
3737
} else {
3838
Write-Host "Unsupported Backend=$Backend"

.github/workflows/backend-ort.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
python -m pip install mmcv-lite openmim
3838
python tools/scripts/build_ubuntu_x64_ort.py 8
3939
python -c 'import mmdeploy.apis.onnxruntime as ort_api; assert ort_api.is_available(with_custom_ops=True)'
40-
- name: test mmcls full pipeline
40+
- name: test mmpretrain full pipeline
4141
run: |
42-
python -m mim install $(cat requirements/codebases.txt | grep mmcls)
42+
python -m mim install $(cat requirements/codebases.txt | grep mmpretrain)
4343
export MMDEPLOY_DIR=$(pwd)
4444
export ONNXRUNTIME_DIR=$MMDEPLOY_DIR/../mmdeploy-dep/onnxruntime-linux-x64-1.8.1
4545
export LD_LIBRARY_PATH=$ONNXRUNTIME_DIR/lib:$MMDEPLOY_DIR/build/install/lib:$LD_LIBRARY_PATH

.github/workflows/backend-pplnn.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python3 -V
3434
python3 -m pip install openmim numpy
3535
python3 -m pip install -r requirements.txt
36-
python3 -m mim install $(cat requirements/codebases.txt | grep mmcls)
36+
python3 -m mim install $(cat requirements/codebases.txt | grep mmpretrain)
3737
python3 -m pip list
3838
- name: Build SDK
3939
run: |

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
python3 -m pip install opencv-python==4.5.4.60 opencv-python-headless==4.5.4.60 opencv-contrib-python==4.5.4.60
234234
python3 -m pip install openmim numpy pycuda clip transformers
235235
python3 -m pip install -r requirements.txt
236-
python3 -m mim install $(cat requirements/codebases.txt | grep mmcls)
236+
python3 -m mim install $(cat requirements/codebases.txt | grep mmpretrain)
237237
python3 -m pip list
238238
- name: Build SDK
239239
run: |
@@ -281,7 +281,7 @@ jobs:
281281
python -m pip install openmim
282282
python -m pip install -r requirements.txt
283283
python -m pip install -r requirements/backends.txt
284-
python -m mim install "mmcls>=1.0.0rc2"
284+
python -m mim install "mmpretrain>=1.0.0rc7"
285285
python -m pip list
286286
- name: Build mmdeploy
287287
run: |

.github/workflows/quantize.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
python -m pip install -r requirements.txt
4646
python -m pip install -U numpy
4747
48-
- name: Install mmcls
48+
- name: Install mmpretrain
4949
run: |
5050
python -m pip install openmim
51-
python -m mim install $(cat requirements/codebases.txt | grep mmcls)
52-
git clone --depth 1 --branch 1.x https://github.com/open-mmlab/mmclassification.git ~/mmclassification
53-
cd ~/mmclassification && python -m pip install . && cd -
51+
python -m mim install $(cat requirements/codebases.txt | grep mmpretrain)
52+
git clone --depth 1 --branch 1.x https://github.com/open-mmlab/mmpretrain.git ~/mmpretrain
53+
cd ~/mmpretrain && python -m pip install . && cd -
5454
- name: Install ppq
5555
run: |
5656
python -m pip install protobuf==3.20.0

README.md

+1-1

README_zh-CN.md

+5-5

configs/mmcls/classification_static.py

-3
This file was deleted.

configs/mmcls/classification_coreml_dynamic-224x224-224x224.py configs/mmpretrain/classification_coreml_dynamic-224x224-224x224.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
_base_ = ['../_base_/torchscript_config.py', '../_base_/backends/coreml.py']
22

3-
codebase_config = dict(type='mmcls', task='Classification')
3+
codebase_config = dict(type='mmpretrain', task='Classification')
44

55
backend_config = dict(model_inputs=[
66
dict(

configs/mmcls/classification_sdk_dynamic.py configs/mmpretrain/classification_sdk_dynamic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
backend_config = dict(
66
pipeline=[dict(type='LoadImageFromFile'),
7-
dict(type='PackClsInputs')])
7+
dict(type='PackInputs')])
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
_base_ = ['../_base_/onnx_config.py']
2+
3+
codebase_config = dict(type='mmpretrain', task='Classification')

configs/mmcls/classification_torchscript.py configs/mmpretrain/classification_torchscript.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
]
44

55
ir_config = dict(input_shape=None)
6-
codebase_config = dict(type='mmcls', task='Classification')
6+
codebase_config = dict(type='mmpretrain', task='Classification')

csrc/mmdeploy/codebase/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@ endif ()
1818

1919
foreach (codebase IN LISTS CODEBASES)
2020
message(STATUS "build codebase: ${codebase}")
21-
add_subdirectory(${codebase})
21+
if (codebase STREQUAL "mmpretrain")
22+
set(subdir_name "mmcls")
23+
else()
24+
set(subdir_name ${codebase})
25+
endif()
26+
add_subdirectory(${subdir_name})
2227
endforeach ()

docs/en/01-how-to-build/cmake_option.md

+2-2

docs/en/01-how-to-build/cross_build_ncnn_aarch64.md

+3-3

docs/en/01-how-to-build/riscv.md

+2-2

docs/en/01-how-to-build/rockchip.md

+6-6

docs/en/01-how-to-build/snpe.md

+5-5

0 commit comments

Comments
 (0)