File tree Expand file tree Collapse file tree 6 files changed +8
-8
lines changed
Expand file tree Collapse file tree 6 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 2222 build-linux :
2323 runs-on : ubuntu-latest
2424 container :
25- image : alicevision/alicevision-deps:2024.08.28 -centos7-cuda11.3.1
25+ image : alicevision/alicevision-deps:2024.10.22 -centos7-cuda11.3.1
2626 env :
2727 DEPS_INSTALL_DIR : /opt/AliceVision_install
2828 BUILD_TYPE : Release
6464 -DCeres_DIR:PATH="${DEPS_INSTALL_DIR}/share/Ceres" \
6565 -DEIGEN_INCLUDE_DIR_HINTS:PATH="${DEPS_INSTALL_DIR}" \
6666 -DAlembic_DIR:PATH="${DEPS_INSTALL_DIR}/lib/cmake/Alembic" \
67- -DSWIG_DIR:PATH="${DEPS_INSTALL_DIR}/share/swig/4.2 .0" \
67+ -DSWIG_DIR:PATH="${DEPS_INSTALL_DIR}/share/swig/4.3 .0" \
6868 -DSWIG_EXECUTABLE:PATH="${DEPS_INSTALL_DIR}/bin-deps/swig"
6969
7070 - name : Build
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
3737 -DALICEVISION_BUNDLE_PREFIX="${AV_BUNDLE}" \
3838 -DALICEVISION_USE_ALEMBIC=ON -DMINIGLOG=ON -DALICEVISION_USE_CCTAG=ON -DALICEVISION_USE_APRILTAG=ON -DALICEVISION_USE_OPENCV=ON -DALICEVISION_USE_OPENGV=ON \
3939 -DALICEVISION_USE_POPSIFT=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_ONNX_GPU=OFF -DALICEVISION_BUILD_DOC=OFF \
40- -DSWIG_DIR="${AV_INSTALL}/share/swig/4.2 .0" -DSWIG_EXECUTABLE="${AV_INSTALL}/bin-deps/swig" \
40+ -DSWIG_DIR="${AV_INSTALL}/share/swig/4.3 .0" -DSWIG_EXECUTABLE="${AV_INSTALL}/bin-deps/swig" \
4141 "${AV_DEV}" || (cat "${AV_BUILD}/CMakeFiles/CMakeOutput.log" "${AV_BUILD}/CMakeFiles/CMakeError.log" && false)
4242
4343RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
5858 -DALICEVISION_USE_ONNX_GPU:BOOL=OFF \
5959 -DALICEVISION_BUILD_DOC:BOOL=OFF \
6060 -DALICEVISION_BUILD_SWIG_BINDING:BOOL=ON \
61- -DSWIG_DIR:PATH="${AV_INSTALL}/share/swig/4.2 .0" -DSWIG_EXECUTABLE:PATH="${AV_INSTALL}/bin-deps/swig" \
61+ -DSWIG_DIR:PATH="${AV_INSTALL}/share/swig/4.3 .0" -DSWIG_EXECUTABLE:PATH="${AV_INSTALL}/bin-deps/swig" \
6262 "${AV_DEV}" && \
6363 make install -j${CPU_CORES} && \
6464 make bundle && \
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ test -e docker/fetch.sh || {
77 exit 1
88}
99
10- test -z " $AV_DEPS_VERSION " && AV_DEPS_VERSION=2024.08.28
10+ test -z " $AV_DEPS_VERSION " && AV_DEPS_VERSION=2024.10.22
1111test -z " $AV_VERSION " && AV_VERSION=" $( git rev-parse --abbrev-ref HEAD) -$( git rev-parse --short HEAD) "
1212test -z " $CUDA_VERSION " && CUDA_VERSION=11.3.1
1313test -z " $CENTOS_VERSION " && CENTOS_VERSION=7
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ test -e docker/fetch.sh || {
66 exit 1
77}
88
9- test -z " $AV_DEPS_VERSION " && AV_DEPS_VERSION=2024.08.28
9+ test -z " $AV_DEPS_VERSION " && AV_DEPS_VERSION=2024.10.22
1010test -z " $AV_VERSION " && AV_VERSION=" $( git rev-parse --abbrev-ref HEAD) -$( git rev-parse --short HEAD) "
1111test -z " $CUDA_VERSION " && CUDA_VERSION=11.3.1
1212test -z " $UBUNTU_VERSION " && UBUNTU_VERSION=20.04
Original file line number Diff line number Diff line change @@ -1291,7 +1291,7 @@ if(AV_BUILD_SWIG)
12911291
12921292 ExternalProject_Add(${SWIG_TARGET}
12931293 GIT_REPOSITORY https://github.com/swig/swig
1294- GIT_TAG v4.2 .0
1294+ GIT_TAG v4.3 .0
12951295 DOWNLOAD_DIR ${BUILD_DIR} /download/${SWIG_TARGET}
12961296 PREFIX ${BUILD_DIR}
12971297 BUILD_IN_SOURCE 0
@@ -1306,7 +1306,7 @@ if(AV_BUILD_SWIG)
13061306 )
13071307
13081308 set (SWIG_CMAKE_FLAGS
1309- -DSWIG_DIR=${CMAKE_INSTALL_PREFIX} /share/swig/4.2 .0
1309+ -DSWIG_DIR=${CMAKE_INSTALL_PREFIX} /share/swig/4.3 .0
13101310 -DSWIG_EXECUTABLE=${CMAKE_INSTALL_PREFIX} /bin-deps
13111311 )
13121312endif ()
You can’t perform that action at this time.
0 commit comments