From 4fe3b7e59285eccce06842704237f0448dd2e574 Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Thu, 5 Oct 2023 22:34:29 +0200 Subject: [PATCH 1/4] COMP: use OTB 8.1.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22f9bb19..b4280b2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,7 +98,7 @@ RUN cd tensorflow \ ### OTB ARG GUI=false -ARG OTB=5086d7601d80f2427f4d4d7f2398ec46e7efa300 +ARG OTB=8.1.2 ARG OTBTESTS=false RUN mkdir /src/otb -- GitLab From 4ed892669e3349729b9c9ac969a251119f787ccd Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Thu, 5 Oct 2023 22:35:45 +0200 Subject: [PATCH 2/4] DOC: update OTB version used in 4.2.1 --- doc/docker_use.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/docker_use.md b/doc/docker_use.md index 378626c3..1194b35e 100644 --- a/doc/docker_use.md +++ b/doc/docker_use.md @@ -25,12 +25,12 @@ Since OTBTF >= 3.2.1 you can find the latest docker images on | Name | Os | TF | OTB | Description | Dev files | Compute capability | |------------------------------------------------------------------------------------| ------------- |-------|-------| ---------------------- | --------- | ------------------ | -| **mdl4eo/otbtf:4.2.1-cpu** | Ubuntu Jammy | r2.12 | 8.1.0 | CPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6| -| **mdl4eo/otbtf:4.2.1-cpu-dev** | Ubuntu Jammy | r2.12 | 8.1.0 | CPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6| -| **mdl4eo/otbtf:4.2.1-gpu** | Ubuntu Jammy | r2.12 | 8.1.0 | GPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6| -| **mdl4eo/otbtf:4.2.1-gpu-dev** | Ubuntu Jammy | r2.12 | 8.1.0 | GPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6| -| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt** | Ubuntu Jammy | r2.12 | 8.1.0 | GPU with opt. | no | 5.2,6.1,7.0,7.5,8.6| -| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt-dev** | Ubuntu Jammy | r2.12 | 8.1.0 | GPU with opt. (dev) | yes | 5.2,6.1,7.0,7.5,8.6| +| **mdl4eo/otbtf:4.2.1-cpu** | Ubuntu Jammy | r2.12 | 8.1.2 | CPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6| +| **mdl4eo/otbtf:4.2.1-cpu-dev** | Ubuntu Jammy | r2.12 | 8.1.2 | CPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6| +| **mdl4eo/otbtf:4.2.1-gpu** | Ubuntu Jammy | r2.12 | 8.1.2 | GPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6| +| **mdl4eo/otbtf:4.2.1-gpu-dev** | Ubuntu Jammy | r2.12 | 8.1.2 | GPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6| +| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt** | Ubuntu Jammy | r2.12 | 8.1.2 | GPU with opt. | no | 5.2,6.1,7.0,7.5,8.6| +| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.1-gpu-opt-dev** | Ubuntu Jammy | r2.12 | 8.1.2 | GPU with opt. (dev) | yes | 5.2,6.1,7.0,7.5,8.6| The list of older releases is available [here](#older-images). -- GitLab From 5fc63c41e92082eb3840cfe6b2e6bdafd51aecb6 Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Thu, 5 Oct 2023 22:35:55 +0200 Subject: [PATCH 3/4] DOC: update release notes --- RELEASE_NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 8cf33b82..219aa15b 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -2,6 +2,7 @@ Version 4.2.1 (5 oct 2023) ---------------------------------------------------------------- * Fix a bug occuring when input images origins were not sharing the same pixel grid * CI to push "latest-gpu" tag on dockerhub +* Move to OTB 8.2.1 Version 4.2.0 (12 sep 2023) ---------------------------------------------------------------- -- GitLab From 5011c2541224d449de58c351a0f35917aa048812 Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Fri, 6 Oct 2023 10:46:06 +0200 Subject: [PATCH 4/4] COMP: update flags --- tools/docker/build-flags-otb.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/docker/build-flags-otb.txt b/tools/docker/build-flags-otb.txt index 95b8462c..f72d7c7b 100644 --- a/tools/docker/build-flags-otb.txt +++ b/tools/docker/build-flags-otb.txt @@ -17,3 +17,12 @@ -DUSE_SYSTEM_TINYXML=ON -DUSE_SYSTEM_ZLIB=ON -DUSE_SYSTEM_SWIG=ON + +-DOTB_USE_QT=OFF +-DOTB_USE_OPENGL=OFF +-DOTB_USE_GLUT=OFF +-DOTB_USE_GLEW=OFF +-DOTB_USE_GLFW=OFF + +-DGDAL_SB_EXTRA_OPTIONS=--with-geos + -- GitLab