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] Windows: Add appropriate flags to compile with CUDA < 12.1 #1754

Merged
merged 2 commits into from
Oct 7, 2024
Merged

[ci] Windows: Add appropriate flags to compile with CUDA < 12.1 #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6593648
[ci] Windows: Add appropriate CUDA flags
cbentejac Aug 2, 2024
318574f
Remove references to `ALICEVISION_BUILD_EXAMPLES`
cbentejac Oct 4, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
-DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../AV_install \
-DTARGET_ARCHITECTURE=core \
-DALICEVISION_BUILD_TESTS:BOOL=ON \
-DALICEVISION_BUILD_EXAMPLES:BOOL=ON \
-DALICEVISION_BUILD_SWIG_BINDING:BOOL=ON \
-DALICEVISION_USE_OPENCV:BOOL=ON \
-DALICEVISION_USE_CUDA:BOOL=ON \
Expand Down Expand Up @@ -216,7 +215,6 @@ jobs:
-DTARGET_ARCHITECTURE=core
-DCMAKE_INSTALL_PREFIX=${{ env.ALICEVISION_ROOT }}
-DALICEVISION_BUILD_TESTS=ON
-DALICEVISION_BUILD_EXAMPLES=OFF
-DALICEVISION_USE_OPENCV=ON
-DALICEVISION_USE_CUDA=ON
-DALICEVISION_USE_CCTAG=OFF
Expand All @@ -226,6 +224,8 @@ jobs:
-DALICEVISION_BUILD_STEREOPHOTOMETRY=OFF
-DALICEVISION_BUILD_SEGMENTATION=OFF
-DBOOST_NO_CXX11=ON
-DCUDA_NVCC_FLAGS=--allow-unsupported-compiler;-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH

# This input tells run-cmake to consume the vcpkg.cmake toolchain file set by run-vcpkg.
cmakeBuildType: Release
buildWithCMake: true
Expand Down
10 changes: 3 additions & 7 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@ CMake Options
* `ALICEVISION_BUILD_DOC` (default `AUTO`)
Build AliceVision documentation

* `ALICEVISION_BUILD_EXAMPLES` (default `ON`)
Build AliceVision samples applications (aliceVision software are still built)

* `ALICEVISION_BUILD_COVERAGE` (default `OFF`)
Enable code coverage generation (gcc only)

Expand All @@ -279,9 +276,9 @@ Linux compilation
cmake -DCMAKE_BUILD_TYPE=Release . ../AliceVision
```

If you want enable unit tests and examples to the build:
If you want enable unit tests to the build:
```bash
cmake -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_TESTS=ON -DALICEVISION_BUILD_EXAMPLES=ON ../AliceVision
cmake -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_TESTS=ON ../AliceVision
```

In order to use the MOSEK 6 back-end for the linear programming aliceVision module:
Expand Down Expand Up @@ -343,11 +340,10 @@ git clone --recursive https://github.com/alicevision/AliceVision.git
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -G "Xcode" ../AliceVision
```
If you want enable unit tests and examples to the build:
If you want enable unit tests to the build:
```bash
cmake -DCMAKE_BUILD_TYPE=Release \
-DALICEVISION_BUILD_TESTS=ON \
-DALICEVISION_BUILD_EXAMPLES=ON \
-G "Xcode" \
../AliceVision
xcodebuild -configuration Release
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX:PATH="${AV_INSTALL}" \
-DALICEVISION_BUNDLE_PREFIX="${AV_BUNDLE}" \
-DALICEVISION_USE_ALEMBIC=ON -DMINIGLOG=ON -DALICEVISION_USE_CCTAG=ON -DALICEVISION_USE_APRILTAG=ON -DALICEVISION_USE_OPENCV=ON -DALICEVISION_USE_OPENGV=ON \
-DALICEVISION_USE_POPSIFT=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_ONNX_GPU=OFF -DALICEVISION_BUILD_DOC=OFF -DALICEVISION_BUILD_EXAMPLES=OFF \
-DALICEVISION_USE_POPSIFT=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_ONNX_GPU=OFF -DALICEVISION_BUILD_DOC=OFF \
-DSWIG_DIR="${AV_INSTALL}/share/swig/4.2.0" -DSWIG_EXECUTABLE="${AV_INSTALL}/bin-deps/swig" \
"${AV_DEV}" || (cat "${AV_BUILD}/CMakeFiles/CMakeOutput.log" "${AV_BUILD}/CMakeFiles/CMakeError.log" && false)

Expand Down
1 change: 0 additions & 1 deletion docker/Dockerfile_ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
-DALICEVISION_USE_CUDA:BOOL=ON \
-DALICEVISION_USE_ONNX_GPU:BOOL=OFF \
-DALICEVISION_BUILD_DOC:BOOL=OFF \
-DALICEVISION_BUILD_EXAMPLES:BOOL=OFF \
-DALICEVISION_BUILD_SWIG_BINDING:BOOL=ON \
-DSWIG_DIR:PATH="${AV_INSTALL}/share/swig/4.2.0" -DSWIG_EXECUTABLE:PATH="${AV_INSTALL}/bin-deps/swig" \
"${AV_DEV}" && \
Expand Down
1 change: 0 additions & 1 deletion src/cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,6 @@ if(AV_BUILD_ALICEVISION)
-DALICEVISION_USE_CUDA=${AV_USE_CUDA}
-DALICEVISION_BUILD_SWIG_BINDING=${AV_USE_SWIG}
-DALICEVISION_BUILD_DOC=OFF
-DALICEVISION_BUILD_EXAMPLES=OFF

${ZLIB_CMAKE_FLAGS}
${ASSIMP_CMAKE_FLAGS}
Expand Down
Loading