Commit afd5b206 authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch 'release-7.4' into 'master'

Release 7.4 (integration into master)

See merge request !853
parents 520df155 62539c0c
Pipeline #8577 passed with stage
in 19 minutes and 39 seconds
......@@ -136,17 +136,6 @@ legal-check:
after_script: []
#------------------------- prepare & build jobs --------------------------------
debian-build:
extends: .common-build
image: $BUILD_IMAGE_REGISTRY/otb-debian-native:testing
allow_failure: true
script:
- QT_QPA_PLATFORM=offscreen ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-testing-gcc
after_script:
- export CI_ALLOW_FAILURE=ON
- python3 -u CI/cdash_handler.py
needs:
- job: fast-build
## Ubuntu superbuild
ubuntu-xdk-prepare:
......@@ -173,22 +162,23 @@ ubuntu-xdk-build-doc:
## CentOS superbuild
centos-xdk-prepare:
extends: .common-prepare
image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:7.6.1810
script:
- ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=centos-6.6-gcc
- ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=centos-7.6.1810-gcc
centos-xdk-build:
extends: .common-build
image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:7.6.1810
script:
- export QT_QPA_PLATFORM=offscreen
- ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=centos-6.6-gcc
- ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=centos-6.6-gcc
- ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=centos-7.6.1810-gcc
- ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=centos-7.6.1810-gcc
- mv build_packages/OTB-*.run . || true
needs:
- job: centos-xdk-prepare
artifacts: true
## MacOS superbuild
macos-xdk-prepare:
extends: .common-prepare
......@@ -249,33 +239,7 @@ windows-10-build:
needs:
- job: windows-10-prepare
artifacts: true
# - Win8.1
windows-8-prepare:
extends: .windows-prepare
tags:
- windows8
script:
- call ./CI/dev_env.bat x86 xdk 8.1
- clcache.exe -s
- ctest -C Release -V -S CI/prepare_superbuild.cmake
- clcache.exe -s
windows-8-build:
extends: .windows-build
tags:
- windows8
script:
- call ./CI/dev_env.bat x86 otb 8.1
- clcache.exe -s
- ctest -V -S CI/main_superbuild.cmake
- clcache.exe -s
- ctest -V -S CI/main_packages.cmake
- move "build_packages\OTB-*.zip" . || dir build_packages
needs:
- job: windows-8-prepare
artifacts: true
#------------------------- QA related jobs -------------------------------------
ubuntu-xdk-qa-code-coverage:
extends: .common-build
......@@ -408,14 +372,12 @@ deploy:
needs:
- job: ubuntu-xdk-build-doc
artifacts: true
- job: centos-xdk-build
artifacts: true
- job: macos-xdk-build
artifacts: true
- job: windows-8-build
artifacts: true
- job: windows-10-build
artifacts: true
- job: centos-xdk-build
artifacts: true
update-archive:
tags:
......
......@@ -10,7 +10,7 @@ We are ready to release OTB version MAJOR.MINOR.PATCH. The following steps need
* [ ] In this story, make a list of blocking issues for the release (if any)
* [ ] [Update the SuperBuild archive](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#superbuild-archive) (if needed)
* [ ] Update release notes (walk the GitLab MR merged history and log all improvements)
* [ ] Update the date in RELEASE_NOTES.txt
* [ ] [Update the RELEASE_NOTES.txt](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/wikis/Help-for-release-actions#update-the-release_notestxt)
* [ ] Run Debian [spelling](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#spelling-check) checker
* [ ] Run shellcheck script from [OTB-Devutils/Scripts/](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils/blob/master/Scripts/run_shellcheck.sh)
* [ ] [Update translation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#translation-for-monteverdi-mapla) for Monteverdi and Mapla
......
......@@ -21,6 +21,7 @@ Christophe Palmann <christophe.palmann@c-s.fr>
Conrad Bielski <conrad.bielski@yahoo.com>
Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Cédric Traizet <cedric.traizet@c-s.fr> Cedric <cedric.traizet@c-s.fr>
Cédric Traizet <cedric.traizet@c-s.fr> Cédric Traizet <cedric.traizet@csgroup.eu>
Cédric Traizet <cedric.traizet@c-s.fr> Cédric Traizet <traizetc@cesbio.cnes.fr>
Cédric Traizet <cedric.traizet@c-s.fr> Traizet Cedric <cedric.traizet@cesbio.cnes.fr>
Cédric Traizet <cedric.traizet@c-s.fr> ctraizet <cedric.traizet@c-s.fr>
......
......@@ -48,7 +48,7 @@ class CDashException(Exception):
pass
"""
Handler class to retrieve build informations
Handler class to retrieve build information
"""
class Handler:
def __init__ (self):
......@@ -112,7 +112,7 @@ class Handler:
def GetBuildId (self, **kwargs):
"""
This function is returning the buildid. Dict can be passed with the
different informations
different information
"""
site = self.site
stamp = self.stamp
......
......@@ -140,6 +140,7 @@ excludedfiles = set([
'./Packaging/Files/qt.conf',
'./Packaging/Files/template.app/Contents/Info.plist',
'./Packaging/LICENSE',
'./Packaging/patchelf_remove_warning.diff',
'./Packaging/howto_update_makeself',
'./Packaging/otb_update_makeself',
'./SuperBuild/LICENSE',
......
......@@ -88,7 +88,7 @@ macro(get_xdk)
message( "clone_res = ${clone_res}" )
message( "clone_out = ${clone_out}" )
message( "clone_err = ${clone_err}" )
message( FATAL_ERROR "Problem in retreiving the archive")
message( FATAL_ERROR "Problem in retrieving the archive")
endif()
execute_process(
......
......@@ -191,7 +191,7 @@
#
# The macro ``SOMELIB_EXPORT_TEMPLATE`` should be used when declaring template
# classes or functions. The macro ``SOMELIB_EXPORT_EXPLICIT_TEMPLATE`` should be
# used when compiling explicit instanciations of template classes/functions.
# used when compiling explicit instantiations of template classes/functions.
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
......
......@@ -98,7 +98,7 @@ foreach(otb-module ${OTB_MODULES_ALL})
endforeach()
#----------------------------------------------------------------------
# Construct direct dependees (first-level) of each module
# Construct direct dependencies (first-level) of each module
foreach(otb-module1 ${OTB_MODULES_ALL})
foreach(otb-module2 ${OTB_MODULES_ALL})
list(FIND OTB_MODULE_${otb-module2}_DEPENDS ${otb-module1} _find_output)
......
......@@ -133,7 +133,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
set(OTB_VERSION_MAJOR "7")
set(OTB_VERSION_MINOR "3")
set(OTB_VERSION_MINOR "4")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
......
......@@ -21,7 +21,7 @@ opencv_ml_rtrees:
cat_ofs: [ 0, 0, 0, 0, 0, 0, 0, 0 ]
class_labels: [ 1, 2, 3, 4 ]
missing_subst: [ 0., 0., 0., 0., 0. ]
oob_error: 4.6082949308755760e-03
oob_error: 7.0093457943925233e-03
ntrees: 1
trees:
-
......@@ -31,96 +31,54 @@ opencv_ml_rtrees:
value: 3.
norm_class_idx: 2
splits:
- { var:2, quality:7.5442163085937500e+02,
le:1.5328201293945312e+02 }
- { var:3, quality:9.0135681152343750e+02,
le:1.6233364868164062e+02 }
-
depth: 1
value: 1.
norm_class_idx: 0
splits:
- { var:1, quality:4.9118682861328125e+02,
le:2.7847836303710938e+02 }
-
depth: 2
depth: 1
value: 3.
norm_class_idx: 2
splits:
- { var:3, quality:54., le:1.7026905822753906e+02 }
-
depth: 3
value: 1.
norm_class_idx: 0
- { var:0, quality:6.0693487548828125e+02,
le:2.3812664794921875e+02 }
-
depth: 3
depth: 2
value: 3.
norm_class_idx: 2
-
depth: 2
value: 1.
norm_class_idx: 0
splits:
- { var:0, quality:5.1905541992187500e+02,
le:2.1241384887695312e+02 }
- { var:1, quality:5.1901708984375000e+02,
le:3.1056585693359375e+02 }
-
depth: 3
value: 3.
norm_class_idx: 2
splits:
- { var:2, quality:39., le:1.3915295410156250e+02 }
-
depth: 4
value: 1.
norm_class_idx: 0
-
depth: 4
depth: 3
value: 3.
norm_class_idx: 2
-
depth: 3
value: 1.
norm_class_idx: 0
splits:
- { var:0, quality:4.8239999389648438e+02,
le:2.1394296264648438e+02 }
- { var:3, quality:117., le:2.9698010253906250e+02 }
-
depth: 4
value: 1.
norm_class_idx: 0
value: 2.
norm_class_idx: 1
-
depth: 4
value: 1.
norm_class_idx: 0
-
depth: 1
value: 3.
norm_class_idx: 2
splits:
- { var:3, quality:4.5026675415039062e+02,
le:3.0965036010742188e+02 }
-
depth: 2
value: 2.
norm_class_idx: 1
splits:
- { var:2, quality:97., le:1.6953280639648438e+02 }
-
depth: 3
value: 1.
norm_class_idx: 0
- { var:3, quality:174., le:3.3038479614257812e+02 }
-
depth: 3
value: 2.
norm_class_idx: 1
-
depth: 2
value: 3.
norm_class_idx: 2
splits:
- { var:1, quality:511., le:3.5593637084960938e+02 }
-
depth: 3
value: 3.
norm_class_idx: 2
-
depth: 3
value: 4.
......
Markdown is supported
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