Skip to content

Commit 1a85ea7

Browse files
author
Cresson Remi
committed
Merge branch 'develop' into 'master'
Release 4.2.2 See merge request remi.cresson/otbtf!105
2 parents e222d4b + 346dba8 commit 1a85ea7

9 files changed

+60
-19
lines changed

‎.gitlab-ci.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
OTBTF_VERSION: 4.2.1
2+
OTBTF_VERSION: 4.2.2
33
OTB_BUILD: /src/otb/build/OTB/build # Local OTB build directory
44
OTBTF_SRC: /src/otbtf # Local OTBTF source directory
55
OTB_TEST_DIR: $OTB_BUILD/Testing/Temporary # OTB testing directory
@@ -211,6 +211,12 @@ geos_enabled:
211211
script:
212212
- python -m pytest --junitxml=$ARTIFACT_TEST_DIR/report_geos_enabled.xml $OTBTF_SRC/test/geos_test.py
213213

214+
planetary_computer:
215+
extends: .applications_test_base
216+
script:
217+
- pip install pystac_client planetary_computer
218+
- python -m pytest --junitxml=$ARTIFACT_TEST_DIR/report_pc_enabled.xml $OTBTF_SRC/test/pc_test.py
219+
214220
imports:
215221
extends: .applications_test_base
216222
script:

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN cd tensorflow \
9898
### OTB
9999

100100
ARG GUI=false
101-
ARG OTB=8.1.2
101+
ARG OTB=d74ab47d4308591db4ed5a5ea3b820cef73a39fe
102102
ARG OTBTESTS=false
103103

104104
RUN mkdir /src/otb

‎RELEASE_NOTES.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 4.2.2 (19 oct 2023)
2+
----------------------------------------------------------------
3+
* Add a test to ensure that planetary computer works in the OTBTF docker image
4+
* Move to OTB version d74ab47d4308591db4ed5a5ea3b820cef73a39fe since 8.2.1 looks not up-to-date
5+
16
Version 4.2.1 (5 oct 2023)
27
----------------------------------------------------------------
38
* Fix a bug occuring when input images origins were not sharing the same pixel grid

‎doc/docker_use.md

+12-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ Since OTBTF >= 3.2.1 you can find the latest docker images on
2525

2626
| Name | Os | TF | OTB | Description | Dev files | Compute capability |
2727
|------------------------------------------------------------------------------------| ------------- |-------|-------| ---------------------- | --------- | ------------------ |
28-
| **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|
29-
| **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|
30-
| **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|
31-
| **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|
32-
| **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|
33-
| **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|
28+
| **mdl4eo/otbtf:4.2.2-cpu** | Ubuntu Jammy | r2.12 | d74ab | CPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
29+
| **mdl4eo/otbtf:4.2.2-cpu-dev** | Ubuntu Jammy | r2.12 | d74ab | CPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
30+
| **mdl4eo/otbtf:4.2.2-gpu** | Ubuntu Jammy | r2.12 | d74ab | GPU, no optimization | no | 5.2,6.1,7.0,7.5,8.6|
31+
| **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|
32+
| **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|
33+
| **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|
3434

3535
The list of older releases is available [here](#older-images).
3636

@@ -178,4 +178,10 @@ Here you can find the list of older releases of OTBTF:
178178
| **mdl4eo/otbtf:4.2.0-gpu-dev** | Ubuntu Jammy | r2.12 | 8.1.0 | GPU, no optimization (dev) | yes | 5.2,6.1,7.0,7.5,8.6|
179179
| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.0-gpu-opt** | Ubuntu Jammy | r2.12 | 8.1.0 | GPU with opt. | no | 5.2,6.1,7.0,7.5,8.6|
180180
| **gitlab.irstea.fr/remi.cresson/otbtf/container_registry/otbtf:4.2.0-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|
181+
| **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|
182+
| **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|
183+
| **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|
184+
| **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|
185+
| **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|
186+
| **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|
181187

‎doc/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ Every one can **contribute** to OTBTF. Just open a PR :)
9999

100100
## Additional resources
101101

102+
- The [otbtf/keras tutorial](https://github.com/remicres/otbtf_keras_tutorial) shows how to create a dataset, build, train, evaluate, and apply a model to perform semantic segmentation of a remote sensing image,
102103
- The [*test* folder](https://github.com/remicres/otbtf/tree/master/test/)
103104
of this repository contains various use-cases with commands, python codes, and
104105
input/baseline data,

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
setuptools.setup(
88
name="otbtf",
9-
version="4.2.1",
9+
version="4.2.2",
1010
author="Remi Cresson",
1111
author_email="[email protected]",
1212
description="OTBTF: Orfeo ToolBox meets TensorFlow",

‎test/pc_test.py

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
import pytest
4+
import unittest
5+
import planetary_computer
6+
import pystac_client
7+
import otbApplication
8+
9+
class PCTest(unittest.TestCase):
10+
11+
def test_pc(self):
12+
api = pystac_client.Client.open(
13+
'https://planetarycomputer.microsoft.com/api/stac/v1',
14+
modifier=planetary_computer.sign_inplace,
15+
)
16+
17+
res = api.search(
18+
bbox=[4, 42.99, 4.5, 43.05],
19+
datetime=["2022-01-01", "2022-01-09"],
20+
collections=["sentinel-2-l2a"]
21+
)
22+
23+
r = next(res.items())
24+
url = r.assets["B04"].href
25+
info = otbApplication.Registry.CreateApplication("ReadImageInfo")
26+
info.SetParameterString("in", "/vsicurl/" + url)
27+
info.Execute()
28+
assert len(info.GetParameterString("projectionref")) > 1
29+
30+
31+
if __name__ == '__main__':
32+
unittest.main()

‎tools/docker/build-deps-gui.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ libxi-dev
1010
qtbase5-dev
1111
qttools5-dev
1212
qttools5-dev-tools
13-
xvfb
13+
xvfb

‎tools/docker/build-flags-otb.txt

-9
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,3 @@
1717
-DUSE_SYSTEM_TINYXML=ON
1818
-DUSE_SYSTEM_ZLIB=ON
1919
-DUSE_SYSTEM_SWIG=ON
20-
21-
-DOTB_USE_QT=OFF
22-
-DOTB_USE_OPENGL=OFF
23-
-DOTB_USE_GLUT=OFF
24-
-DOTB_USE_GLEW=OFF
25-
-DOTB_USE_GLFW=OFF
26-
27-
-DGDAL_SB_EXTRA_OPTIONS=--with-geos
28-

0 commit comments

Comments
 (0)