Merge pull request #496 from 3dgeo-heidelberg/dev

HELIOS++ v2.0.1

Author: han16nah

.github/workflows/docker.yml

@@ -0,0 +1,45 @@
+name: Publish Docker image
+
+on:
+  push:
+    tags:
+      - 'v?[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish'
+        required: true
+
+jobs:
+  build_and_push:
+    name: Build and push Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        if: github.event_name == 'workflow_dispatch'
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKER_USERNAME }}/helios:${{ github.event.inputs.version }}
+
+      - name: Set tag as output
+        if: github.event_name == 'push'
+        run: echo "tag=${GITHUB_REF##*/}" >> "$GITHUB_ENV"
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        if: github.event_name == 'push'
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKER_USERNAME }}/helios:${{ env.tag }}

CMakeLists.txt

@@ -15,8 +15,8 @@ if(SKBUILD)
   set(HELIOS_VERSION ${SKBUILD_PROJECT_VERSION})
   set(HELIOS_VERSION_FULL ${SKBUILD_PROJECT_VERSION_FULL})
 else()
-  set(HELIOS_VERSION "2.0.0")
-  set(HELIOS_VERSION_FULL "2.0.0")
+  set(HELIOS_VERSION "2.0.1")
+  set(HELIOS_VERSION_FULL "2.0.1")
 endif()
 
 project(Helios++

Docker/Dockerfile

@@ -0,0 +1,28 @@
+FROM quay.io/jupyter/base-notebook:latest
+
+# Install git to make setuptools_scm work
+USER root
+RUN apt update && \
+    apt install --no-install-recommends --yes \
+      build-essential \
+      git && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/*
+USER ${NB_USER}
+
+# Install compiler toolchain into the environment
+RUN mamba install -c conda-forge gcc gxx
+
+# Pull in the Conda environment first to avoid unnecessary rebuilds
+COPY --chown=${NB_UID} environment-dev.yml ${HOME}/
+
+# Install packages into the conda environment
+RUN mamba env update -n base --file ${HOME}/environment-dev.yml && \
+    mamba clean -a -q -y && \
+    rm ${HOME}/environment-dev.yml
+
+# Copy the rest of the files
+COPY --chown=${NB_UID} . ${HOME}/helios
+
+# Install the Helios package
+RUN conda run -n base python -m pip install -v ${HOME}/helios

Docker/image-builder/Dockerfile

@@ -26,7 +26,7 @@ conda install -c conda-forge helios
 
 ### Standalone Installer
 
-You can also install HELOIOS++ via the standalone installers available for Windows, Linux and MacOS. They will not only install HELIOS++ but also add shortcuts for a) a H++ terminal session and b) a H++ Jupyter session.
+You can also install HELIOS++ via the standalone installers available for Windows, Linux and MacOS. They will not only install HELIOS++ but also add shortcuts for a) a H++ terminal session and b) a H++ Jupyter session.
 
 Download the correct installer for your operating system from the [release page](https://github.com/3dgeo-heidelberg/helios/releases) and run it (under Windows, this is a setup wizard, under Linux and MacOS, it is a shell script).
 

Docker/image-builder/build-image.sh

@@ -115,6 +115,12 @@ def helios_live():
         import numpy as np
         import time
 
+        # Check that numpy is major version 1
+        np_major = int(np.__version__.split('.')[0])
+        if np_major > 1:
+            print("WARNING: You are using Open3d together with numpy > 1. To our knowledge this is currently incompatible.")
+            print("Consider downgrading with 'pip install \"numpy<2\"'")
+
         # Create instance of Scene class, generate scene, print scene (if logging v2), and visualize.
         scene = Scene(args.survey_file, args.loggingv2)
         scene.gen_from_xml()