Commit 1a85ea70 authored by Cresson Remi's avatar Cresson Remi
Browse files

Merge branch 'develop' into 'master'

Release 4.2.2

See merge request !105
1 merge request!105Release 4.2.2
Pipeline #50958 passed with stages
in 124 minutes and 36 seconds
Showing with 60 additions and 19 deletions
+60 -19
variables: variables:
OTBTF_VERSION: 4.2.1 OTBTF_VERSION: 4.2.2
OTB_BUILD: /src/otb/build/OTB/build # Local OTB build directory OTB_BUILD: /src/otb/build/OTB/build # Local OTB build directory
OTBTF_SRC: /src/otbtf # Local OTBTF source directory OTBTF_SRC: /src/otbtf # Local OTBTF source directory
OTB_TEST_DIR: $OTB_BUILD/Testing/Temporary # OTB testing directory OTB_TEST_DIR: $OTB_BUILD/Testing/Temporary # OTB testing directory
...@@ -211,6 +211,12 @@ geos_enabled: ...@@ -211,6 +211,12 @@ geos_enabled:
script: script:
- python -m pytest --junitxml=$ARTIFACT_TEST_DIR/report_geos_enabled.xml $OTBTF_SRC/test/geos_test.py - python -m pytest --junitxml=$ARTIFACT_TEST_DIR/report_geos_enabled.xml $OTBTF_SRC/test/geos_test.py
planetary_computer:
extends: .applications_test_base
script:
- pip install pystac_client planetary_computer
- python -m pytest --junitxml=$ARTIFACT_TEST_DIR/report_pc_enabled.xml $OTBTF_SRC/test/pc_test.py
imports: imports:
extends: .applications_test_base extends: .applications_test_base
script: script:
......
...@@ -98,7 +98,7 @@ RUN cd tensorflow \ ...@@ -98,7 +98,7 @@ RUN cd tensorflow \
### OTB ### OTB
ARG GUI=false ARG GUI=false
ARG OTB=8.1.2 ARG OTB=d74ab47d4308591db4ed5a5ea3b820cef73a39fe
ARG OTBTESTS=false ARG OTBTESTS=false
RUN mkdir /src/otb RUN mkdir /src/otb
......
Version 4.2.2 (19 oct 2023)
----------------------------------------------------------------
* Add a test to ensure that planetary computer works in the OTBTF docker image
* Move to OTB version d74ab47d4308591db4ed5a5ea3b820cef73a39fe since 8.2.1 looks not up-to-date
Version 4.2.1 (5 oct 2023) Version 4.2.1 (5 oct 2023)
---------------------------------------------------------------- ----------------------------------------------------------------
* Fix a bug occuring when input images origins were not sharing the same pixel grid * Fix a bug occuring when input images origins were not sharing the same pixel grid
......
...@@ -25,12 +25,12 @@ Since OTBTF >= 3.2.1 you can find the latest docker images on ...@@ -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 | | Name | Os | TF | OTB | Description | Dev files | Compute capability |
|------------------------------------------------------------------------------------| ------------- |-------|-------| ---------------------- | --------- | ------------------ | |------------------------------------------------------------------------------------| ------------- |-------|-------| ---------------------- | --------- | ------------------ |
| **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.2-cpu** | Ubuntu Jammy | r2.12 | d74ab | 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.2-cpu-dev** | Ubuntu Jammy | r2.12 | d74ab | 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.2-gpu** | Ubuntu Jammy | r2.12 | d74ab | 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| | **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.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.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.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| | **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|
The list of older releases is available [here](#older-images). The list of older releases is available [here](#older-images).
...@@ -178,4 +178,10 @@ Here you can find the list of older releases of OTBTF: ...@@ -178,4 +178,10 @@ Here you can find the list of older releases of OTBTF:
| **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| | **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|
| **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| | **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|
| **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| | **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|
| **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|
...@@ -99,6 +99,7 @@ Every one can **contribute** to OTBTF. Just open a PR :) ...@@ -99,6 +99,7 @@ Every one can **contribute** to OTBTF. Just open a PR :)
## Additional resources ## Additional resources
- 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,
- The [*test* folder](https://github.com/remicres/otbtf/tree/master/test/) - The [*test* folder](https://github.com/remicres/otbtf/tree/master/test/)
of this repository contains various use-cases with commands, python codes, and of this repository contains various use-cases with commands, python codes, and
input/baseline data, input/baseline data,
......
...@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh: ...@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
setuptools.setup( setuptools.setup(
name="otbtf", name="otbtf",
version="4.2.1", version="4.2.2",
author="Remi Cresson", author="Remi Cresson",
author_email="remi.cresson@inrae.fr", author_email="remi.cresson@inrae.fr",
description="OTBTF: Orfeo ToolBox meets TensorFlow", description="OTBTF: Orfeo ToolBox meets TensorFlow",
......
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import pytest
import unittest
import planetary_computer
import pystac_client
import otbApplication
class PCTest(unittest.TestCase):
def test_pc(self):
api = pystac_client.Client.open(
'https://planetarycomputer.microsoft.com/api/stac/v1',
modifier=planetary_computer.sign_inplace,
)
res = api.search(
bbox=[4, 42.99, 4.5, 43.05],
datetime=["2022-01-01", "2022-01-09"],
collections=["sentinel-2-l2a"]
)
r = next(res.items())
url = r.assets["B04"].href
info = otbApplication.Registry.CreateApplication("ReadImageInfo")
info.SetParameterString("in", "/vsicurl/" + url)
info.Execute()
assert len(info.GetParameterString("projectionref")) > 1
if __name__ == '__main__':
unittest.main()
...@@ -10,4 +10,4 @@ libxi-dev ...@@ -10,4 +10,4 @@ libxi-dev
qtbase5-dev qtbase5-dev
qttools5-dev qttools5-dev
qttools5-dev-tools qttools5-dev-tools
xvfb xvfb
\ No newline at end of file
...@@ -17,12 +17,3 @@ ...@@ -17,12 +17,3 @@
-DUSE_SYSTEM_TINYXML=ON -DUSE_SYSTEM_TINYXML=ON
-DUSE_SYSTEM_ZLIB=ON -DUSE_SYSTEM_ZLIB=ON
-DUSE_SYSTEM_SWIG=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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment