Remove vision packages from CI scripts (pytorch#125546)

cyyever · pytorchmergebot · commit f42ea14c3f79 · 2024-05-10T17:53:48.000Z
Because they were solely used by Caffe2. Pull Request resolved: pytorch#125546 Approved by: https://github.com/r-barnes, https://github.com/kit1980, https://github.com/albanD
diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
@@ -98,7 +98,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     KATEX=yes
     UCX_COMMIT=${_UCX_COMMIT}
     UCC_COMMIT=${_UCC_COMMIT}
@@ -112,7 +111,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     KATEX=yes
     UCX_COMMIT=${_UCX_COMMIT}
     UCC_COMMIT=${_UCC_COMMIT}
@@ -127,7 +125,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     KATEX=yes
     UCX_COMMIT=${_UCX_COMMIT}
     UCC_COMMIT=${_UCC_COMMIT}
@@ -141,7 +138,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     KATEX=yes
     UCX_COMMIT=${_UCX_COMMIT}
     UCC_COMMIT=${_UCC_COMMIT}
@@ -153,7 +149,6 @@ case "$image" in
     CLANG_VERSION=10
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     CONDA_CMAKE=yes
     ONNX=yes
     ;;
@@ -172,7 +167,6 @@ case "$image" in
     CLANG_VERSION=10
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     VULKAN_SDK_VERSION=1.2.162.1
     SWIFTSHADER=yes
     CONDA_CMAKE=yes
@@ -183,7 +177,6 @@ case "$image" in
     CLANG_VERSION=10
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     VULKAN_SDK_VERSION=1.2.162.1
     SWIFTSHADER=yes
     CONDA_CMAKE=yes
@@ -194,7 +187,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     CONDA_CMAKE=yes
     TRITON=yes
     ;;
@@ -203,7 +195,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     ROCM_VERSION=6.0
     NINJA_VERSION=1.9.0
     CONDA_CMAKE=yes
@@ -214,7 +205,6 @@ case "$image" in
     GCC_VERSION=9
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     ROCM_VERSION=6.1
     NINJA_VERSION=1.9.0
     CONDA_CMAKE=yes
@@ -225,7 +215,6 @@ case "$image" in
     GCC_VERSION=11
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     BASEKIT_VERSION=2024.0.0-49522
     NINJA_VERSION=1.9.0
     CONDA_CMAKE=yes
@@ -236,7 +225,6 @@ case "$image" in
     GCC_VERSION=11
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     KATEX=yes
     CONDA_CMAKE=yes
     TRITON=yes
@@ -250,30 +238,26 @@ case "$image" in
     CLANG_VERSION=12
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     TRITON=yes
     ;;
   pytorch-linux-jammy-py3-clang12-asan)
     ANACONDA_PYTHON_VERSION=3.9
     CLANG_VERSION=12
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     CONDA_CMAKE=yes
     TRITON=yes
     ;;
   pytorch-linux-jammy-py3-clang15-asan)
     ANACONDA_PYTHON_VERSION=3.10
     CLANG_VERSION=15
     CONDA_CMAKE=yes
-    VISION=yes
     ;;
   pytorch-linux-jammy-py3.8-gcc11)
     ANACONDA_PYTHON_VERSION=3.8
     GCC_VERSION=11
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     KATEX=yes
     CONDA_CMAKE=yes
     TRITON=yes
@@ -304,7 +288,6 @@ case "$image" in
     ACL=yes
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     CONDA_CMAKE=yes
     # snadampal: skipping sccache due to the following issue
     # https://github.com/pytorch/pytorch/issues/121559
@@ -317,7 +300,6 @@ case "$image" in
     # Catch-all for builds that are not hardcoded.
     PROTOBUF=yes
     DB=yes
-    VISION=yes
     echo "image '$image' did not match an existing build configuration"
     if [[ "$image" == *py* ]]; then
       extract_version_from_image_name py ANACONDA_PYTHON_VERSION
diff --git a/.ci/docker/centos-rocm/Dockerfile b/.ci/docker/centos-rocm/Dockerfile
@@ -62,13 +62,6 @@ RUN if [ -n "${DB}" ]; then bash ./install_db.sh; fi
 RUN rm install_db.sh
 ENV INSTALLED_DB ${DB}
 
-# (optional) Install vision packages like OpenCV and ffmpeg
-ARG VISION
-COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
-RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
-RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
-ENV INSTALLED_VISION ${VISION}
-
 # Install rocm
 ARG ROCM_VERSION
 COPY ./common/install_rocm.sh install_rocm.sh
diff --git a/.ci/docker/common/install_base.sh b/.ci/docker/common/install_base.sh
@@ -116,7 +116,6 @@ install_centos() {
     libstdc++-devel \
     libsndfile-devel \
     make \
-    opencv-devel \
     sudo \
     wget \
     vim \
diff --git a/.ci/docker/common/install_vision.sh b/.ci/docker/common/install_vision.sh
diff --git a/.ci/docker/ubuntu-cuda/Dockerfile b/.ci/docker/ubuntu-cuda/Dockerfile
@@ -56,13 +56,6 @@ RUN if [ -n "${DB}" ]; then bash ./install_db.sh; fi
 RUN rm install_db.sh
 ENV INSTALLED_DB ${DB}
 
-# (optional) Install vision packages like OpenCV and ffmpeg
-ARG VISION
-COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
-RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
-RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
-ENV INSTALLED_VISION ${VISION}
-
 # (optional) Install UCC
 ARG UCX_COMMIT
 ARG UCC_COMMIT
diff --git a/.ci/docker/ubuntu-rocm/Dockerfile b/.ci/docker/ubuntu-rocm/Dockerfile
@@ -53,13 +53,6 @@ RUN if [ -n "${DB}" ]; then bash ./install_db.sh; fi
 RUN rm install_db.sh
 ENV INSTALLED_DB ${DB}
 
-# (optional) Install vision packages like OpenCV and ffmpeg
-ARG VISION
-COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
-RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
-RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
-ENV INSTALLED_VISION ${VISION}
-
 # Install rocm
 ARG ROCM_VERSION
 COPY ./common/install_rocm.sh install_rocm.sh
diff --git a/.ci/docker/ubuntu-xpu/Dockerfile b/.ci/docker/ubuntu-xpu/Dockerfile
@@ -83,13 +83,6 @@ RUN if [ -n "${DB}" ]; then bash ./install_db.sh; fi
 RUN rm install_db.sh
 ENV INSTALLED_DB ${DB}
 
-# (optional) Install vision packages like OpenCV and ffmpeg
-ARG VISION
-COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
-RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
-RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
-ENV INSTALLED_VISION ${VISION}
-
 # (optional) Install non-default CMake version
 ARG CMAKE_VERSION
 COPY ./common/install_cmake.sh install_cmake.sh
diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile
@@ -73,20 +73,6 @@ RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
 RUN rm install_protobuf.sh
 ENV INSTALLED_PROTOBUF ${PROTOBUF}
 
-# (optional) Install database packages like LMDB and LevelDB
-ARG DB
-COPY ./common/install_db.sh install_db.sh
-RUN if [ -n "${DB}" ]; then bash ./install_db.sh; fi
-RUN rm install_db.sh
-ENV INSTALLED_DB ${DB}
-
-# (optional) Install vision packages like OpenCV and ffmpeg
-ARG VISION
-COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
-RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
-RUN rm install_vision.sh cache_vision_models.sh common_utils.sh
-ENV INSTALLED_VISION ${VISION}
-
 # (optional) Install Android NDK
 ARG ANDROID
 ARG ANDROID_NDK
diff --git a/.ci/pytorch/common_utils.sh b/.ci/pytorch/common_utils.sh
@@ -196,6 +196,7 @@ function checkout_install_torchdeploy() {
   pushd multipy
   git checkout "${commit}"
   python multipy/runtime/example/generate_examples.py
+  sudo apt-get update && sudo apt-get install -y liblzma-dev
   BUILD_CUDA_TESTS=1 pip install -e .
   popd
   popd
diff --git a/.ci/pytorch/test.sh b/.ci/pytorch/test.sh
@@ -1233,8 +1233,6 @@ elif [[ "${TEST_CONFIG}" == *torchbench* ]]; then
   install_torchtext
   install_torchvision
   id=$((SHARD_NUMBER-1))
-  # https://github.com/opencv/opencv-python/issues/885
-  pip_install opencv-python==4.8.0.74
   if [[ "${TEST_CONFIG}" == *inductor_torchbench_smoketest_perf* ]]; then
     checkout_install_torchbench hf_Bert hf_Albert nanogpt timm_vision_transformer
     PYTHONPATH=$(pwd)/torchbench test_inductor_torchbench_smoketest_perf
