From 83ae279e4453b76e61f7c9e1e43efa91d82012cf Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Mon, 17 Jun 2019 17:16:02 +0200 Subject: [PATCH 01/10] Add a new job for large input --- .gitlab-ci.yml | 11 +++++++++++ CI/configure_options.cmake | 5 +++-- CI/main_ci.cmake | 17 +++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2b679edbf..9ed1b80996 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,3 +147,14 @@ macos-superbuild-build: - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild dependencies: - macos-superbuild-prepare + +large-input-build: + tags: + - macos + extends: .common-build + only : [ branches ] + script: + - ctest -V -S CI/main_superbuild.cmake \ + -DIMAGE_NAME:string=otb-macos-superbuild -DOTB_DATA_USE_LARGEINPUT:BOOL=ON + dependencies: + - macos-superbuild-prepare diff --git a/CI/configure_options.cmake b/CI/configure_options.cmake index efc9f83144..a7ff9dc36d 100644 --- a/CI/configure_options.cmake +++ b/CI/configure_options.cmake @@ -58,9 +58,10 @@ OTB_USE_SSE_FLAGS:BOOL=ON") set (otb_wrap_option "OTB_WRAP_PYTHON:BOOL=ON") +# Those otions are set in main_ci.cmake set (otb_data_option -"OTB_DATA_USE_LARGEINPUT:BOOL=OFF -OTB_DATA_LARGEINPUT_ROOT:PATH=${OTB_LARGEINPUT_ROOT}") +"OTB_DATA_USE_LARGEINPUT:BOOL=${OTB_DATA_USE_LARGEINPUT} +OTB_DATA_LARGEINPUT_ROOT:PATH=${OTB_DATA_LARGEINPUT_ROOT}") set (cmake_configure_option "CMAKE_BUILD_TYPE=${CTEST_BUILD_CONFIGURATION} diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake index 6c116722e8..3e76715efc 100644 --- a/CI/main_ci.cmake +++ b/CI/main_ci.cmake @@ -76,8 +76,21 @@ set (PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}") # Ctest command value set (CMAKE_COMMAND "cmake") -# Data directory setting -set (OTB_LARGEINPUT_ROOT "") # todo +# Large Input Data directory setting +if ( OTB_DATA_USE_LARGEINPUT ) + find_path( OTB_DATA_LARGEINPUT_ROOT + NAMES OTBData.readme + HINTS ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput ${OTB_LARGEINPUT_ROOT} + ) +# For the CI the directory should be in +# ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput + if( ${OTB_DATA_LARGEINPUT_ROOT} STREQUAL "${OTB_DATA_LARGEINPUT_ROOT}-NOTFOUND" ) + message( WARNING "Option -DOTB_DATA_USE_LARGEINPUT=ON is used but we \ +could not found the OTBData.readme file. Make sure you set the \ +OTB_DATA_LARGEINPUT_ROOT variable correctly. +OTB_DATA_USE_LARGEINPUT will be set to OFF.") + set( OTB_DATA_USE_LARGEINPUT "OFF") +endif() message(STATUS "CI profile : ${ci_profile}") -- GitLab From 59032a8c47803caa56cff270648ca0ac4fb8d5a1 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Mon, 17 Jun 2019 17:17:01 +0200 Subject: [PATCH 02/10] Add the mac prepare for branches to test large input job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ed1b80996..5d8d328a9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,6 +128,7 @@ macos-superbuild-prepare: tags: - macos extends: .common-prepare + only : [ branches ] before_script: # No need to install lfs as this machine is persistent # No need to do git config -- GitLab From 24f4e3272502e4c0b0a920905fd73204f8e547bd Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Mon, 17 Jun 2019 17:35:37 +0200 Subject: [PATCH 03/10] Typo in cmake main_ci.cmake --- CI/main_ci.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake index 3e76715efc..c0d1daac57 100644 --- a/CI/main_ci.cmake +++ b/CI/main_ci.cmake @@ -80,16 +80,17 @@ set (CMAKE_COMMAND "cmake") if ( OTB_DATA_USE_LARGEINPUT ) find_path( OTB_DATA_LARGEINPUT_ROOT NAMES OTBData.readme - HINTS ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput ${OTB_LARGEINPUT_ROOT} + HINTS ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput ) # For the CI the directory should be in # ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput - if( ${OTB_DATA_LARGEINPUT_ROOT} STREQUAL "${OTB_DATA_LARGEINPUT_ROOT}-NOTFOUND" ) + if( NOT OTB_DATA_LARGEINPUT_ROOT ) message( WARNING "Option -DOTB_DATA_USE_LARGEINPUT=ON is used but we \ could not found the OTBData.readme file. Make sure you set the \ OTB_DATA_LARGEINPUT_ROOT variable correctly. OTB_DATA_USE_LARGEINPUT will be set to OFF.") - set( OTB_DATA_USE_LARGEINPUT "OFF") + set( OTB_DATA_USE_LARGEINPUT "OFF") + endif() endif() message(STATUS "CI profile : ${ci_profile}") -- GitLab From ed782b0d01f4bf147ddf4be9bece737700daa429 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Mon, 17 Jun 2019 17:51:29 +0200 Subject: [PATCH 04/10] Command on one line --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d8d328a9d..dd2ca0f740 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,7 +155,6 @@ large-input-build: extends: .common-build only : [ branches ] script: - - ctest -V -S CI/main_superbuild.cmake \ - -DIMAGE_NAME:string=otb-macos-superbuild -DOTB_DATA_USE_LARGEINPUT:BOOL=ON + - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild -DOTB_DATA_USE_LARGEINPUT:BOOL=ON dependencies: - macos-superbuild-prepare -- GitLab From bfc80bbfaa41083b6662735579fd30b74cff854d Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Wed, 19 Jun 2019 10:09:47 +0200 Subject: [PATCH 05/10] Add large input for every mac job --- .gitlab-ci.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd2ca0f740..a3ca6ac9d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,18 +143,8 @@ macos-superbuild-build: tags: - macos extends: .common-build - script: - - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild - dependencies: - - macos-superbuild-prepare - -large-input-build: - tags: - - macos - extends: .common-build - only : [ branches ] script: - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild -DOTB_DATA_USE_LARGEINPUT:BOOL=ON + - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild dependencies: - macos-superbuild-prepare -- GitLab From c815c1456b38cd0178a6b00f7af1fee470bf84c7 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Wed, 19 Jun 2019 10:10:19 +0200 Subject: [PATCH 06/10] Remove mac test on branches --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3ca6ac9d8..039d13a20d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,7 +128,6 @@ macos-superbuild-prepare: tags: - macos extends: .common-prepare - only : [ branches ] before_script: # No need to install lfs as this machine is persistent # No need to do git config -- GitLab From 00d8f0c8d4c87700c7058ca0325794f480e7a853 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Thu, 20 Jun 2019 10:41:00 +0200 Subject: [PATCH 07/10] Change way of handling Large input --- CI/configure_options.cmake | 5 ----- CI/main_ci.cmake | 17 ----------------- CI/otb-macos-superbuild.cmake | 4 +++- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/CI/configure_options.cmake b/CI/configure_options.cmake index a7ff9dc36d..b9ad3b9291 100644 --- a/CI/configure_options.cmake +++ b/CI/configure_options.cmake @@ -58,11 +58,6 @@ OTB_USE_SSE_FLAGS:BOOL=ON") set (otb_wrap_option "OTB_WRAP_PYTHON:BOOL=ON") -# Those otions are set in main_ci.cmake -set (otb_data_option -"OTB_DATA_USE_LARGEINPUT:BOOL=${OTB_DATA_USE_LARGEINPUT} -OTB_DATA_LARGEINPUT_ROOT:PATH=${OTB_DATA_LARGEINPUT_ROOT}") - set (cmake_configure_option "CMAKE_BUILD_TYPE=${CTEST_BUILD_CONFIGURATION} CMAKE_INSTALL_PREFIX:PATH=${CTEST_INSTALL_DIRECTORY}") diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake index c0d1daac57..c2bfb2df5b 100644 --- a/CI/main_ci.cmake +++ b/CI/main_ci.cmake @@ -76,23 +76,6 @@ set (PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}") # Ctest command value set (CMAKE_COMMAND "cmake") -# Large Input Data directory setting -if ( OTB_DATA_USE_LARGEINPUT ) - find_path( OTB_DATA_LARGEINPUT_ROOT - NAMES OTBData.readme - HINTS ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput - ) -# For the CI the directory should be in -# ${CTEST_SOURCE_DIRECTORY}/../../OTB-LargeInput - if( NOT OTB_DATA_LARGEINPUT_ROOT ) - message( WARNING "Option -DOTB_DATA_USE_LARGEINPUT=ON is used but we \ -could not found the OTBData.readme file. Make sure you set the \ -OTB_DATA_LARGEINPUT_ROOT variable correctly. -OTB_DATA_USE_LARGEINPUT will be set to OFF.") - set( OTB_DATA_USE_LARGEINPUT "OFF") - endif() -endif() - message(STATUS "CI profile : ${ci_profile}") #The following file set the CONFIGURE_OPTIONS variable diff --git a/CI/otb-macos-superbuild.cmake b/CI/otb-macos-superbuild.cmake index 8fa073741d..7b6f1cc43c 100644 --- a/CI/otb-macos-superbuild.cmake +++ b/CI/otb-macos-superbuild.cmake @@ -24,4 +24,6 @@ set(site_option "OTB_USE_GLUT=OFF OTB_USE_GLFW=OFF CMAKE_C_COMPILER_LAUNCHER:STRING=ccache -CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache") +CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache +OTB_DATA_USE_LARGEINPUT:BOOL=ON") +# Large input path are in an environment variable on macOS -- GitLab From 0cce450fb09a795d5850f60e0b3b0603c8781e97 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Thu, 20 Jun 2019 10:46:11 +0200 Subject: [PATCH 08/10] Add the environment variable in gitlab-ci for mac --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ff2259892..2ee61e4a0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,8 +148,10 @@ macos-superbuild-build: tags: - macos extends: .common-build + variables: + - OTB_DATA_LARGEINPUT_ROOT: "/Users/otbbot/OTB-LargeInput" script: - - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild -DOTB_DATA_USE_LARGEINPUT:BOOL=ON + - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild dependencies: - macos-superbuild-prepare -- GitLab From 69a86be489dfb4e570c37ce363e5253deb73ca88 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Fri, 21 Jun 2019 08:42:39 +0200 Subject: [PATCH 09/10] Fix typo in variables --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d3d50da5e..07f2e4dad0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,7 +149,7 @@ macos-superbuild-build: - macos extends: .common-build variables: - - OTB_DATA_LARGEINPUT_ROOT: "/Users/otbbot/OTB-LargeInput" + OTB_DATA_LARGEINPUT_ROOT: "/Users/otbbot/OTB-LargeInput" script: - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild -- GitLab From a288a7b03d1680d2626159ff88ef5f2a9a7af16d Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau Date: Fri, 21 Jun 2019 10:22:04 +0200 Subject: [PATCH 10/10] Remove variable --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07f2e4dad0..2fc9879a61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,8 +148,6 @@ macos-superbuild-build: tags: - macos extends: .common-build - variables: - OTB_DATA_LARGEINPUT_ROOT: "/Users/otbbot/OTB-LargeInput" script: - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild -- GitLab