From bce2986521b12c5e28174bd48465cc6fa5b6715b Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Mon, 22 Apr 2024 21:43:00 +0200
Subject: [PATCH 1/9] 50-proj_fix
---
tools/docker/build-deps-cli.txt | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/tools/docker/build-deps-cli.txt b/tools/docker/build-deps-cli.txt
index 6b7432f8..5dc5888e 100644
--- a/tools/docker/build-deps-cli.txt
+++ b/tools/docker/build-deps-cli.txt
@@ -17,33 +17,8 @@ python3-dev
python3-pip
python3-setuptools
python3-venv
-sudo
swig
unzip
vim
wget
-zip
-
-bison
-libboost-date-time-dev
-libboost-filesystem-dev
-libboost-graph-dev
-libboost-program-options-dev
-libboost-system-dev
-libboost-thread-dev
-libcurl4-gnutls-dev
-libexpat1-dev
-libfftw3-dev
-libgsl-dev
-libinsighttoolkit4-dev
-libkml-dev
-libmuparser-dev
-libmuparserx-dev
-libopencv-core-dev
-libopencv-ml-dev
-libsvm-dev
-libtinyxml-dev
-zlib1g-dev
-libgeos++-dev
-libgeos-c1v5
-libgeos-dev
+zip
\ No newline at end of file
--
GitLab
From 8da48420dd3036cddfd1e3b39c11d46161fe5047 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 08:24:13 +0200
Subject: [PATCH 2/9] Update file build-deps-cli.txt
---
tools/docker/build-deps-cli.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/docker/build-deps-cli.txt b/tools/docker/build-deps-cli.txt
index 5dc5888e..49a4572b 100644
--- a/tools/docker/build-deps-cli.txt
+++ b/tools/docker/build-deps-cli.txt
@@ -21,4 +21,5 @@ swig
unzip
vim
wget
+sudo
zip
\ No newline at end of file
--
GitLab
From b6be8a1517859284bbe1245c555d8d0e9ea03b41 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 10:56:00 +0200
Subject: [PATCH 3/9] ci: update decloud data
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ea0beeb..0148eec9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,7 +194,7 @@ decloud:
script:
- git clone https://github.com/CNES/decloud.git
- pip install -r $PWD/decloud/docker/requirements.txt
- - wget -P decloud_data --no-verbose --recursive --level=inf --no-parent -R "index.html*" --cut-dirs=3 --no-host-directories http://indexof.montpellier.irstea.priv/projets/geocicd/decloud/
+ - wget https://nextcloud.inrae.fr/s/aNTWLcH28zNomqk/download -O file.zip && unzip file.zip
- export DECLOUD_DATA_DIR="$PWD/decloud_data"
- pytest decloud/tests/train_from_tfrecords_unittest.py
--
GitLab
From 7e37c0949619eb6dd995250a008d57baff70a08b Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 11:59:44 +0200
Subject: [PATCH 4/9] ci: all tests runiing on godzilla
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0148eec9..17c80fe2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,6 +146,7 @@ pages:
- public
.tests_base:
+ tags: [godzilla]
artifacts:
paths:
- $ARTIFACT_TEST_DIR/*.*
--
GitLab
From 7595f10128174adc3c925490401a7d1f41e62746 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 13:48:46 +0200
Subject: [PATCH 5/9] ci: add more ctests for otb 9 release
---
.gitlab-ci.yml | 9 ++++++++-
RELEASE_NOTES.txt | 5 +++++
doc/docker_use.md | 18 ++++++++++++------
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17c80fe2..bbe2d815 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,14 @@ ctest:
extends: .tests_base
stage: Test
script:
- - cd $OTB_BUILD/ && sudo ctest -L OTBTensorflow # Run ctest
+ - sudo apt install git-lfs
+ - cd /src/otb/otb && git lfs fetch --all
+ - cd $OTB_BUILD/
+ - sudo ctest -L OTBTensorflow
+ - sudo ctest -L OTBPanSharpening
+ - sudo ctest -L OTBProjection
+ - sudo ctest -L OTBTransform
+ - sudo ctest -L OTBIOGDAL
after_script:
- cp -r $OTB_TEST_DIR $ARTIFACT_TEST_DIR
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 28cda335..af4e4429 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,8 @@
+Version 4.3.1 (02 jan 2024)
+----------------------------------------------------------------
+* Fix a bug with PROJ due to OTB 9 packaging
+* More tests for OTB
+
Version 4.3.0 (02 jan 2024)
----------------------------------------------------------------
* Add compute capability 8.0 and 9.0
diff --git a/doc/docker_use.md b/doc/docker_use.md
index 836bc134..81211066 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.3.0-cpu** | Ubuntu Jammy | r2.14 | 9.0.0 | CPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
-| **mdl4eo/otbtf:4.3.0-cpu-dev** | Ubuntu Jammy | r2.14 | 9.0.0 | CPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
-| **mdl4eo/otbtf:4.3.0-gpu** | Ubuntu Jammy | r2.14 | 9.0.0 | GPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
-| **mdl4eo/otbtf:4.3.0-gpu-dev** | Ubuntu Jammy | r2.14 | 9.0.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.3.0-gpu-opt** | Ubuntu Jammy | r2.14 | 9.0.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.3.0-gpu-opt-dev** | Ubuntu Jammy | r2.14 | 9.0.0 | GPU with opt. (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.1-cpu** | Ubuntu Jammy | r2.14 | 9.0.0 | CPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.1-cpu-dev** | Ubuntu Jammy | r2.14 | 9.0.0 | CPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.1-gpu** | Ubuntu Jammy | r2.14 | 9.0.0 | GPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.1-gpu-dev** | Ubuntu Jammy | r2.14 | 9.0.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.3.1-gpu-opt** | Ubuntu Jammy | r2.14 | 9.0.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.3.1-gpu-opt-dev** | Ubuntu Jammy | r2.14 | 9.0.0 | 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).
@@ -190,3 +190,9 @@ Here you can find the list of older releases of OTBTF:
| **mdl4eo/otbtf:4.2.2-gpu-dev** | Ubuntu Jammy | r2.12 | d74ab | 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.2-gpu-opt** | Ubuntu Jammy | r2.12 | d74ab | 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.2-gpu-opt-dev** | Ubuntu Jammy | r2.12 | d74ab | GPU with opt. (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.0-cpu** | Ubuntu Jammy | r2.14 | 9.0.0 | CPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.0-cpu-dev** | Ubuntu Jammy | r2.14 | 9.0.0 | CPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.0-gpu** | Ubuntu Jammy | r2.14 | 9.0.0 | GPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
+| **mdl4eo/otbtf:4.3.0-gpu-dev** | Ubuntu Jammy | r2.14 | 9.0.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.3.0-gpu-opt** | Ubuntu Jammy | r2.14 | 9.0.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.3.0-gpu-opt-dev** | Ubuntu Jammy | r2.14 | 9.0.0 | GPU with opt. (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
--
GitLab
From 5f2f7638734a3555e0071a297a582b8133498db5 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 14:24:05 +0200
Subject: [PATCH 6/9] ci: install git-lfs for ctests
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbe2d815..c3e4109d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ ctest:
extends: .tests_base
stage: Test
script:
- - sudo apt install git-lfs
+ - sudo apt update && sudo apt install -y git-lfs
- cd /src/otb/otb && git lfs fetch --all
- cd $OTB_BUILD/
- sudo ctest -L OTBTensorflow
--
GitLab
From 497efbc6c2879b04dc03bea1a6bb9fb57d56f5ee Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 14:43:31 +0200
Subject: [PATCH 7/9] Update file .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3e4109d..041666b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,7 +158,7 @@ ctest:
stage: Test
script:
- sudo apt update && sudo apt install -y git-lfs
- - cd /src/otb/otb && git lfs fetch --all
+ - cd /src/otb/otb && sudo git lfs fetch --all
- cd $OTB_BUILD/
- sudo ctest -L OTBTensorflow
- sudo ctest -L OTBPanSharpening
--
GitLab
From 7a29b9156e97edfb9bb21ce755ea1fd8449dec86 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 15:18:18 +0200
Subject: [PATCH 8/9] Update file .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 041666b3..4c2c6a56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,7 +158,7 @@ ctest:
stage: Test
script:
- sudo apt update && sudo apt install -y git-lfs
- - cd /src/otb/otb && sudo git lfs fetch --all
+ - cd /src/otb/otb && sudo git lfs fetch --all && sudo git lfs pull
- cd $OTB_BUILD/
- sudo ctest -L OTBTensorflow
- sudo ctest -L OTBPanSharpening
--
GitLab
From 806833ceb2cd7a2c88247aa2602662d0d7a574e7 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 23 Apr 2024 15:47:52 +0200
Subject: [PATCH 9/9] Update 2 files
- /setup.py
- /.gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c2c6a56..bd41bbf9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
variables:
- OTBTF_VERSION: 4.3.0
+ OTBTF_VERSION: 4.3.1
OTB_BUILD: /src/otb/build/OTB/build # Local OTB build directory
OTBTF_SRC: /src/otbtf # Local OTBTF source directory
OTB_TEST_DIR: $OTB_BUILD/Testing/Temporary # OTB testing directory
diff --git a/setup.py b/setup.py
index c4d7d67d..8519fb11 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
setuptools.setup(
name="otbtf",
- version="4.3.0",
+ version="4.3.1",
author="Remi Cresson",
author_email="remi.cresson@inrae.fr",
description="OTBTF: Orfeo ToolBox meets TensorFlow",
--
GitLab