Merge branch 'master' into codem

.github/workflows/test-build-prs.yaml

@@ -58,6 +58,10 @@ jobs:
       with:
         python-version: '3.8.1'
         architecture: 'x64'
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v1.13
+      with:
+        cmake-version: '3.24.x'
     - name: Setup Visual C++
       uses: ilammy/msvc-dev-cmd@v1
       with:

SuperBuild/cmake/External-OpenMVS.cmake

@@ -53,7 +53,7 @@ ExternalProject_Add(${_proj_name}
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
   GIT_REPOSITORY    https://github.com/OpenDroneMap/openMVS
-  GIT_TAG           300
+  GIT_TAG           301
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
@@ -64,6 +64,7 @@ ExternalProject_Add(${_proj_name}
     -DEIGEN3_INCLUDE_DIR=${SB_SOURCE_DIR}/eigen34/
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_PREFIX=${SB_INSTALL_DIR}
+    -DOpenMVS_ENABLE_TESTS=OFF
     -DOpenMVS_MAX_CUDA_COMPATIBILITY=ON
     ${GPU_CMAKE_ARGS}
     ${WIN32_CMAKE_ARGS}

VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

requirements.txt

@@ -7,7 +7,7 @@ ODMExifRead==3.0.4
 Fiona==1.8.17 ; sys_platform == 'linux' or sys_platform == 'darwin'
 https://github.com/OpenDroneMap/windows-deps/raw/main/Fiona-1.8.19-cp38-cp38-win_amd64.whl ; sys_platform == 'win32'
 joblib==1.1.0
-laspy[laszip]==2.3.0
+laspy[lazrs]==2.3.0
 lxml==4.6.1
 matplotlib==3.3.3
 networkx==2.5

stages/openmvs.py

@@ -77,8 +77,8 @@ class ODMOpenMVSStage(types.ODM_Stage):
             gpu_config = []
             use_gpu = has_gpu(args)
             if use_gpu:
-                gpu_config.append("--cuda-device -3")
-                # gpu_config.append("--cuda-device -1")
+                #gpu_config.append("--cuda-device -3")
+                gpu_config.append("--cuda-device -1")
             else:
                 gpu_config.append("--cuda-device -2")