From a018b9ce75fb81c4ad23f7258207033e5bde56c0 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Fri, 10 May 2019 13:33:02 -0400 Subject: [PATCH 1/4] Bump GCC to 9 on osx Travis-CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ca50475d..a72bfde6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: os: osx env: - BUILD_TYPE="InstallScript" - GCC=8 + GCC=9 OSX_PACKAGES="gcc shellcheck cmake mpich" # cmake should be removed, but we should be installing binaries # because building from source takes forever From 9619bf47046a9dc837cb3ccb123288421346a7e6 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Fri, 10 May 2019 15:07:51 -0400 Subject: [PATCH 2/4] Fix compilation error of test w/ GCC-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - GFortran 9.1 complains about initializing a precedure pointer to an internal procedure - ¯\_(ツ)_/¯ --- src/tests/integration/pde_solvers/coarrayBurgers/main.F90 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/main.F90 b/src/tests/integration/pde_solvers/coarrayBurgers/main.F90 index 5225e2b13..0bfc71560 100644 --- a/src/tests/integration/pde_solvers/coarrayBurgers/main.F90 +++ b/src/tests/integration/pde_solvers/coarrayBurgers/main.F90 @@ -8,7 +8,9 @@ program main real(real64), parameter :: nu=1.,final_time=0.6_real64,tolerance=1.E-3_real64,safety_factor=0.1_real64 real(real64) :: time=0.,dt,dx integer, parameter :: nodes=16 - procedure(initial_condition), pointer :: initial_u=>ten_sin + procedure(initial_condition), pointer :: initial_u=>null() + + initial_u => ten_sin #ifdef TAU call TAU_PROFILE_SET_NODE(this_image()-1) ! Start TAU (Cray or GNU compiler) From 27409ca842fc5bae82c22755081f920fbdac39c1 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Fri, 10 May 2019 15:31:02 -0400 Subject: [PATCH 3/4] Add a fancy install banner during configuration --- CMakeLists.txt | 24 +++++++++++++----------- cmake/Banner.txt.in | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 cmake/Banner.txt.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a70f529c..717fdf9cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,15 +17,6 @@ set ( CMAKE_CONFIGURATION_TYPES "Debug" "Release" "MinSizeRel" "RelWithDebInfo" set ( CMAKE_BUILD_TYPE "Release" CACHE STRING "Select which configuration to build." ) set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} ) -message( STATUS - " -============================================================ - Building OpenCoarrays configuration: ${CMAKE_BUILD_TYPE} -============================================================ -") - -message( STATUS "Running with CMake from: ${CMAKE_COMMAND}" ) -message( STATUS "Current source dir (for OpenCoarrays): ${CMAKE_CURRENT_SOURCE_DIR}") # Add option and check environment to determine if developer tests should be run set( _TF OFF ) @@ -52,8 +43,7 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?" OpenCoarraysVersion "${first_line}") if((NOT (OpenCoarraysVersion MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?")) AND (EXISTS "${CMAKE_SOURCE_DIR}/.git")) - message( STATUS "Build from git repository detected") - find_package(Git) + find_package(Git QUIET) if(GIT_FOUND) execute_process(COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" @@ -96,6 +86,18 @@ string(REGEX REPLACE "-rc[0-9]+$" ".0" OPENCOARRAYS_CMAKE_PROJECT_VERSION "${OpenCoarraysVersion}") +file(READ "${CMAKE_CURRENT_LIST_DIR}/cmake/Banner.txt.in" OC_BANNER) +string(CONFIGURE "${OC_BANNER}" OC_BANNER @ONLY) + +message(STATUS "${OC_BANNER}") + +if((NOT (OpenCoarraysVersion MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?")) AND (EXISTS "${CMAKE_SOURCE_DIR}/.git")) + message( STATUS "Build from git repository detected") +endif() + +message( STATUS "Running with CMake from: ${CMAKE_COMMAND}" ) +message( STATUS "Current source dir (for OpenCoarrays): ${CMAKE_CURRENT_SOURCE_DIR}") + project(opencoarrays VERSION "${OPENCOARRAYS_CMAKE_PROJECT_VERSION}" LANGUAGES C Fortran) if(DEFINED CMAKE_BUILD_TYPE AND "${CMAKE_BUILD_TYPE}" MATCHES "[Rr][Ee][Ll]") diff --git a/cmake/Banner.txt.in b/cmake/Banner.txt.in new file mode 100644 index 000000000..c6099b98e --- /dev/null +++ b/cmake/Banner.txt.in @@ -0,0 +1,14 @@ + + + _/_/ _/_/_/ + _/ _/ _/_/_/ _/_/ _/_/_/ _/ _/_/ _/_/_/ _/ _/_/ _/ _/_/ _/_/_/ _/ _/ _/_/_/ + _/ _/ _/ _/ _/_/_/_/ _/ _/ _/ _/ _/ _/ _/ _/_/ _/_/ _/ _/ _/ _/ _/_/ + _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ + _/_/ _/_/_/ _/_/_/ _/ _/ _/_/_/ _/_/ _/_/_/ _/ _/ _/_/_/ _/_/_/ _/_/_/ + _/ _/ + _/ _/_/ + + + Build Type: @CMAKE_BUILD_TYPE@ + Version: @full_git_describe@ + From 0beb35b3d8656e3dbaa78d390a127367394ff9a8 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Fri, 10 May 2019 15:47:19 -0400 Subject: [PATCH 4/4] Fit banner on smaller terminals & tweak format --- CMakeLists.txt | 4 ++-- cmake/Banner.txt.in | 31 ++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 717fdf9cf..341903f34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,10 +88,10 @@ string(REGEX REPLACE "-rc[0-9]+$" file(READ "${CMAKE_CURRENT_LIST_DIR}/cmake/Banner.txt.in" OC_BANNER) string(CONFIGURE "${OC_BANNER}" OC_BANNER @ONLY) - +string(STRIP "${OC_BANNER}" OC_BANNER) message(STATUS "${OC_BANNER}") -if((NOT (OpenCoarraysVersion MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?")) AND (EXISTS "${CMAKE_SOURCE_DIR}/.git")) +if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git") message( STATUS "Build from git repository detected") endif() diff --git a/cmake/Banner.txt.in b/cmake/Banner.txt.in index c6099b98e..c05962995 100644 --- a/cmake/Banner.txt.in +++ b/cmake/Banner.txt.in @@ -1,14 +1,23 @@ +------------------------------------------------------------------------------- -- + _/_/ + _/ _/ _/_/_/ _/_/ _/_/_/ + _/ _/ _/ _/ _/_/_/_/ _/ _/ +_/ _/ _/ _/ _/ _/ _/ + _/_/ _/_/_/ _/_/_/ _/ _/ + _/ + _/ - _/_/ _/_/_/ - _/ _/ _/_/_/ _/_/ _/_/_/ _/ _/_/ _/_/_/ _/ _/_/ _/ _/_/ _/_/_/ _/ _/ _/_/_/ - _/ _/ _/ _/ _/_/_/_/ _/ _/ _/ _/ _/ _/ _/ _/_/ _/_/ _/ _/ _/ _/ _/_/ - _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ - _/_/ _/_/_/ _/_/_/ _/ _/ _/_/_/ _/_/ _/_/_/ _/ _/ _/_/_/ _/_/_/ _/_/_/ - _/ _/ - _/ _/_/ - - - Build Type: @CMAKE_BUILD_TYPE@ - Version: @full_git_describe@ + _/_/_/ + _/ _/_/ _/_/_/ _/ _/_/ _/ _/_/ _/_/_/ _/ _/ _/_/_/ + _/ _/ _/ _/ _/ _/_/ _/_/ _/ _/ _/ _/ _/_/ +_/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ + _/_/_/ _/_/ _/_/_/ _/ _/ _/_/_/ _/_/_/ _/_/_/ + _/ + _/_/ + OpenCoarrays + """""""""""" + Build Type: @CMAKE_BUILD_TYPE@ + Version: @full_git_describe@ +-- ------------------------------------------------------------------------------ --