Merge branch 'update_otbtf' into 'master'

Update otbtf docker image

See merge request !14

.gitlab-ci.yml

@@ -4,8 +4,8 @@ variables:
   GPU_IMAGE_NAME: $CI_REGISTRY_IMAGE:gpu
   DOCKER_BUILDKIT: 1
   DOCKER_DRIVER: overlay2
-  CPU_BASE_IMAGE: gitlab-registry.irstea.fr/remi.cresson/otbtf:4.1.0-cpu-dev
-  GPU_BASE_IMAGE: gitlab-registry.irstea.fr/remi.cresson/otbtf:4.1.0-gpu-dev
+  CPU_BASE_IMAGE: registry.forgemia.inra.fr/orfeo-toolbox/otbtf:4.3.1-cpu-dev
+  GPU_BASE_IMAGE: registry.forgemia.inra.fr/orfeo-toolbox/otbtf:4.3.1-gpu-dev
 
 workflow:
   rules:
@@ -74,9 +74,9 @@ codespell:
   stage: Tests
   before_script:
    - export PYTHONPATH=$PYTHONPATH:$PWD
-   - 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/
-   - mkdir tests_artifacts
+   - wget https://nextcloud.inrae.fr/s/aNTWLcH28zNomqk/download -O archive.zip && unzip archive.zip
    - export DECLOUD_DATA_DIR="$PWD/decloud_data"
+   - mkdir tests_artifacts
 
   artifacts:
     when: on_failure

Dockerfile

@@ -19,8 +19,8 @@ COPY docker/requirements.txt /tmp/requirements.txt
 RUN python3 -m pip install -r /tmp/requirements.txt
 
 # Build remote modules
-RUN cd /src/otb/otb/Modules/Remote/ && git clone https://gitlab.irstea.fr/remi.cresson/SimpleExtractionTools.git
-RUN cd /src/otb/otb/Modules/Remote/ && git clone https://gitlab.irstea.fr/remi.cresson/mlutils.git
+RUN cd /src/otb/otb/Modules/Remote/ && git clone https://forgemia.inra.fr/orfeo-toolbox/otb-simpleextractiontools.git
+RUN cd /src/otb/otb/Modules/Remote/ && git clone https://forgemia.inra.fr/orfeo-toolbox/otb-mlutils.git
 COPY . /src/otb/otb/Modules/Remote/decloud/
 RUN cd /src/otb/build/OTB/build && cmake /src/otb/otb/ -DModule_SimpleExtractionTools=ON -DModule_MLUtils=ON -DBUILD_TESTING=OFF -DModule_OTBDecloud=ON 
 RUN cd /src/otb/build/OTB/build && make -j $(nproc --all) install

tests/inference_unittest.py

@@ -24,10 +24,10 @@ class InferenceTest(DecloudTest):
         system.basic_logging_init()
 
         # Baseline
-        baseline_path = self.get_path("baseline/reconstructed_baseline_w_mosaic.tif")
+        baseline_path = self.get_path("baseline/reconstructed_baseline.tif")
 
         # Model
-        model_path = self.get_path("models/crga_os2david_occitanie_pretrained")
+        model_path = self.get_path("models/crga_os2_david_116-migration-tensorflow-2_466a1_bt32_bv32_lr7e-05_40gpus")
 
         # Input sources
         s1_tm1 = [
@@ -93,7 +93,7 @@ class InferenceTest(DecloudTest):
         baseline_path = self.get_path("baseline/reconstructed_baseline_w_preprocessor.tif")
 
         # Model
-        model_path = self.get_path("models/crga_os2david_occitanie_pretrained")
+        model_path = self.get_path("models/crga_os2_david_116-migration-tensorflow-2_466a1_bt32_bv32_lr7e-05_40gpus")
 
         # Input sources
         s1_tm1 = [