[CI] Upgrade deps: opencv, expat

.github/workflows/continuous-integration.yml

@@ -20,7 +20,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     container:
-      image: alicevision/alicevision-deps:ci-2021-10-28-centos7-cuda10.2
+      image: alicevision/alicevision-deps:ci-2022-09-15-centos7-cuda11.3.1
     env:
       DEPS_INSTALL_DIR: /opt/AliceVision_install
       BUILD_TYPE: Release

CMakeLists.txt

@@ -277,6 +277,21 @@ set(EIGEN_CMAKE_FLAGS
     -DEigen_INCLUDE_DIR=${CMAKE_INSTALL_PREFIX}/include/eigen3
     )
 
+set(EXPAT_TARGET expat)
+ExternalProject_Add(${EXPAT_TARGET}
+       GIT_REPOSITORY https://github.com/libexpat/libexpat.git
+       GIT_TAG R_2_4_8
+       PREFIX ${BUILD_DIR}
+       BUILD_IN_SOURCE 0
+       BUILD_ALWAYS 0
+       UPDATE_COMMAND ""
+       SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/expat
+       BINARY_DIR ${BUILD_DIR}/libexpat_build
+       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+       CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DEXPAT_BUILD_DOCS:BOOL=OFF -DEXPAT_BUILD_EXAMPLES:BOOL=OFF -DEXPAT_BUILD_TOOLS:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>/expat
+       BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL}
+       )
+
 if(AV_BUILD_OPENGV)
 set(OPENGV_TARGET opengv)
 ExternalProject_Add(${OPENGV_TARGET}
@@ -716,7 +731,7 @@ ExternalProject_Add(${OPENCV_TARGET}
     -DWITH_CUDA=OFF
     -DWITH_OPENCL=OFF
     -DBUILD_TESTS=OFF
-    -DBUILD_LIST=core,improc,photo,objdetect,video,imgcodecs,videoio,features2d,xfeatures2d,version,mcc
+    -DBUILD_LIST=core,improc,photo,objdetect,video,imgcodecs,videoio,features2d,xfeatures2d,version,mcc,optflow
     <SOURCE_DIR>
   BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL}
 )
@@ -808,6 +823,7 @@ set(AV_DEPS
   ${CCTAG_TARGET}
   ${APRILTAG_TARGET}
   ${POPSIFT_TARGET}
+  ${EXPAT_TARGET}
 )
 
 if(AV_BUILD_ALICEVISION)

docker/Dockerfile_centos_deps

@@ -115,6 +115,7 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib64/libcublas.so
 # RUN make -j"$(nproc)" popsift
 # RUN make -j"$(nproc)" ffmpeg
 # RUN make -j"$(nproc)" opencv
+# RUN make -j"$(nproc)" expat
 
 RUN cmake --build . -j "$(nproc)" && \
     mv "${AV_INSTALL}/bin" "${AV_INSTALL}/bin-deps" && \

docker/build-centos.sh

@@ -8,7 +8,7 @@ test -e docker/fetch.sh || {
 }
 
 test -z "$AV_VERSION" && AV_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
-test -z "$CUDA_VERSION" && CUDA_VERSION=10.2
+test -z "$CUDA_VERSION" && CUDA_VERSION=11.3.1
 test -z "$CENTOS_VERSION" && CENTOS_VERSION=7
 
 echo "AV_VERSION: $AV_VERSION"

docker/build-ubuntu.sh

@@ -7,7 +7,7 @@ test -e docker/fetch.sh || {
 }
 
 test -z "$AV_VERSION" && AV_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
-test -z "$CUDA_VERSION" && CUDA_VERSION=11.0
+test -z "$CUDA_VERSION" && CUDA_VERSION=11.3.1
 test -z "$UBUNTU_VERSION" && UBUNTU_VERSION=20.04
 
 ./docker/fetch.sh