Merge pull request #1837 from alicevision/ci/fixCuda

[ci] Windows: Only install necessary components from the CUDA Toolkit

Author: servantftransperfect

.github/workflows/continuous-integration.yml

@@ -189,11 +189,13 @@ jobs:
         id: cuda-toolkit
         with:
           cuda: '12.5.0'
+          sub-packages: '["nvcc", "cudart", "cublas", "cusparse"]'
 
       - name: Display CUDA information
         run: echo "Installed cuda version is "${{steps.cuda-toolkit.outputs.cuda}}
              echo "Cuda install location "${{steps.cuda-toolkit.outputs.CUDA_PATH}}
              nvcc -V
+             echo ${{ env.CUDA_PATH }}
 
       # Install latest CMake.
       - uses: lukka/get-cmake@latest
@@ -223,7 +225,7 @@ jobs:
                              -DALICEVISION_USE_POPSIFT=OFF
                              -DALICEVISION_USE_ALEMBIC=ON
                              -DALICEVISION_USE_OPENGV=OFF
-                             -DALICEVISION_BUILD_STEREOPHOTOMETRY=OFF
+                             -DALICEVISION_BUILD_PHOTOMETRICSTEREO=OFF
                              -DALICEVISION_BUILD_SEGMENTATION=OFF
                              -DBOOST_NO_CXX11=ON
 

src/aliceVision/depthMap/CMakeLists.txt

@@ -129,8 +129,6 @@ alicevision_add_library(aliceVision_depthMap
     aliceVision_mvsUtils
     aliceVision_system
     assimp::assimp
-    ${CUDA_CUDADEVRT_LIBRARY}
-    ${CUDA_CUBLAS_LIBRARIES} #TODO shouldn't be here, but required to build on some machines
   PRIVATE_LINKS
     aliceVision_gpu
     aliceVision_sfmData

src/software/utils/CMakeLists.txt

@@ -420,21 +420,22 @@ if (ALICEVISION_BUILD_PANORAMA)
 endif()
 
 if(ALICEVISION_BUILD_MVS)
-
-    # Lighting estimation from picture, albedo and geometry
-    alicevision_add_software(aliceVision_lightingEstimation
-        SOURCE main_lightingEstimation.cpp
-        FOLDER ${FOLDER_SOFTWARE_UTILS}
-        LINKS aliceVision_system
-              aliceVision_cmdline
-              aliceVision_numeric
-              aliceVision_sfmData
-              aliceVision_sfmDataIO
-              aliceVision_mvsUtils
-              aliceVision_image
-              aliceVision_lightingEstimation
-              ${Boost_LIBRARIES}
-    )
+    if(ALICEVISION_BUILD_PHOTOMETRICSTEREO)
+        # Lighting estimation from picture, albedo and geometry
+        alicevision_add_software(aliceVision_lightingEstimation
+            SOURCE main_lightingEstimation.cpp
+            FOLDER ${FOLDER_SOFTWARE_UTILS}
+            LINKS aliceVision_system
+                  aliceVision_cmdline
+                  aliceVision_numeric
+                  aliceVision_sfmData
+                  aliceVision_sfmDataIO
+                  aliceVision_mvsUtils
+                  aliceVision_image
+                  aliceVision_lightingEstimation
+                  ${Boost_LIBRARIES}
+        )
+    endif()
 
 
     # Lighting estimation from picture, albedo and geometry