diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 725a563022..6530a91eff 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,7 +22,7 @@ jobs: build-linux: runs-on: ubuntu-latest container: - image: alicevision/alicevision-deps:2023.06.03-centos7-cuda11.3.1 + image: alicevision/alicevision-deps:2023.06.07-centos7-cuda11.3.1 env: DEPS_INSTALL_DIR: /opt/AliceVision_install BUILD_TYPE: Release diff --git a/CMakeLists.txt b/CMakeLists.txt index cd0f00b06a..2bcb1dde63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,7 +340,7 @@ ExternalProject_Add(${OPENGV_TARGET} # Our fork, with a fix: GIT_REPOSITORY https://github.com/alicevision/opengv.git # Use a custom commit with a fix to override the cxx standard from cmake command line - GIT_TAG cb0a3f16456a8661782b8d814bc2726e2018c428 + GIT_TAG 65f7edccf5044d445d305580f79c50c2efcbd438 PREFIX ${BUILD_DIR} BUILD_IN_SOURCE 0 BUILD_ALWAYS 0 @@ -854,6 +854,8 @@ ExternalProject_Add(${CCTAG_TARGET} -DCCTAG_WITH_CUDA:BOOL=${AV_USE_CUDA} -DCCTAG_BUILD_TESTS=OFF -DCCTAG_BUILD_APPS=OFF + -DCCTAG_EIGEN_MEMORY_ALIGNMENT=ON + -DCCTAG_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX:PATH= BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} diff --git a/docker/build-centos.sh b/docker/build-centos.sh index cdbbf6a4d7..af3244e0c9 100755 --- a/docker/build-centos.sh +++ b/docker/build-centos.sh @@ -7,7 +7,7 @@ test -e docker/fetch.sh || { exit 1 } -test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2023.06.03 +test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2023.06.07 test -z "$AV_VERSION" && AV_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)" test -z "$CUDA_VERSION" && CUDA_VERSION=11.3.1 test -z "$CENTOS_VERSION" && CENTOS_VERSION=7 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1899503a8..6742a70ea1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,6 +41,8 @@ endfunction() # C++17 set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard used by the project") set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD} CACHE STRING "The C++ standard used to compile cuda code in the project") +set(CMAKE_CUDA_STANDARD_REQUIRED ON) # ============================================================================== # AliceVision build options