Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: skip tests for uninstalled codebases #987

Merged
merged 3 commits into from
Sep 3, 2022
Merged

Fix: skip tests for uninstalled codebases #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a95cd20
skip tests if codebase not installed
RunningLeon Sep 2, 2022
bb1cabd
skip ort run test
RunningLeon Sep 2, 2022
512fab4
fix mmseg
RunningLeon Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/regression/mmcls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ onnxruntime:

pipeline_ort_dynamic_fp32: &pipeline_ort_dynamic_fp32
convert_image: *convert_image
backend_test: *default_backend_test
sdk_config: *sdk_dynamic
backend_test: False
deploy_config: configs/mmcls/classification_onnxruntime_dynamic.py


Expand Down
8 changes: 4 additions & 4 deletions tests/regression/mmdet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ globals:
onnxruntime:
pipeline_ort_static_fp32: &pipeline_ort_static_fp32
convert_image: *convert_image
backend_test: *default_backend_test
sdk_config: *sdk_dynamic
backend_test: False
deploy_config: configs/mmdet/detection/detection_onnxruntime_static.py

pipeline_ort_dynamic_fp32: &pipeline_ort_dynamic_fp32
Expand Down Expand Up @@ -168,13 +167,13 @@ pplnn:
torchscript:
pipeline_ts_fp32: &pipeline_ts_fp32
convert_image: *convert_image
backend_test: False
backend_test: *default_backend_test
deploy_config: configs/mmdet/detection/detection_torchscript.py

# ============= seg ================
pipeline_seg_ts_fp32: &pipeline_seg_ts_fp32
convert_image: *convert_image
backend_test: False
backend_test: *default_backend_test
deploy_config: configs/mmdet/instance-seg/instance-seg_torchscript.py

models:
Expand Down Expand Up @@ -206,6 +205,7 @@ models:
- deploy_config: configs/mmdet/detection/detection_tensorrt-fp16_dynamic-300x300-512x512.py
convert_image: *convert_image
backend_test: *default_backend_test
sdk_config: *sdk_dynamic
- deploy_config: configs/mmdet/detection/single-stage_ncnn_static-300x300.py
convert_image: *convert_image
backend_test: False
Expand Down
2 changes: 0 additions & 2 deletions tests/regression/mmedit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ globals:
onnxruntime:
pipeline_ort_static_fp32: &pipeline_ort_static_fp32
convert_image: *convert_image
backend_test: *default_backend_test
sdk_config: *sdk_dynamic
deploy_config: configs/mmedit/super-resolution/super-resolution_onnxruntime_static.py

pipeline_ort_dynamic_fp32: &pipeline_ort_dynamic_fp32
Expand Down
2 changes: 0 additions & 2 deletions tests/regression/mmocr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ onnxruntime:
# ======= detection =======
pipeline_ort_detection_static_fp32: &pipeline_ort_detection_static_fp32
convert_image: *convert_image_det
backend_test: *default_backend_test
sdk_config: *sdk_detection_dynamic
deploy_config: configs/mmocr/text-detection/text-detection_onnxruntime_static.py

pipeline_ort_detection_dynamic_fp32: &pipeline_ort_detection_dynamic_fp32
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/mmrotate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ globals:
convert_image_det: &convert_image_det
input_img: *img_demo
test_img: *img_dota_demo
backend_test: &default_backend_test True
backend_test: &default_backend_test False

onnxruntime:
# ======= detection =======
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmcls/test_classification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
from mmdeploy.utils import Codebase, load_config
from mmdeploy.utils.test import DummyModel, SwitchBackendWrapper

import_codebase(Codebase.MMCLS)
try:
import_codebase(Codebase.MMCLS)
except ImportError:
pytest.skip(f'{Codebase.MMCLS} is not installed.', allow_module_level=True)

model_cfg_path = 'tests/test_codebase/test_mmcls/data/model.py'
model_cfg = load_config(model_cfg_path)[0]
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmcls/test_classification_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
NUM_CLASS = 1000
IMAGE_SIZE = 64

import_codebase(Codebase.MMCLS)
try:
import_codebase(Codebase.MMCLS)
except ImportError:
pytest.skip(f'{Codebase.MMCLS} is not installed.', allow_module_level=True)


@backend_checker(Backend.ONNXRUNTIME)
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmcls/test_mmcls_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
from mmdeploy.utils import Backend, Codebase
from mmdeploy.utils.test import WrapModel, check_backend, get_rewrite_outputs

import_codebase(Codebase.MMCLS)
try:
import_codebase(Codebase.MMCLS)
except ImportError:
pytest.skip(f'{Codebase.MMCLS} is not installed.', allow_module_level=True)

input = torch.rand(1)

Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmdet/test_mmdet_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
check_backend, get_onnx_model,
get_rewrite_outputs)

import_codebase(Codebase.MMDET)
try:
import_codebase(Codebase.MMDET)
except ImportError:
pytest.skip(f'{Codebase.MMDET} is not installed.', allow_module_level=True)


@backend_checker(Backend.TENSORRT)
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmdet/test_mmdet_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
from mmdeploy.utils.test import (WrapModel, check_backend, get_model_outputs,
get_rewrite_outputs)

import_codebase(Codebase.MMDET)
try:
import_codebase(Codebase.MMDET)
except ImportError:
pytest.skip(f'{Codebase.MMDET} is not installed.', allow_module_level=True)


def seed_everything(seed=1029):
Expand Down
6 changes: 5 additions & 1 deletion tests/test_codebase/test_mmdet/test_mmdet_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) OpenMMLab. All rights reserved.
import mmcv
import numpy as np
import pytest
import torch

from mmdeploy.codebase import import_codebase
Expand All @@ -9,7 +10,10 @@
pad_with_value_if_necessary)
from mmdeploy.utils import Codebase

import_codebase(Codebase.MMDET)
try:
import_codebase(Codebase.MMDET)
except ImportError:
pytest.skip(f'{Codebase.MMDET} is not installed.', allow_module_level=True)


def test_clip_bboxes():
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmdet/test_object_detection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
from mmdeploy.utils import Codebase, load_config
from mmdeploy.utils.test import DummyModel, SwitchBackendWrapper

import_codebase(Codebase.MMDET)
try:
import_codebase(Codebase.MMDET)
except ImportError:
pytest.skip(f'{Codebase.MMDET} is not installed.', allow_module_level=True)

model_cfg_path = 'tests/test_codebase/test_mmdet/data/model.py'
model_cfg = load_config(model_cfg_path)[0]
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmdet/test_object_detection_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
from mmdeploy.utils import Backend, Codebase
from mmdeploy.utils.test import SwitchBackendWrapper, backend_checker

import_codebase(Codebase.MMDET)
try:
import_codebase(Codebase.MMDET)
except ImportError:
pytest.skip(f'{Codebase.MMDET} is not installed.', allow_module_level=True)


def assert_det_results(results, module_name: str = 'model'):
Expand Down
9 changes: 7 additions & 2 deletions tests/test_codebase/test_mmedit/test_mmedit_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@

import mmcv
import onnx
import pytest
import torch
from mmedit.models.backbones.sr_backbones import SRCNN

from mmdeploy.codebase import import_codebase
from mmdeploy.core import RewriterContext
from mmdeploy.utils import Backend, Codebase, get_onnx_config

import_codebase(Codebase.MMEDIT)
try:
import_codebase(Codebase.MMEDIT)
except ImportError:
pytest.skip(
f'{Codebase.MMEDIT} is not installed.', allow_module_level=True)

img = torch.rand(1, 3, 4, 4)
model_file = tempfile.NamedTemporaryFile(suffix='.onnx').name
Expand Down Expand Up @@ -46,6 +50,7 @@


def test_srcnn():
from mmedit.models.backbones.sr_backbones import SRCNN
pytorch_model = SRCNN()
model_inputs = {'x': img}

Expand Down
6 changes: 5 additions & 1 deletion tests/test_codebase/test_mmedit/test_super_resolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
from mmdeploy.utils import Codebase, load_config
from mmdeploy.utils.test import SwitchBackendWrapper

import_codebase(Codebase.MMEDIT)
try:
import_codebase(Codebase.MMEDIT)
except ImportError:
pytest.skip(
f'{Codebase.MMEDIT} is not installed.', allow_module_level=True)

model_cfg = 'tests/test_codebase/test_mmedit/data/model.py'
model_cfg = load_config(model_cfg)[0]
Expand Down
7 changes: 6 additions & 1 deletion tests/test_codebase/test_mmedit/test_super_resolution_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
# Copyright (c) OpenMMLab. All rights reserved.
import mmcv
import numpy as np
import pytest
import torch

import mmdeploy.backend.onnxruntime as ort_apis
from mmdeploy.codebase import import_codebase
from mmdeploy.utils import Backend, Codebase, load_config
from mmdeploy.utils.test import SwitchBackendWrapper, backend_checker

import_codebase(Codebase.MMEDIT)
try:
import_codebase(Codebase.MMEDIT)
except ImportError:
pytest.skip(
f'{Codebase.MMEDIT} is not installed.', allow_module_level=True)


@backend_checker(Backend.ONNXRUNTIME)
Expand Down
8 changes: 6 additions & 2 deletions tests/test_codebase/test_mmocr/test_mmocr_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@
import numpy as np
import pytest
import torch
from mmocr.models.textdet.necks import FPNC

from mmdeploy.codebase import import_codebase
from mmdeploy.core import RewriterContext, patch_model
from mmdeploy.utils import Backend, Codebase
from mmdeploy.utils.test import (WrapModel, check_backend, get_model_outputs,
get_rewrite_outputs)

import_codebase(Codebase.MMOCR)
try:
import_codebase(Codebase.MMOCR)
except ImportError:
pytest.skip(f'{Codebase.MMOCR} is not installed.', allow_module_level=True)

from mmocr.models.textdet.necks import FPNC


class FPNCNeckModel(FPNC):
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmocr/test_text_detection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
from mmdeploy.utils import Codebase, load_config
from mmdeploy.utils.test import DummyModel, SwitchBackendWrapper

import_codebase(Codebase.MMOCR)
try:
import_codebase(Codebase.MMOCR)
except ImportError:
pytest.skip(f'{Codebase.MMOCR} is not installed.', allow_module_level=True)

model_cfg_path = 'tests/test_codebase/test_mmocr/data/dbnet.py'
model_cfg = load_config(model_cfg_path)[0]
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmocr/test_text_detection_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
from mmdeploy.utils import Backend, Codebase, load_config
from mmdeploy.utils.test import SwitchBackendWrapper, backend_checker

import_codebase(Codebase.MMOCR)
try:
import_codebase(Codebase.MMOCR)
except ImportError:
pytest.skip(f'{Codebase.MMOCR} is not installed.', allow_module_level=True)

IMAGE_SIZE = 32

Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmocr/test_text_recognition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
from mmdeploy.utils import Codebase, load_config
from mmdeploy.utils.test import DummyModel, SwitchBackendWrapper

import_codebase(Codebase.MMOCR)
try:
import_codebase(Codebase.MMOCR)
except ImportError:
pytest.skip(f'{Codebase.MMOCR} is not installed.', allow_module_level=True)

model_cfg_path = 'tests/test_codebase/test_mmocr/data/crnn.py'
model_cfg = load_config(model_cfg_path)[0]
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmocr/test_text_recognition_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
from mmdeploy.utils import Backend, Codebase, load_config
from mmdeploy.utils.test import SwitchBackendWrapper, backend_checker

import_codebase(Codebase.MMOCR)
try:
import_codebase(Codebase.MMOCR)
except ImportError:
pytest.skip(f'{Codebase.MMOCR} is not installed.', allow_module_level=True)

IMAGE_SIZE = 32

Expand Down
10 changes: 7 additions & 3 deletions tests/test_codebase/test_mmseg/test_mmseg_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@
import torch
import torch.nn as nn
from mmcv import ConfigDict
from mmseg.models import BACKBONES, HEADS
from mmseg.models.decode_heads.decode_head import BaseDecodeHead

from mmdeploy.codebase import import_codebase
from mmdeploy.utils import Backend, Codebase, Task
from mmdeploy.utils.test import (WrapModel, check_backend, get_model_outputs,
get_rewrite_outputs)

import_codebase(Codebase.MMSEG)
try:
import_codebase(Codebase.MMSEG)
except ImportError:
pytest.skip(f'{Codebase.MMSEG} is not installed.', allow_module_level=True)

from mmseg.models import BACKBONES, HEADS
from mmseg.models.decode_heads.decode_head import BaseDecodeHead


@BACKBONES.register_module()
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmseg/test_segmentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
from mmdeploy.utils import Codebase, load_config
from mmdeploy.utils.test import DummyModel, SwitchBackendWrapper

import_codebase(Codebase.MMSEG)
try:
import_codebase(Codebase.MMSEG)
except ImportError:
pytest.skip(f'{Codebase.MMSEG} is not installed.', allow_module_level=True)

model_cfg_path = 'tests/test_codebase/test_mmseg/data/model.py'
model_cfg = load_config(model_cfg_path)[0]
Expand Down
5 changes: 4 additions & 1 deletion tests/test_codebase/test_mmseg/test_segmentation_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
from mmdeploy.utils import Backend, Codebase
from mmdeploy.utils.test import SwitchBackendWrapper, backend_checker

import_codebase(Codebase.MMSEG)
try:
import_codebase(Codebase.MMSEG)
except ImportError:
pytest.skip(f'{Codebase.MMSEG} is not installed.', allow_module_level=True)

NUM_CLASS = 19
IMAGE_SIZE = 32
Expand Down