diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile index ef2b15e66..1ab3850bd 100644 --- a/.circleci/docker/Dockerfile +++ b/.circleci/docker/Dockerfile @@ -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 ENV PATH /opt/conda/bin:$PATH -### install mim -RUN /opt/conda/bin/pip install openmim +### install mim, mmengine, mmcv +RUN /opt/conda/bin/pip install openmim &&\ + mim install mmengine &&\ + mim install 'mmcv>=2.0.0rc1' WORKDIR /workspace diff --git a/.circleci/test.yml b/.circleci/test.yml index e14e3b6fc..7b4dfec04 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -63,16 +63,12 @@ commands: command: | 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: - parameters: - version: - type: string - default: mmcv>=2.0.0rc1 steps: - run: - name: Install mmcv-full + name: Install mmcv command: | 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: description: "Install MMDeploy" steps: diff --git a/csrc/mmdeploy/codebase/mmocr/short_scale_aspect_jitter.cpp b/csrc/mmdeploy/codebase/mmocr/short_scale_aspect_jitter.cpp index 2f03c4ffd..866e2239e 100644 --- a/csrc/mmdeploy/codebase/mmocr/short_scale_aspect_jitter.cpp +++ b/csrc/mmdeploy/codebase/mmocr/short_scale_aspect_jitter.cpp @@ -78,8 +78,9 @@ class ShortScaleAspectJitterImpl : public Module { auto dst_width = static_cast(std::round(scale * img_shape[2])); dst_height = static_cast(std::ceil(1.0 * dst_height / scale_divisor) * scale_divisor); dst_width = static_cast(std::ceil(1.0 * dst_width / scale_divisor) * scale_divisor); - std::vector scale_factor = {1.0 * dst_width / img_shape[2], - 1.0 * dst_height / img_shape[1]}; + + std::vector 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); Value output = input;