Commit 176961a7 authored by Cresson Remi's avatar Cresson Remi
Browse files

Merge branch 'develop' into 'master'

Hotfix release 4.0.0

See merge request !82
1 merge request!82Hotfix release 4.0.0
Pipeline #46031 canceled with stages
in 21 minutes and 18 seconds
Showing with 10 additions and 10 deletions
+10 -10
...@@ -19,8 +19,7 @@ variables: ...@@ -19,8 +19,7 @@ variables:
DOCKERHUB_BASE: mdl4eo/otbtf DOCKERHUB_BASE: mdl4eo/otbtf
DOCKERHUB_IMAGE_BASE: ${DOCKERHUB_BASE}:${OTBTF_VERSION} DOCKERHUB_IMAGE_BASE: ${DOCKERHUB_BASE}:${OTBTF_VERSION}
CPU_BASE_IMG: ubuntu:22.04 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: workflow:
rules: rules:
- if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME =~ /master/ # Execute jobs in merge request context, or commit in master branch - if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME =~ /master/ # Execute jobs in merge request context, or commit in master branch
......
# OTBTF: Orfeo ToolBox meets TensorFlow # OTBTF: Orfeo ToolBox meets TensorFlow
<p align="center"> <p align="center">
<img src="images/logo.png" width="160px"> <img src="doc/images/logo.png" width="160px">
<br> <br>
<a href="https://gitlab.irstea.fr/remi.cresson/otbtf/-/releases"> <a href="https://gitlab.irstea.fr/remi.cresson/otbtf/-/releases">
<img src="https://gitlab.irstea.fr/remi.cresson/otbtf/-/badges/release.svg"> <img src="https://gitlab.irstea.fr/remi.cresson/otbtf/-/badges/release.svg">
......
Version 4.0.0alpha (4 apr 2023) Version 4.0.0 (5 apr 2023)
---------------------------------------------------------------- ----------------------------------------------------------------
* Big improvement of the documentation: * Big improvement of the documentation:
- Re-structure the entire doc, remove deprecated stuff, etc. - Re-structure the entire doc, remove deprecated stuff, etc.
...@@ -7,8 +7,7 @@ Version 4.0.0alpha (4 apr 2023) ...@@ -7,8 +7,7 @@ Version 4.0.0alpha (4 apr 2023)
- Add a new section on the python API (end-to-end tutorial) - Add a new section on the python API (end-to-end tutorial)
- A lot of new sections: distributed training, etc... - A lot of new sections: distributed training, etc...
* Refactoring all the python classes to enforce pep8 * Refactoring all the python classes to enforce pep8
* Ubuntu version: 22.04 * Base images: ubuntu:22.04 (cpu), nvidia/cuda:12.0.1-cudnn8-devel-ubuntu22.04 (gpu)
* Cuda version: 12.1.0
* Tensorflow version: 2.12.0 * Tensorflow version: 2.12.0
* Fixed Tensorflow error "Cannot register 2 metrics with the same name" + new test * Fixed Tensorflow error "Cannot register 2 metrics with the same name" + new test
* Faster CI build thanks to bazel remote cache * Faster CI build thanks to bazel remote cache
......
!!! Warning !!! Info
This section is for educational purposes. No coding skills are required, 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 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 v1. If you are interested in more similar examples, please read the
process, the Tensorflow API v2 with Keras is the way to go.
If you are interested in more similar examples, please read the
[Tensorflow v1 models examples](reference/otbtf/examples/tensorflow_v1x/__init__.md) [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 ## TensorflowModelTrain
......
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