mirrors/mmdeploy
1
0
Fork 0
mirror of https://github.com/open-mmlab/mmdeploy.git synced 2025-01-14 08:09:43 +08:00
Code Issues Projects Releases Wiki Activity

Dev 1.x cpp11 (#1086)

Browse Source 
* ocr/short_scale_aspect_jitter.cpp scale_factor double to float not working on c++11

* ocr/short_scale_aspect_jitter.cpp scale_factor double to float not working on c++11

* ocr/short_scale_aspect_jitter.cpp scale_factor double to float not working on c++11

add install mmengine in docker file

* 1. ocr/short_scale_aspect_jitter.cpp scale_factor double to float not working on c++11

2. add install mmgine in dockerfile

3. add install_mmengine in circleci

* fix mmengine typo
This commit is contained in:
Xin Li 2022-09-23 14:45:16 +08:00 committed by RunningLeon
parent 2f7e61c55c
commit 00a37df3de
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/docker/Dockerfile
View File

@ -26,8 +26,10 @@ RUN curl -fsSL -v -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Mini
RUN /opt/conda/bin/conda install pytorch==${TORCH_VERSION} torchvision==${TORCHVISION_VERSION} cudatoolkit=${CUDA} -c pytorch -c conda-forge RUN /opt/conda/bin/conda install pytorch==${TORCH_VERSION} torchvision==${TORCHVISION_VERSION} cudatoolkit=${CUDA} -c pytorch -c conda-forge
ENV PATH /opt/conda/bin:$PATH ENV PATH /opt/conda/bin:$PATH
### install mim ### install mim, mmengine, mmcv
RUN /opt/conda/bin/pip install openmim RUN /opt/conda/bin/pip install openmim &&\
mim install mmengine &&\
mim install 'mmcv>=2.0.0rc1'
WORKDIR /workspace WORKDIR /workspace

8
.circleci/test.yml
View File

@ -63,16 +63,12 @@ commands:
command: | command: |
python -m pip install torch==<< parameters.torch >>+<< parameters.platform >> torchvision==<< parameters.torchvision >>+<< parameters.platform >> -f https://download.pytorch.org/whl/torch_stable.html python -m pip install torch==<< parameters.torch >>+<< parameters.platform >> torchvision==<< parameters.torchvision >>+<< parameters.platform >> -f https://download.pytorch.org/whl/torch_stable.html
install_mmcv: install_mmcv:
parameters:
version:
type: string
default: mmcv>=2.0.0rc1
steps: steps:
- run: - run:
name: Install mmcv-full name: Install mmcv
command: | command: |
python -m pip install opencv-python==4.5.4.60 openmim python -m pip install opencv-python==4.5.4.60 openmim
mim install << parameters.version >> python -m mim install mmengine "mmcv>=2.0.0rc1"
install_mmdeploy: install_mmdeploy:
description: "Install MMDeploy" description: "Install MMDeploy"
steps: steps:

5
csrc/mmdeploy/codebase/mmocr/short_scale_aspect_jitter.cpp
View File

@ -78,8 +78,9 @@ class ShortScaleAspectJitterImpl : public Module {
auto dst_width = static_cast<int>(std::round(scale * img_shape[2])); auto dst_width = static_cast<int>(std::round(scale * img_shape[2]));
dst_height = static_cast<int>(std::ceil(1.0 * dst_height / scale_divisor) * scale_divisor); dst_height = static_cast<int>(std::ceil(1.0 * dst_height / scale_divisor) * scale_divisor);
dst_width = static_cast<int>(std::ceil(1.0 * dst_width / scale_divisor) * scale_divisor); dst_width = static_cast<int>(std::ceil(1.0 * dst_width / scale_divisor) * scale_divisor);
std::vector<float> scale_factor = {1.0 * dst_width / img_shape[2],
1.0 * dst_height / img_shape[1]}; std::vector<float> scale_factor = {(float) (1.0 * dst_width / img_shape[2]),
(float) (1.0 * dst_height / img_shape[1])};
img_resize = ResizeImage(img, dst_height, dst_width); img_resize = ResizeImage(img, dst_height, dst_width);
Value output = input; Value output = input;