diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ea0bee..bd41bbf 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 @@ -146,6 +146,7 @@ pages: - public .tests_base: + tags: [godzilla] artifacts: paths: - $ARTIFACT_TEST_DIR/*.* @@ -156,7 +157,14 @@ ctest: extends: .tests_base stage: Test script: - - cd $OTB_BUILD/ && sudo ctest -L OTBTensorflow # Run ctest + - sudo apt update && sudo apt install -y git-lfs + - cd /src/otb/otb && sudo git lfs fetch --all && sudo git lfs pull + - 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 @@ -194,7 +202,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 diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 28cda33..af4e442 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 836bc13..8121106 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| diff --git a/setup.py b/setup.py index c4d7d67..8519fb1 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ 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", diff --git a/tools/docker/build-deps-cli.txt b/tools/docker/build-deps-cli.txt index 6b7432f..49a4572 100644 --- a/tools/docker/build-deps-cli.txt +++ b/tools/docker/build-deps-cli.txt @@ -17,33 +17,9 @@ 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 +sudo +zip \ No newline at end of file