Merge pull request #1402 from pierotofy/271

Fixes

Dockerfile

@@ -38,11 +38,11 @@ COPY --from=builder /usr/local /usr/local
 
 # Install shared libraries that we depend on via APT, but *not*
 # the -dev packages to save space!
-# Also run a smoke test
+# Also run a smoke test on ODM and OpenSfM
 RUN bash configure.sh installruntimedepsonly \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
   && bash run.sh --help
-
+  && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'"
 # Entry point
 ENTRYPOINT ["python3", "/code/run.py"]

SuperBuild/cmake/External-PyPopsift.cmake

@@ -12,7 +12,7 @@ if(CUDA_FOUND)
         #--Download step--------------
         DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
         GIT_REPOSITORY    https://github.com/OpenDroneMap/pypopsift
-        GIT_TAG           270
+        GIT_TAG           271
         #--Update/Patch step----------
         UPDATE_COMMAND    ""
         #--Configure step-------------

VERSION

@@ -1 +1 @@
-2.7.0
+2.7.1

configure.sh

@@ -104,7 +104,6 @@ installruntimedepsonly() {
     installdepsfromsnapcraft runtime opensfm
     echo "Installing OpenMVS Dependencies"
     installdepsfromsnapcraft runtime openmvs
-    
 }
 
 installreqs() {

gpu.Dockerfile

@@ -39,11 +39,11 @@ COPY --from=builder /usr/local /usr/local
 
 # Install shared libraries that we depend on via APT, but *not*
 # the -dev packages to save space!
-# Also run a smoke test
+# Also run a smoke test on ODM and OpenSfM
 RUN bash configure.sh installruntimedepsonly \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
   && bash run.sh --help
-
+  && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'"
 # Entry point
 ENTRYPOINT ["python3", "/code/run.py"]

requirements.txt

@@ -11,7 +11,7 @@ laspy==1.7.0
 lxml==4.6.1
 matplotlib==3.3.3
 networkx==2.5
-numpy==1.22.0
+numpy==1.21.1
 Pillow==8.0.1
 vmem==1.0.1
 pyodm==1.5.8
@@ -19,7 +19,7 @@ pyproj==3.0.0.post1
 Pysolar==0.9
 pytz==2020.4
 PyYAML==5.1
-rasterio==1.1.8 ; sys_platform == 'linux' or sys_platform == 'darwin'
+rasterio==1.2.3 ; sys_platform == 'linux' or sys_platform == 'darwin'
 https://github.com/OpenDroneMap/windows-deps/raw/main/rasterio-1.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32'
 https://github.com/OpenDroneMap/windows-deps/raw/main/GDAL-3.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32'
 repoze.lru==0.7

stages/odm_app.py

@@ -109,7 +109,7 @@ class ODMApp:
             if code == 139 or code == 134 or code == 1 or code == 3221225477:
                 # Segfault
                 log.ODM_ERROR("Uh oh! Processing stopped because of strange values in the reconstruction. This is often a sign that the input data has some issues or the software cannot deal with it. Have you followed best practices for data acquisition? See https://docs.opendronemap.org/flying/")
-            elif code == 137:
+            elif code == 137 or code == 3221226505:
                 log.ODM_ERROR("Whoops! You ran out of memory! Add more RAM to your computer, if you're using docker configure it to use more memory, for WSL2 make use of .wslconfig (https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig), resize your images, lower the quality settings or process the images using a cloud provider (e.g. https://webodm.net).")
             elif code == 132:
                 log.ODM_ERROR("Oh no! It looks like your CPU is not supported (is it fairly old?). You can still use ODM, but you will need to build your own docker image. See https://github.com/OpenDroneMap/ODM#build-from-source")