"git@developer.sourcefind.cn:OpenDAS/vision.git" did not exist on "c5533a2c2b549f0e070e7e3e45396992f39e1388"
Unverified Commit 45002089 authored by Vasilis Vryniotis's avatar Vasilis Vryniotis Committed by GitHub
Browse files

Fix inconsistent version pinning across yaml files (#3790)

* Fix inconsistent version pinning across yaml files.

* Pin pillow to >=5.3.0

* Pin pillow>=5.3.0 everywhere
parent 48441cc5
...@@ -580,7 +580,7 @@ jobs: ...@@ -580,7 +580,7 @@ jobs:
fi fi
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION} conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION} conda activate python${PYTHON_VERSION}
conda install Pillow conda install Pillow>=5.3.0
conda install -v -y -c pytorch-nightly pytorch conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2) conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run: - run:
......
...@@ -580,7 +580,7 @@ jobs: ...@@ -580,7 +580,7 @@ jobs:
fi fi
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION} conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION} conda activate python${PYTHON_VERSION}
conda install Pillow conda install Pillow>=5.3.0
conda install -v -y -c pytorch-nightly pytorch conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2) conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run: - run:
......
...@@ -30,7 +30,7 @@ RUN conda create -y --name python3.7 python=3.7 ...@@ -30,7 +30,7 @@ RUN conda create -y --name python3.7 python=3.7
RUN conda create -y --name python3.8 python=3.8 RUN conda create -y --name python3.8 python=3.8
SHELL [ "/bin/bash", "-c" ] SHELL [ "/bin/bash", "-c" ]
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y Pillow RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y Pillow>=5.3.0
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y Pillow RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y Pillow>=5.3.0
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y Pillow RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.8 && conda install -y Pillow>=5.3.0
CMD [ "/bin/bash"] CMD [ "/bin/bash"]
...@@ -14,6 +14,6 @@ dependencies: ...@@ -14,6 +14,6 @@ dependencies:
- ca-certificates - ca-certificates
- pip: - pip:
- future - future
- pillow>=4.1.1 - pillow >=5.3.0
- scipy - scipy
- av - av
...@@ -29,7 +29,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD ...@@ -29,7 +29,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD
if [ $PYTHON_VERSION == "3.6" ]; then if [ $PYTHON_VERSION == "3.6" ]; then
printf "Installing minimal PILLOW version\n" printf "Installing minimal PILLOW version\n"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest # Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip install pillow==5.3.0 pip install pillow>=5.3.0
fi fi
printf "* Installing torchvision\n" printf "* Installing torchvision\n"
......
...@@ -14,7 +14,7 @@ dependencies: ...@@ -14,7 +14,7 @@ dependencies:
- ca-certificates - ca-certificates
- pip: - pip:
- future - future
- pillow>=4.1.1 - pillow >=5.3.0
- scipy - scipy
- av - av
- dataclasses - dataclasses
...@@ -31,7 +31,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD ...@@ -31,7 +31,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD
if [ $PYTHON_VERSION == "3.6" ]; then if [ $PYTHON_VERSION == "3.6" ]; then
printf "Installing minimal PILLOW version\n" printf "Installing minimal PILLOW version\n"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest # Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip install pillow==5.3.0 pip install pillow>=5.3.0
fi fi
printf "* Installing torchvision\n" printf "* Installing torchvision\n"
......
...@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint ...@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint
setup_conda_cudatoolkit_plain_constraint setup_conda_cudatoolkit_plain_constraint
if [[ "$OSTYPE" == "msys" ]]; then if [[ "$OSTYPE" == "msys" ]]; then
conda install -yq conda-build cmake pillow future conda install -yq conda-build cmake pillow>=5.3.0 future
pip install dataclasses pip install dataclasses
fi fi
......
...@@ -52,7 +52,7 @@ test: ...@@ -52,7 +52,7 @@ test:
requires: requires:
- pytest - pytest
- scipy - scipy
- av >=8.0.1 - av
# NOTE: Pinned to fix issues with size_t on Windows # NOTE: Pinned to fix issues with size_t on Windows
- jpeg <=9b - jpeg <=9b
- ca-certificates - ca-certificates
......
...@@ -704,7 +704,6 @@ class RandomPerspective(torch.nn.Module): ...@@ -704,7 +704,6 @@ class RandomPerspective(torch.nn.Module):
For backward compatibility integer values (e.g. ``PIL.Image.NEAREST``) are still acceptable. For backward compatibility integer values (e.g. ``PIL.Image.NEAREST``) are still acceptable.
fill (sequence or number): Pixel fill value for the area outside the transformed fill (sequence or number): Pixel fill value for the area outside the transformed
image. Default is ``0``. If given a number, the value is used for all bands respectively. image. Default is ``0``. If given a number, the value is used for all bands respectively.
If input is PIL Image, the options is only available for ``Pillow>=5.0.0``.
""" """
def __init__(self, distortion_scale=0.5, p=0.5, interpolation=InterpolationMode.BILINEAR, fill=0): def __init__(self, distortion_scale=0.5, p=0.5, interpolation=InterpolationMode.BILINEAR, fill=0):
...@@ -1216,7 +1215,6 @@ class RandomRotation(torch.nn.Module): ...@@ -1216,7 +1215,6 @@ class RandomRotation(torch.nn.Module):
Default is the center of the image. Default is the center of the image.
fill (sequence or number): Pixel fill value for the area outside the rotated fill (sequence or number): Pixel fill value for the area outside the rotated
image. Default is ``0``. If given a number, the value is used for all bands respectively. image. Default is ``0``. If given a number, the value is used for all bands respectively.
If input is PIL Image, the options is only available for ``Pillow>=5.2.0``.
resample (int, optional): deprecated argument and will be removed since v0.10.0. resample (int, optional): deprecated argument and will be removed since v0.10.0.
Please use the ``interpolation`` parameter instead. Please use the ``interpolation`` parameter instead.
...@@ -1327,7 +1325,6 @@ class RandomAffine(torch.nn.Module): ...@@ -1327,7 +1325,6 @@ class RandomAffine(torch.nn.Module):
For backward compatibility integer values (e.g. ``PIL.Image.NEAREST``) are still acceptable. For backward compatibility integer values (e.g. ``PIL.Image.NEAREST``) are still acceptable.
fill (sequence or number): Pixel fill value for the area outside the transformed fill (sequence or number): Pixel fill value for the area outside the transformed
image. Default is ``0``. If given a number, the value is used for all bands respectively. image. Default is ``0``. If given a number, the value is used for all bands respectively.
If input is PIL Image, the options is only available for ``Pillow>=5.0.0``.
fillcolor (sequence or number, optional): deprecated argument and will be removed since v0.10.0. fillcolor (sequence or number, optional): deprecated argument and will be removed since v0.10.0.
Please use the ``fill`` parameter instead. Please use the ``fill`` parameter instead.
resample (int, optional): deprecated argument and will be removed since v0.10.0. resample (int, optional): deprecated argument and will be removed since v0.10.0.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment