Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci] Update docker image for dependencies to fix runtime issue in CI #1458

Merged
merged 4 commits into from
Jun 8, 2023
Merged

[ci] Update docker image for dependencies to fix runtime issue in CI #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f871d23
[cmake] all-in-one: set cxx standard for cctag
fabiencastan Jun 7, 2023
5a23246
[cmake] set CMAKE_CUDA_STANDARD
fabiencastan Jun 7, 2023
557952e
[cmake] update opengv to avoid "-march" compilation flag
fabiencastan Jun 7, 2023
a75bb00
[ci] update docker image for dependencies
fabiencastan Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=<INSTALL_DIR>
<SOURCE_DIR>
BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL}
Expand Down
2 changes: 1 addition & 1 deletion docker/build-centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down