Support for Ubuntu 21.04

2021-09-02 18:12:18 -04:00 · 2021-09-02 18:12:18 -04:00 · 539871bac4
commit 539871bac4
--- a/8
+++ b/8
@ -1,8 +1,8 @@
-FROM ubuntu:20.04 AS builder
+FROM ubuntu:21.04 AS builder

 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
+    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9/dist-packages:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

 # Prepare directories
@ -21,11 +21,11 @@ RUN bash configure.sh clean

 ### Use a second image for the final asset to reduce the number and
 # size of the layers.
-FROM ubuntu:20.04
+FROM ubuntu:21.04

 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
+    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

 WORKDIR /code
--- a/configure.sh
+++ b/configure.sh
@ -3,21 +3,21 @@
 # Ensure the DEBIAN_FRONTEND environment variable is set for apt-get calls
 APT_GET="env DEBIAN_FRONTEND=noninteractive $(command -v apt-get)"

-check_version(){
-  UBUNTU_VERSION=$(lsb_release -r)
+check_version(){  
+  export UBUNTU_VERSION=$(lsb_release -r)
  case "$UBUNTU_VERSION" in
-    *"20.04"*)
+    *"20.04"*|*"21.04"*)
      echo "Ubuntu: $UBUNTU_VERSION, good!"
      ;;
    *"18.04"*|*"16.04"*)
-      echo "ODM 2.1 has upgraded to Ubuntu 20.04, but you're on $UBUNTU_VERSION"
+      echo "ODM 2.1 has upgraded to Ubuntu 21.04, but you're on $UBUNTU_VERSION"
      echo "* The last version of ODM that supports Ubuntu 16.04 is v1.0.2."
      echo "* The last version of ODM that supports Ubuntu 18.04 is v2.0.0."
      echo "We recommend you to upgrade, or better yet, use docker."
      exit 1
      ;;
    *)
-      echo "You are not on Ubuntu 20.04 (detected: $UBUNTU_VERSION)"
+      echo "You are not on Ubuntu 21.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
      ;;
@ -54,10 +54,12 @@ ensure_prereqs() {
    echo "Installing tzdata"
    sudo $APT_GET install -y -qq tzdata

-    echo "Enabling PPA for Ubuntu GIS"
-    sudo $APT_GET install -y -qq --no-install-recommends software-properties-common
-    sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
-    sudo $APT_GET update
+    if [[ "$UBUNTU_VERSION" == *"20.04"* ]]; then
+        echo "Enabling PPA for Ubuntu GIS"
+        sudo $APT_GET install -y -qq --no-install-recommends software-properties-common
+        sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+        sudo $APT_GET update
+    fi

    echo "Installing Python PIP"
    sudo $APT_GET install -y -qq --no-install-recommends \
@ -77,7 +79,12 @@ installdepsfromsnapcraft() {
        *) key=build-packages; ;; # shouldn't be needed, but it's here just in case
    esac

-    cat snap/snapcraft.yaml | \
+    SNAPCRAFT_FILE="snapcraft.yaml"
+    if [[ "$UBUNTU_VERSION" == *"21.04"* ]]; then
+        SNAPCRAFT_FILE="snapcraft21.yaml"
+    fi
+
+    cat snap/$SNAPCRAFT_FILE | \
        shyaml get-values-0 parts.$section.$key | \
        xargs -0 sudo $APT_GET install -y -qq --no-install-recommends
 }
--- a/gpu.Dockerfile
+++ b/gpu.Dockerfile
@ -2,7 +2,7 @@ FROM nvidia/cuda:11.2.0-runtime-ubuntu20.04 AS builder

 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
+    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9/dist-packages:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

 # Prepare directories
@ -25,7 +25,7 @@ FROM nvidia/cuda:11.2.0-runtime-ubuntu20.04

 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
+    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9/dist-packages:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

 WORKDIR /code
--- a/opendm/context.py
+++ b/opendm/context.py
@ -11,6 +11,7 @@ superbuild_bin_path = os.path.join(superbuild_path, 'install', 'bin')

 # add opencv,opensfm to python path
 python_packages_paths = [os.path.join(superbuild_path, p) for p in [
+    'install/lib/python3.9/dist-packages',
    'install/lib/python3.8/dist-packages',
    'install/lib/python3/dist-packages',
    'install/bin/opensfm'
--- a/portable.Dockerfile
+++ b/portable.Dockerfile
@ -1,8 +1,8 @@
-FROM ubuntu:20.04 AS builder
+FROM ubuntu:21.04 AS builder

 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
+    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9/dist-packages:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

 # Prepare directories
@ -21,11 +21,11 @@ RUN bash configure.sh clean

 ### Use a second image for the final asset to reduce the number and
 # size of the layers.
-FROM ubuntu:20.04
+FROM ubuntu:21.04

 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
+    PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9/dist-packages:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/src/opensfm" \
    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

 WORKDIR /code
--- a/snap/snapcraft21.yaml
+++ b/snap/snapcraft21.yaml
@ -0,0 +1,228 @@
+name: opendronemap
+adopt-info: odm
+grade: stable
+confinement: strict
+base: core20
+
+summary: Command line toolkit for processing aerial drone imagery
+description: >
+  An open source command line toolkit for processing aerial drone imagery. ODM turns simple 2D images into:
+
+  * Classified Point Clouds
+  * 3D Textured Models
+  * Georeferenced Orthorectified Imagery
+  * Georeferenced Digital Elevation Models
+
+  The application is available for Windows, Mac and Linux and it works from the command line, making it ideal for power users, scripts and for integration with other software.
+
+# The UbuntuGIS PPA only has i386 and amd64 packages so we can't build any
+# other architectures. Therefore let's limit to those here.
+architectures:
+  - build-on: i386
+    run-on: i386
+  - build-on: amd64
+    run-on: amd64
+
+package-repositories:
+  - type: apt
+    ppa: ubuntugis/ubuntugis-unstable
+
+parts:
+  prereqs:
+    source: .
+    plugin: nil
+    build-packages:
+      - build-essential
+      - cmake
+      - gdal-bin
+      - gfortran # to build scipy
+      - git
+      - libboost-log-dev
+      - libgdal-dev
+      - libgeotiff-dev
+      - libjsoncpp-dev
+      - libssl-dev
+      - libusb-1.0-0-dev
+      - ninja-build
+      - pkg-config
+      - python3-dev
+      - python3-gdal
+      - python3-pip
+      - python3-setuptools
+      - python3-wheel
+      - rsync
+      - swig3.0
+    stage-packages:
+      - gdal-bin
+      - libboost-log1.71.0
+      - libgdal28
+      - libgeotiff5
+      - libjsoncpp24
+      - libspqr2
+      - libssl1.1
+      - libusb-1.0-0
+      - proj-data
+      - procps
+      - python3
+      - python3-distutils
+      - python3-gdal
+      - python3-pkg-resources # required base package for core20
+      - python3-requests # required base package for core20
+      - python3-setuptools
+    stage:
+      # remove deb-based numpy because it conflicts with our pip-installed version
+      - -usr/lib/python3/dist-packages/numpy
+
+  opencv:
+    source: .
+    plugin: nil
+    build-packages:
+      - libavcodec-dev
+      - libavformat-dev
+      - libeigen3-dev
+      - libflann-dev
+      - libgtk2.0-dev
+      - libjpeg-dev
+      - liblapack-dev
+      - libopenjpip7
+      - libpng-dev
+      - libproj-dev
+      - libswscale-dev
+      - libtbb-dev
+      - libtiff-dev
+      - libxext-dev
+      - proj-bin
+    stage-packages:
+      - libavcodec58
+      - libavformat58
+      - libflann1.9
+      - libgtk2.0-0
+      - libjpeg-turbo8
+      - libopenjpip7
+      - liblapack3
+      - libpng16-16
+      - libproj19
+      - libswscale5
+      - libtbb2
+      - libtiff5
+      - libwebpdemux2
+      - libxext6
+  
+  openmvs:
+    source: .
+    plugin: nil
+    build-packages:
+      - libcgal-dev
+      - libboost-program-options-dev
+    stage-packages:
+      - libboost-program-options1.71.0
+
+  opensfm:
+    source: .
+    plugin: nil
+    build-packages:
+      - libboost-date-time-dev
+      - libboost-filesystem-dev
+      - libboost-iostreams-dev
+      - libboost-python-dev
+      - libboost-regex-dev
+      - libboost-serialization-dev
+      - libboost-system-dev
+      - libboost-thread-dev
+      - libgoogle-glog-dev
+      - libsuitesparse-dev
+    stage-packages:
+      - libamd2
+      - libboost-date-time1.71.0
+      - libboost-filesystem1.71.0
+      - libboost-iostreams1.71.0
+      - libboost-python1.71.0
+      - libboost-regex1.71.0
+      - libboost-serialization1.71.0
+      - libboost-system1.71.0
+      - libboost-thread1.71.0
+      - libcamd2
+      - libccolamd2
+      - libcholmod3
+      - libcolamd2
+      - libcxsparse3
+      - libgoogle-glog0v5
+      - libsuitesparseconfig5
+
+  odm:
+    after:
+      - prereqs
+      - opencv
+      - opensfm
+      - openmvs
+    source: .
+    plugin: nil # We will script everything ourselves
+    build-environment:
+      # Set Python location to build host's system so that we can
+      # use system libraries while building the Snap Package
+      - PYTHONHOME: /usr
+      # Set the location for pip to install requirements into inside
+      # the Snap package
+      - PYTHONUSERBASE: $SNAPCRAFT_PART_INSTALL
+    override-build: |
+      snapcraftctl set-version $(cat VERSION)
+
+      # Portable build
+      test -f /usr/bin/gcc_real || mv -v /usr/bin/gcc /usr/bin/gcc_real
+      test -f /usr/bin/gcc || cp -v ./docker/gcc /usr/bin/gcc
+      test -f /usr/bin/g++_real || mv -v /usr/bin/g++ /usr/bin/g++_real
+      test -f /usr/bin/g++ || cp -v ./docker/g++ /usr/bin/g++
+
+      pip3 install --user -r requirements.txt
+
+      # Build the SuperBuild libraries
+      mkdir -p SuperBuild/build
+      cd SuperBuild/build
+      cmake -G Ninja ..
+      cmake --build .  --parallel 1
+
+      rsync -av --exclude .git \
+        $SNAPCRAFT_PART_BUILD/ $SNAPCRAFT_PART_INSTALL/odm/
+      chmod -R u=rwX,go=rX $PYTHONUSERBASE/lib/python*
+    stage:
+      # strip the temporary build files and sources
+      - -odm/SuperBuild/build
+      - -odm/SuperBuild/download
+      - -odm/SuperBuild/src
+    prime:
+      # remove any static-libraries
+      - -**/*.a
+      # remove any header files
+      - -**/*.h
+      # remove any left-over temporary compiled 'object' files
+      - -**/*.o
+    build-snaps:
+      - cmake
+
+  snap-specifics:
+    source: snap/local
+    plugin: dump
+
+  snapcraft-preload:
+    source: https://github.com/sergiusens/snapcraft-preload.git
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/
+    build-packages:
+      - on amd64:
+        - gcc-multilib
+        - g++-multilib
+
+apps:
+  opendronemap:
+    command: odm/run.sh
+    command-chain:
+      - bin/snapcraft-preload # Fixes multiprocessing python module
+    environment:
+      # Ensure libraries are found
+      LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack:$LD_LIBRARY_PATH
+    plugs:
+      - home
+      - network
+      - network-bind
+      - removable-media