Commit b0ffef94 authored by Guilhem Bonnefille's avatar Guilhem Bonnefille

Merge branch develop into 1834-test-data-lfs-registry

parents 11a09a1a b17e6b8f
Pipeline #492 passed with stage
in 25 minutes and 56 seconds
......@@ -7,7 +7,6 @@ stages:
- build
.general:
only: [merge_requests]
retry:
max: 2
when:
......@@ -16,14 +15,15 @@ stages:
native-build:
extends: .general
only: [merge_requests]
stage: build
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native:18.04
script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc
shark-build:
build:ubuntu-llvm:
extends: .general
stage: build
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-shark:18.04
script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-shark
......@@ -39,7 +39,6 @@ Once all blocking issues are closed, and the previous steps are done:
* [ ] Application online documentation
* [ ] WordPress page "Home" and "Download" pages
* [ ] Upload OTB source archive to [Zenodo](https://zenodo.org/) to create a unique Digital Object Identifier (DOI)
* [ ] Update OTB-Data-Examples.tgz on orfeo-toolbox (packages)
* [ ] Send email to mailing list to announce the release
* [ ] Release announcement on the blog
* [ ] Announcement on social networks (twitter, google+)
......
......@@ -45,7 +45,7 @@ OTB_USE_MUPARSER:BOOL=ON
OTB_USE_MUPARSERX:BOOL=ON
OTB_USE_OPENCV:BOOL=ON
OTB_USE_OPENGL:BOOL=ON
OTB_USE_OPENMP:BOOL=ON
OTB_USE_OPENMP:BOOL=OFF
OTB_USE_QT:BOOL=ON
OTB_USE_QWT:BOOL=ON
OTB_USE_SHARK:BOOL=ON
......@@ -59,8 +59,7 @@ OTB_WRAP_PYTHON:BOOL=ON
OTB_WRAP_PYTHON3:BOOL=ON")
set (otb_data_option
"OTB_DATA_ROOT:PATH=${OTB_DATA_ROOT}
OTB_DATA_USE_LARGEINPUT:BOOL=OFF
"OTB_DATA_USE_LARGEINPUT:BOOL=OFF
OTB_DATA_LARGEINPUT_ROOT:PATH=${OTB_LARGEINPUT_ROOT}")
set (cmake_configure_option
......
......@@ -26,7 +26,24 @@ set (ENV{LANG} "C") # Only ascii output
set (CTEST_BUILD_CONFIGURATION "Release")
set (CTEST_CMAKE_GENERATOR "Ninja")
set (CTEST_BUILD_NAME "$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}_to_$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}")
# Find the build name and CI profile
set(ci_profile wip)
set(ci_mr_source "$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}")
set(ci_mr_target "$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}")
set(ci_ref_name "$ENV{CI_COMMIT_REF_NAME}")
set (CTEST_BUILD_NAME "$ENV{CI_COMMIT_SHORT_SHA}")
if(ci_mr_source AND ci_mr_target)
set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} (${ci_mr_source} to ${ci_mr_target})")
set(ci_profile mr)
elseif(ci_ref_name)
set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} (${ci_ref_name})")
if("${ci_ref_name}" STREQUAL "develop")
set(ci_profile develop)
elseif("${ci_ref_name}" MATCHES "^release-[0-9]+\\.[0-9]+\$")
set(ci_profile release)
endif()
endif()
set (CTEST_SITE "${IMAGE_NAME}")
# Directory variable
......@@ -39,9 +56,9 @@ set (PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}")
set (CMAKE_COMMAND "cmake")
# Data directory setting
set (OTB_DATA_ROOT "${OTB_SOURCE_DIR}/otb-data/") # todo
set (OTB_LARGEINPUT_ROOT "") # todo
message(STATUS "CI profile : ${ci_profile}")
#The following file set the CONFIGURE_OPTIONS variable
set (CONFIGURE_OPTIONS "")
......@@ -74,6 +91,15 @@ if ( NOT _build_rv EQUAL 0 )
message( SEND_ERROR "An error occurs during ctest_build.")
endif()
# ctest_test(PARALLEL_LEVEL 8)
# Uncomment when ready for test
# ctest_test(PARALLEL_LEVEL 8
# RETURN_VALUE _test_rv
# CAPTURE_CMAKE_ERROR _test_error
# )
# if ( NOT _test_rv EQUAL 0 )
# ctest_submit()
# message( SEND_ERROR "An error occurs during ctest_test.")
# endif()
ctest_submit()
#
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Configuration options for ubuntu-18.04-llvm-shark-3.1.4
set(site_option
"opencv_INCLUDE_DIR:PATH=/usr/include
CMAKE_C_COMPILER:STRING=clang
CMAKE_CXX_COMPILER:STRING=clang++
CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld
CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld
CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld
CMAKE_C_COMPILER_LAUNCHER:STRING=ccache
CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache")
#
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Configuration options for ubuntu-18.04-llvm
set(site_option
"opencv_INCLUDE_DIR:PATH=/usr/include
OTB_USE_SHARK:BOOL=OFF
CMAKE_C_COMPILER:STRING=clang
CMAKE_CXX_COMPILER:STRING=clang++
CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld
CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld
CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld")
......@@ -63,7 +63,6 @@ set(CTEST_CUSTOM_COVERAGE_EXCLUDE
# Exclude SWIG wrappers files
".*/Modules/Wrappers/SWIG/src/python/otbApplicationPYTHON_wrap.*"
".*/Modules/Wrappers/SWIG/src/python3/otbApplicationPYTHON_wrap.*"
".*/Modules/Wrappers/SWIG/src/java/otbApplicationJAVA_wrap.*"
# Exclude Qt moc file
......
......@@ -26,7 +26,6 @@
# python is needed to verify the presence of the module name in the doxygen header
# Don't require it to not force the developers to install python to be able to build
# OTB. The tests will simply not be run if python is not available.
find_package(PythonInterp)
macro( otb_module_doxygen _name )
......
......@@ -26,7 +26,6 @@
# This does not force the developer to install python to be able to build OTB.
# The tests will simply not be run if python is unavailable.
find_package(PythonInterp)
# The maximum number of headers in a test. This helps limit memory issues,
# and the cppcheck tests. However, if this is not unity, there is a slight
......
......@@ -100,11 +100,24 @@ reset_qt_i18n_sources()
repository_status(${PROJECT_SOURCE_DIR} OTB_GIT_STATUS_MESSAGE)
# Find python stuff
# Version 3 is prefered before 2
set ( Python_ADDITIONAL_VERSIONS "3;2" )
set ( PythonInterp_FIND_REQUIRED ${OTB_WRAP_PYTHON} )
set ( PythonLibs_FIND_REQUIRED ${OTB_WRAP_PYTHON} )
find_package( PythonInterp )
if ( OTB_WRAP_PYTHON AND ( ${PYTHON_VERSION_MAJOR} EQUAL 2 ) )
message (WARNING "Python3 not found. There is no longer support of \
wrapping in python2 in OTB, but it can still be used.")
endif()
set (Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
find_package ( PythonLibs )
#-----------------------------------------------------------------------------
# Configure the default OTB_DATA_ROOT for the location of OTB Data.
find_path(OTB_DATA_ROOT
NAMES README-OTB-Data
HINTS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/Data
HINTS ${OTB_SOURCE_DIR}/Data $ENV{OTB_DATA_ROOT}
)
#mark_as_advanced(OTB_DATA_ROOT)
......@@ -152,9 +165,6 @@ endif()
if(NOT OTB_INSTALL_PYTHON_DIR)
set(OTB_INSTALL_PYTHON_DIR "${OTB_INSTALL_LIBRARY_DIR}/otb/python")
endif()
if(NOT OTB_INSTALL_PYTHON3_DIR)
set(OTB_INSTALL_PYTHON3_DIR "${OTB_INSTALL_LIBRARY_DIR}/otb/python3")
endif()
if(NOT OTB_INSTALL_JAVA_DIR)
set(OTB_INSTALL_JAVA_DIR "${OTB_INSTALL_LIBRARY_DIR}/otb/java")
endif()
......@@ -339,6 +349,7 @@ set(OTB_CONFIG_CODE "
set(OTB_MODULES_DIR \"${OTB_MODULES_DIR}\")")
set(OTB_CONFIG_CMAKE_DIR "${OTB_SOURCE_DIR}/CMake")
set(OTB_USE_FILE "${OTB_CONFIG_CMAKE_DIR}/UseOTB.cmake")
if(OTB_WRAP_PYTHON)
set(OTB_CONFIG_CODE "${OTB_CONFIG_CODE}
set(OTB_PYTHONPATH \"${OTB_BINARY_DIR}/${OTB_INSTALL_PYTHON_DIR}\")")
......@@ -366,10 +377,12 @@ set(OTB_CONFIG_CODE "${OTB_CONFIG_CODE}
set(OTB_MODULES_DIR \"\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/Modules\")")
set(OTB_USE_FILE "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/UseOTB.cmake")
set(OTB_CONFIG_CMAKE_DIR "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}")
if(OTB_WRAP_PYTHON)
set(OTB_CONFIG_CODE "${OTB_CONFIG_CODE}
set(OTB_PYTHONPATH \"\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PYTHON_DIR}\")")
endif()
set(OTB_CONFIG_APPLICATION_PATH "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_APP_DIR}")
set(OTB_CONFIG_TARGETS_CONDITION "")
set(OTB_CONFIG_TARGETS_FILE "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/OTBTargets.cmake")
......
Name: Construction Asphalt
Type: Manmade materials
Class: Road Asphalts and Tar
Subclass: Paving Asphalts
Particle Size: Solid
Sample No.: 0096UUUASP
Owner: National Photographic Interpretation Center
Wavelength Range: All
Origin: Spectra obtained from the Noncoventional Exploitation Factors
Data System of the National Photographic Interpretation Center.
Description: Gray and black construction asphalt. Sample was soiled
and weathered, with some limestone and quartz aggregate showing.
Measurement: Directional (10 Degree) Hemispherical Reflectance
First Column: X
Second Column: Y
X Units: Wavelength (micrometers)
Y Units: Reflectance (percent)
First X Value: 0.42
Last X Value: 14
Number of X Values: 491
Additional Information: None
0.42 5.5973
0.422 5.0368
0.424 5.1458
0.426 5.1924
0.428 5.1968
0.43 5.2187
0.432 5.3268
0.434 5.3491
0.436 5.4313
0.438 5.4089
0.44 5.4745
0.442 5.534
0.444 5.565
0.446 5.5904
0.448 5.62
0.45 5.6739
0.452 5.6835
0.454 5.6981
0.456 5.7376
0.458 5.763
0.46 5.8014
0.462 5.8272
0.464 5.8694
0.466 5.8734
0.468 5.9028
0.47 5.9192
0.472 5.9541
0.474 5.9709
0.476 6.0083
0.478 6.0323
0.48 6.0706
0.482 6.1068
0.484 6.1523
0.486 6.1869
0.488 6.2203
0.49 6.2637
0.492 6.3026
0.494 6.3333
0.496 6.3716
0.498 6.4011
0.5 6.4424
0.502 6.4689
0.504 6.4978
0.506 6.5332
0.508 6.5699
0.51 6.6061
0.512 6.6374
0.514 6.6767
0.516 6.7179
0.518 6.7546
0.52 6.7839
0.522 6.8185
0.524 6.8527
0.526 6.8873
0.528 6.9213
0.53 6.9535
0.532 6.9971
0.534 7.0309
0.536 7.0634
0.538 7.0902
0.54 7.1228
0.542 7.1544
0.544 7.1783
0.546 7.1991
0.548 7.2237
0.55 7.2445
0.552 7.256
0.554 7.2812
0.556 7.302
0.558 7.3233
0.56 7.3488
0.562 7.3315
0.564 7.2953
0.566 7.2602
0.568 7.2476
0.57 7.28
0.572 7.3781
0.574 7.526
0.576 7.6711
0.578 7.7609
0.58 7.7813
0.582 7.7564
0.584 7.7122
0.586 7.6718
0.588 7.6467
0.59 7.6458
0.592 7.6758
0.594 7.7355
0.596 7.8218
0.598 7.9271
0.6 8.0261
0.602 8.0895
0.604 8.0974
0.606 8.0696
0.608 8.0357
0.61 8.0242
0.612 8.0397
0.614 8.0629
0.616 8.0744
0.618 8.0755
0.62 8.0883
0.622 8.1347
0.624 8.215
0.626 8.3074
0.628 8.3891
0.63 8.4422
0.632 8.4675
0.634 8.4704
0.636 8.4564
0.638 8.4309
0.64 8.3994
0.642 8.3621
0.644 8.3003
0.646 8.2311
0.648 8.2109
0.65 8.2552
0.652 8.3361
0.654 8.4246
0.656 8.5016
0.658 8.5578
0.66 8.5845
0.662 8.58
0.664 8.5706
0.666 8.5898
0.668 8.6572
0.67 8.7373
0.672 8.7808
0.674 8.7416
0.676 8.644
0.678 8.5831
0.68 8.6572
0.682 8.8804
0.684 9.0086
0.686 9.0228
0.688 8.9814
0.69 8.9426
0.692 8.9488
0.694 8.9664
0.696 8.992
0.698 8.9892
0.7 9.0068
0.702 9.0374
0.704 9.0335
0.706 9.0615
0.708 9.0672
0.71 9.0962
0.712 9.1132
0.714 9.1271
0.716 9.137
0.718 9.175
0.72 9.2056
0.722 9.2081
0.724 9.2273
0.726 9.2576
0.728 9.2636
0.73 9.3119
0.732 9.3105
0.734 9.3332
0.736 9.3373
0.738 9.3468
0.74 9.3899
0.742 9.4072
0.744 9.4018
0.746 9.4232
0.748 9.4482
0.75 9.4667
0.752 9.4883
0.754 9.4959
0.756 9.531
0.758 9.5428
0.76 9.5726
0.762 9.5909
0.764 9.5873
0.766 9.6213
0.768 9.645
0.77 9.6749
0.772 9.6619
0.774 9.6865
0.776 9.7048
0.778 9.7227
0.78 9.7291
0.782 9.7497
0.784 9.7597
0.786 9.7816
0.788 9.795
0.79 9.799
0.792 9.828
0.794 9.8323
0.796 9.8529
0.798 9.876
0.8 9.8831
0.82 10.023
0.84 10.1668
0.86 10.3047
0.88 10.4228
0.9 10.5471
0.92 10.6607
0.94 10.7844
0.96 10.8866
0.98 10.9788
1 11.0766
1.02 11.1893
1.04 11.2555
1.06 11.3549
1.08 11.4576
1.1 11.5682
1.12 11.7147
1.14 11.8166
1.16 11.9642
1.18 12.1129
1.2 12.2529
1.22 12.3431
1.24 12.4564
1.26 12.5517
1.28 12.6254
1.3 12.6698
1.32 12.6995
1.34 12.7913
1.36 12.884
1.38 13.106
1.4 13.273
1.42 13.4247
1.44 13.5099
1.46 13.5411
1.48 13.5076
1.5 13.511
1.52 13.5601
1.54 13.5848
1.56 13.6305
1.58 13.6821
1.6 13.6729
1.62 13.6831
1.64 13.6905
1.66 13.7014
1.68 13.679
1.7 13.6508
1.72 13.6106
1.74 13.6567
1.76 13.6671
1.78 13.7125
1.8 13.7189
1.82 13.7086
1.84 13.7876
1.86 13.9519
1.88 14.1071
1.9 14.0613
1.92 14.1097
1.94 14.0783
1.96 14.0041
1.98 13.9615
2 13.9501
2.02 13.9523
2.04 13.9401
2.06 13.9229
2.08 13.9683
2.1 14.0116
2.12 13.9631
2.14 13.9123
2.16 13.899
2.18 13.864
2.2 13.7727
2.22 13.6607
2.24 13.5255
2.26 13.1379
2.28 12.6358
2.3 12.2838
2.32 11.7493
2.34 11.4557
2.36 12.1008
2.38 12.4359
2.4 12.4777
2.42 12.4316
2.44 12.2267
2.46 11.8086
2.48 11.4829
2.5 11.2192
2.52 10.9094
2.54 10.6294
2.56 11.7899
2.58 12.3438
2.6 12.5422
2.62 12.56
2.64 12.5447
2.66 12.3722
2.68 11.8862
2.7 9.7674
2.72 7.0735
2.74 4.9259
2.76 4.0441
2.78 4.1506
2.8 4.3137
2.82 4.3547
2.84 4.2482
2.86 4.2064
2.88 4.065
2.9 3.9704
2.92 3.926
2.94 3.8544
2.96 3.8761
2.98 3.9696
3 3.9043
3.02 3.9447
3.04 4.0495
3.06 4.0663
3.08 4.2392
3.1 4.3216
3.12 4.4423
3.14 4.5723
3.16 4.6851
3.18 4.8659
3.2 4.9844
3.22 5.0933
3.24 5.0893
3.26 5.0626
3.28 5.0258
3.3 4.9205
3.32 4.7413
3.34 4.1761
3.36 3.6941
3.38 3.2808
3.4 3.1572
3.42 3.0575
3.44 3.4294
3.46 3.6791
3.48 3.5294
3.5 3.5002
3.52 4.1856
3.54 5.2161
3.56 5.7059
3.58 6.1061
3.6 6.5981
3.62 6.8671
3.64 6.9918
3.66 6.9799
3.68 7.1
3.7 7.1327
3.72 7.0849
3.74 6.9887
3.76 6.8191
3.78 6.5286
3.8 5.9022
3.82 5.4993
3.84 5.2566
3.86 5.2319
3.88 5.1951
3.9 5.1605
3.92 5.109
3.94 4.948
3.96 4.63
3.98 4.542
4 4.8404
4.02 5.276
4.04 5.7087
4.06 6.203
4.08 6.5274
4.1 6.7665
4.12 6.9977
4.14 7.241
4.16 7.4063
4.18 7.5116
4.2 7.5637
4.22 7.6092
4.24 7.6228
4.26 7.5888
4.28 7.6188
4.3 7.5958
4.32 7.5519
4.34 7.5199