diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20f6377..3295b83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - OTBTF_VERSION: 4.2.1 + OTBTF_VERSION: 4.2.2 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 @@ -211,6 +211,12 @@ geos_enabled: script: - 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: extends: .applications_test_base script: diff --git a/Dockerfile b/Dockerfile index b4280b2..8d1ee2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,7 +98,7 @@ RUN cd tensorflow \ ### OTB ARG GUI=false -ARG OTB=8.1.2 +ARG OTB=d74ab47d4308591db4ed5a5ea3b820cef73a39fe ARG OTBTESTS=false RUN mkdir /src/otb diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 219aa15..8a63b56 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,3 +1,8 @@ +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) ---------------------------------------------------------------- * Fix a bug occuring when input images origins were not sharing the same pixel grid diff --git a/doc/docker_use.md b/doc/docker_use.md index 1194b35..b503205 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.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| +| **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.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.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.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| 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: | **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-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| diff --git a/setup.py b/setup.py index e2ac3e5..6c985eb 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name="otbtf", - version="4.2.1", + version="4.2.2", author="Remi Cresson", author_email="remi.cresson@inrae.fr", description="OTBTF: Orfeo ToolBox meets TensorFlow", diff --git a/test/pc_test.py b/test/pc_test.py new file mode 100644 index 0000000..34544d0 --- /dev/null +++ b/test/pc_test.py @@ -0,0 +1,32 @@ +#!/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() diff --git a/tools/docker/build-deps-gui.txt b/tools/docker/build-deps-gui.txt index af6f6b8..1f1f6cf 100644 --- a/tools/docker/build-deps-gui.txt +++ b/tools/docker/build-deps-gui.txt @@ -10,4 +10,4 @@ libxi-dev qtbase5-dev qttools5-dev qttools5-dev-tools -xvfb \ No newline at end of file +xvfb diff --git a/tools/docker/build-flags-otb.txt b/tools/docker/build-flags-otb.txt index f72d7c7..95b8462 100644 --- a/tools/docker/build-flags-otb.txt +++ b/tools/docker/build-flags-otb.txt @@ -17,12 +17,3 @@ -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 -