[Fix]: fix requirements of mmedit ()

* update requirements

* use github url

* fix mmcls ut

* install clip explicitly
pull/1502/head
RunningLeon 2022-12-08 10:16:03 +08:00 committed by GitHub
parent 0200317319
commit 09c6bd75aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 11 deletions
.circleci
.github/workflows
mmdeploy/codebase/mmcls/models/classifiers

View File

@ -86,7 +86,7 @@ commands:
python -m mim install -r requirements/codebases.txt
python -m pip install -r requirements/tests.txt
python -m pip install -r requirements/runtime.txt
python -m pip install -U numpy
python -m pip install -U numpy clip
cd ..
perform_model_converter_ut:
steps:
@ -147,7 +147,7 @@ jobs:
docker exec mmdeploy mim install -r mmdeploy/requirements/codebases.txt
docker exec mmdeploy pip install -r mmdeploy/requirements/tests.txt
docker exec mmdeploy pip install -r mmdeploy/requirements/runtime.txt
docker exec mmdeploy pip install -U numpy
docker exec mmdeploy pip install -U numpy clip
- run:
name: Perform Model Converter unittests
command: |

View File

@ -48,7 +48,7 @@ jobs:
python -m pip install -r requirements.txt -r requirements/backends.txt
python -m mim install "mmcv>=2.0.0rc1"
python -m mim install -r requirements/codebases.txt
python -m pip install -U numpy
python -m pip install -U numpy clip
python -m pip list
- name: Build and install
run: |
@ -142,7 +142,7 @@ jobs:
python -m pip install -r requirements.txt -r requirements/backends.txt
python -m mim install "mmcv>=2.0.0rc1"
CFLAGS=$CFLAGS python -m mim install -r requirements/codebases.txt
python -m pip install -U pycuda numpy
python -m pip install -U pycuda numpy clip
python -m pip list
- name: Build and install
run: |
@ -190,7 +190,7 @@ jobs:
python -m pip install -r requirements.txt -r requirements/backends.txt
python -m mim install "mmcv>=2.0.0rc1"
python -m mim install -r requirements/codebases.txt
python -m pip install -U pycuda numpy
python -m pip install -U pycuda numpy clip
python -m pip list
- name: Build and install
run: |

View File

@ -30,6 +30,7 @@ def base_classifier__forward(
Returns:
return a list of :obj:`mmengine.BaseDataElement`.
"""
feats = self.extract_feat(batch_inputs)
output = self.head(feats)
output = self.extract_feat(batch_inputs)
if self.head is not None:
output = self.head(output)
return output

View File

@ -1,7 +1,7 @@
mmcls>=1.0.0rc2
mmdet @ git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
mmdet3d @ git+https://github.com/open-mmlab/mmdetection3d.git@dev-1.x
mmedit @ git+https://github.com/open-mmlab/mmediting.git@1.x
mmocr @ git+https://github.com/open-mmlab/mmocr.git@dev-1.x
mmdet>=3.0.0rc4
mmdet3d>=1.1.0rc2
mmedit>=1.0.0rc2
mmocr>=1.0.0rc4
mmpose>=1.0.0rc0
mmsegmentation>=1.0.0rc0

View File

@ -6,6 +6,7 @@ mmengine
multiprocess
numpy
onnx>=1.8.0
prettytable
protobuf<=3.20.1
six
terminaltables