From ee9601c87cf0e55cb9da49d6f32ad0c36140a7fa Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Wed, 5 Apr 2023 10:45:18 +0200
Subject: [PATCH 1/4] ADD: change base image for gpu
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c7c2dea..2cc93144 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,7 @@ variables:
DOCKERHUB_BASE: mdl4eo/otbtf
DOCKERHUB_IMAGE_BASE: ${DOCKERHUB_BASE}:${OTBTF_VERSION}
CPU_BASE_IMG: ubuntu:22.04
- GPU_BASE_IMG: nvidia/cuda:12.1.0-devel-ubuntu22.04
-
+ GPU_BASE_IMG: nvidia/cuda:12.0.1-cudnn8-devel-ubuntu22.04
workflow:
rules:
- if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME =~ /master/ # Execute jobs in merge request context, or commit in master branch
--
GitLab
From 62053fd5c2eb8e126507d984769b2343e4ce15ee Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Wed, 5 Apr 2023 10:45:32 +0200
Subject: [PATCH 2/4] DOC: update release notes
---
RELEASE_NOTES.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index e0ac4a4e..fd30467c 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,4 +1,4 @@
-Version 4.0.0alpha (4 apr 2023)
+Version 4.0.0 (5 apr 2023)
----------------------------------------------------------------
* Big improvement of the documentation:
- Re-structure the entire doc, remove deprecated stuff, etc.
@@ -7,8 +7,7 @@ Version 4.0.0alpha (4 apr 2023)
- Add a new section on the python API (end-to-end tutorial)
- A lot of new sections: distributed training, etc...
* Refactoring all the python classes to enforce pep8
-* Ubuntu version: 22.04
-* Cuda version: 12.1.0
+* Base images: ubuntu:22.04 (cpu), nvidia/cuda:12.0.1-cudnn8-devel-ubuntu22.04 (gpu)
* Tensorflow version: 2.12.0
* Fixed Tensorflow error "Cannot register 2 metrics with the same name" + new test
* Faster CI build thanks to bazel remote cache
--
GitLab
From e6e198c6d16a06890475830606308f2736c6f3f0 Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Wed, 5 Apr 2023 12:46:18 +0200
Subject: [PATCH 3/4] DOC: fix logo url
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5529823f..f4eac4f2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# OTBTF: Orfeo ToolBox meets TensorFlow
<p align="center">
-<img src="images/logo.png" width="160px">
+<img src="doc/images/logo.png" width="160px">
<br>
<a href="https://gitlab.irstea.fr/remi.cresson/otbtf/-/releases">
<img src="https://gitlab.irstea.fr/remi.cresson/otbtf/-/badges/release.svg">
--
GitLab
From 30cad2f528c2a879ac30c46ac235ca75dbfebc07 Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Wed, 5 Apr 2023 12:51:37 +0200
Subject: [PATCH 4/4] DOC: add missing link to tutorial with keras API
---
doc/app_training.md | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/doc/app_training.md b/doc/app_training.md
index 5ea6efaa..eb3f4708 100644
--- a/doc/app_training.md
+++ b/doc/app_training.md
@@ -1,11 +1,13 @@
-!!! Warning
+!!! Info
This section is for educational purposes. No coding skills are required,
and it's easy to train an existing model built with the Tensorflow API
- v1. To have a full control over the model implementation and training
- process, the Tensorflow API v2 with Keras is the way to go.
- If you are interested in more similar examples, please read the
+ v1. If you are interested in more similar examples, please read the
[Tensorflow v1 models examples](reference/otbtf/examples/tensorflow_v1x/__init__.md)
+ However, to have a full control over the model implementation and training
+ process, the [Tensorflow API v2 with Keras](api_tutorial.html) is the
+ recommended approach (see also
+ [distributed training](api_distributed.html)).
## TensorflowModelTrain
--
GitLab