mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1189 from diddledan/ubuntu-20.04 

Update builds for Ubuntu 20.04
pull/1194/head
Piero Toffanin 2020-11-06 15:11:14 -05:00 zatwierdzone przez GitHub
rodzic e0b80d1e84 ff5f3ff362
commit 5ec9229736
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
5 zmienionych plików z 64 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
Dockerfile
Wyświetl plik

@ -1,8 +1,8 @@
FROM ubuntu:18.04 AS builder FROM ubuntu:20.04 AS builder
# Env variables # Env variables
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
# Prepare directories # Prepare directories
@ -19,6 +19,11 @@ RUN rm -rf \
/code/SuperBuild/build/opencv \ /code/SuperBuild/build/opencv \
/code/SuperBuild/download \ /code/SuperBuild/download \
/code/SuperBuild/src/ceres \ /code/SuperBuild/src/ceres \
/code/SuperBuild/src/entwine \
/code/SuperBuild/src/gflags \
/code/SuperBuild/src/hexer \
/code/SuperBuild/src/lastools \
/code/SuperBuild/src/laszip \
/code/SuperBuild/src/mvstexturing \ /code/SuperBuild/src/mvstexturing \
/code/SuperBuild/src/opencv \ /code/SuperBuild/src/opencv \
/code/SuperBuild/src/opengv \ /code/SuperBuild/src/opengv \
@ -26,7 +31,8 @@ RUN rm -rf \
/code/SuperBuild/src/pdal \ /code/SuperBuild/src/pdal \
/code/SuperBuild/src/openmvs \ /code/SuperBuild/src/openmvs \
/code/SuperBuild/build/openmvs \ /code/SuperBuild/build/openmvs \
/code/SuperBuild/src/vcg /code/SuperBuild/src/vcg \
/code/SuperBuild/src/zstd
# find in /code and delete... # find in /code and delete...
RUN find /code \ RUN find /code \
@ -39,11 +45,11 @@ RUN find /code \
### Use a second image for the final asset to reduce the number and ### Use a second image for the final asset to reduce the number and
# size of the layers. # size of the layers.
FROM ubuntu:18.04 FROM ubuntu:20.04
# Env variables # Env variables
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
WORKDIR /code WORKDIR /code

28
configure.sh 100644 → 100755
Wyświetl plik

@ -5,17 +5,23 @@ APT_GET="env DEBIAN_FRONTEND=noninteractive $(command -v apt-get)"
check_version(){ check_version(){
UBUNTU_VERSION=$(lsb_release -r) UBUNTU_VERSION=$(lsb_release -r)
if [[ $UBUNTU_VERSION = *"18.04"* ]]; then case "$UBUNTU_VERSION" in
echo "Ubuntu: $UBUNTU_VERSION, good!" *"20.04"*)
elif [[ $UBUNTU_VERSION = *"16.04" ]]; then echo "Ubuntu: $UBUNTU_VERSION, good!"
echo "ODM 2.0 has upgraded to Ubuntu 18.04, but you're on 16.04" ;;
echo "The last version of ODM that supports Ubuntu 16.04 is v1.0.2. We recommend you upgrade to Ubuntu 18.04, or better yet, use docker." *"18.04"*|*"16.04"*)
exit 1 echo "ODM 2.1 has upgraded to Ubuntu 20.04, but you're on $UBUNTU_VERSION"
else echo "* The last version of ODM that supports Ubuntu 16.04 is v1.0.2."
echo "You are not on Ubuntu 18.04 (detected: $UBUNTU_VERSION)" echo "* The last version of ODM that supports Ubuntu 18.04 is v2.0.0."
echo "It might be possible to run ODM on a newer version of Ubuntu, however, you cannot rely on this script." echo "We recommend you upgrade to Ubuntu 18.04, or better yet, use docker."
exit 1 exit 1
fi ;;
*)
echo "You are not on Ubuntu 20.04 (detected: $UBUNTU_VERSION)"
echo "It might be possible to run ODM on a newer version of Ubuntu, however, you cannot rely on this script."
exit 1
;;
esac
} }
if [[ $2 =~ ^[0-9]+$ ]] ; then if [[ $2 =~ ^[0-9]+$ ]] ; then

16
portable.Dockerfile
Wyświetl plik

@ -1,8 +1,8 @@
FROM ubuntu:18.04 AS builder FROM ubuntu:20.04 AS builder
# Env variables # Env variables
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
# Prepare directories # Prepare directories
@ -19,6 +19,11 @@ RUN rm -rf \
/code/SuperBuild/build/opencv \ /code/SuperBuild/build/opencv \
/code/SuperBuild/download \ /code/SuperBuild/download \
/code/SuperBuild/src/ceres \ /code/SuperBuild/src/ceres \
/code/SuperBuild/src/entwine \
/code/SuperBuild/src/gflags \
/code/SuperBuild/src/hexer \
/code/SuperBuild/src/lastools \
/code/SuperBuild/src/laszip \
/code/SuperBuild/src/mvstexturing \ /code/SuperBuild/src/mvstexturing \
/code/SuperBuild/src/opencv \ /code/SuperBuild/src/opencv \
/code/SuperBuild/src/opengv \ /code/SuperBuild/src/opengv \
@ -26,7 +31,8 @@ RUN rm -rf \
/code/SuperBuild/src/pdal \ /code/SuperBuild/src/pdal \
/code/SuperBuild/src/openmvs \ /code/SuperBuild/src/openmvs \
/code/SuperBuild/build/openmvs \ /code/SuperBuild/build/openmvs \
/code/SuperBuild/src/vcg /code/SuperBuild/src/vcg \
/code/SuperBuild/src/zstd
# find in /code and delete... # find in /code and delete...
RUN find /code \ RUN find /code \
@ -39,11 +45,11 @@ RUN find /code \
### Use a second image for the final asset to reduce the number and ### Use a second image for the final asset to reduce the number and
# size of the layers. # size of the layers.
FROM ubuntu:18.04 FROM ubuntu:20.04
# Env variables # Env variables
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
WORKDIR /code WORKDIR /code

4
requirements.txt
Wyświetl plik

@ -13,8 +13,8 @@ pyodm==1.5.4
Pillow==6.1.0 Pillow==6.1.0
networkx==2.2 networkx==2.2
scipy==1.5.4 scipy==1.5.4
numpy==1.19.2 numpy==1.19.4
pyproj==2.2.2 pyproj==3.0.0
Pysolar==0.6 Pysolar==0.6
psutil==5.6.3 psutil==5.6.3
joblib==0.17.0 joblib==0.17.0

37
snap/snapcraft.yaml
Wyświetl plik

@ -2,7 +2,7 @@ name: opendronemap
adopt-info: odm adopt-info: odm
grade: stable grade: stable
confinement: strict confinement: strict
base: core18 base: core20
summary: Command line toolkit for processing aerial drone imagery summary: Command line toolkit for processing aerial drone imagery
description: > description: >
@ -38,6 +38,7 @@ parts:
- build-essential - build-essential
- cmake - cmake
- gdal-bin - gdal-bin
- gfortran # to build scipy
- git - git
- grass-core - grass-core
- libboost-log-dev - libboost-log-dev
@ -58,7 +59,7 @@ parts:
stage-packages: stage-packages:
- gdal-bin - gdal-bin
- grass-core - grass-core
- libboost-log1.65.1 - libboost-log1.71.0
- libgdal26 - libgdal26
- libgeotiff5 - libgeotiff5
- libjsoncpp1 - libjsoncpp1
@ -84,6 +85,7 @@ parts:
- libgtk2.0-dev - libgtk2.0-dev
- libjpeg-dev - libjpeg-dev
- liblapack-dev - liblapack-dev
- libopenjpip7
- libpng-dev - libpng-dev
- libproj-dev - libproj-dev
- libswscale-dev - libswscale-dev
@ -91,16 +93,18 @@ parts:
- libtiff-dev - libtiff-dev
- libvtk6-dev - libvtk6-dev
- libxext-dev - libxext-dev
- proj-bin
stage-packages: stage-packages:
- libavcodec57 - libavcodec58
- libavformat57 - libavformat58
- libflann1.9 - libflann1.9
- libgtk2.0-0 - libgtk2.0-0
- libjpeg-turbo8 - libjpeg-turbo8
- libopenjpip7
- liblapack3 - liblapack3
- libpng16-16 - libpng16-16
- libproj19 - libproj19
- libswscale4 - libswscale5
- libtbb2 - libtbb2
- libtiff5 - libtiff5
- libvtk6.3 - libvtk6.3
@ -114,8 +118,7 @@ parts:
- libcgal-dev - libcgal-dev
- libboost-program-options-dev - libboost-program-options-dev
stage-packages: stage-packages:
- libboost-program-options1.65.1 - libboost-program-options1.71.0
- libcgal-dev
opensfm: opensfm:
source: . source: .
@ -127,18 +130,21 @@ parts:
- libboost-iostreams-dev - libboost-iostreams-dev
- libboost-python-dev - libboost-python-dev
- libboost-regex-dev - libboost-regex-dev
- libboost-serialization-dev
- libboost-system-dev
- libboost-thread-dev - libboost-thread-dev
- libgoogle-glog-dev - libgoogle-glog-dev
- libsuitesparse-dev - libsuitesparse-dev
stage-packages: stage-packages:
- libamd2 - libamd2
- libboost-date-time1.65.1 - libboost-date-time1.71.0
- libboost-filesystem1.65.1 - libboost-filesystem1.71.0
- libboost-iostreams1.65.1 - libboost-iostreams1.71.0
- libboost-python1.65.1 - libboost-python1.71.0
- libboost-regex1.65.1 - libboost-regex1.71.0
- libboost-system1.65.1 - libboost-serialization1.71.0
- libboost-thread1.65.1 - libboost-system1.71.0
- libboost-thread1.71.0
- libcamd2 - libcamd2
- libccolamd2 - libccolamd2
- libcholmod3 - libcholmod3
@ -186,6 +192,7 @@ parts:
stage: stage:
# strip the temporary build files and sources # strip the temporary build files and sources
- -odm/SuperBuild/build/opencv - -odm/SuperBuild/build/opencv
- -odm/SuperBuild/build/openmvs
- -odm/SuperBuild/download - -odm/SuperBuild/download
- -odm/SuperBuild/src/ceres - -odm/SuperBuild/src/ceres
- -odm/SuperBuild/src/entwine - -odm/SuperBuild/src/entwine
@ -195,9 +202,11 @@ parts:
- -odm/SuperBuild/src/laszip - -odm/SuperBuild/src/laszip
- -odm/SuperBuild/src/mvstexturing - -odm/SuperBuild/src/mvstexturing
- -odm/SuperBuild/src/opencv - -odm/SuperBuild/src/opencv
- -odm/SuperBuild/src/opengv
- -odm/SuperBuild/src/openmvs - -odm/SuperBuild/src/openmvs
- -odm/SuperBuild/src/pcl - -odm/SuperBuild/src/pcl
- -odm/SuperBuild/src/pdal - -odm/SuperBuild/src/pdal
- -odm/SuperBuild/src/vcg
- -odm/SuperBuild/src/zstd - -odm/SuperBuild/src/zstd
prime: prime:
# remove any static-libraries # remove any static-libraries