Merge pull request #633 from chuckatkins/change-build-defaults

Change build defaults

CMakeLists.txt

@@ -68,7 +68,7 @@ include(ADIOSFunctions)
 
 # Default to a debug build if not specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
 endif()
 
 # Force C++11 and C99
@@ -126,7 +126,7 @@ adios_option(DataMan   "Enable support for DataMan" AUTO)
 adios_option(SST       "Enable support for SST" AUTO)
 adios_option(ZeroMQ    "Enable support for ZeroMQ" AUTO)
 adios_option(HDF5      "Enable support for the HDF5 engine" AUTO)
-adios_option(ADIOS1    "Enable support for the ADIOS 1.x engine" AUTO)
+adios_option(ADIOS1    "Enable support for the ADIOS 1.x engine" OFF)
 adios_option(Python    "Enable support for Python bindings" AUTO)
 adios_option(Fortran   "Enable support for Fortran bindings" AUTO)
 adios_option(SysVShMem "Enable support for SysV Shared Memory IPC on *NIX" AUTO)

cmake/DetectOptions.cmake

@@ -47,22 +47,10 @@ set(mpi_find_components C)
 
 # Fortran
 if(ADIOS2_USE_Fortran STREQUAL AUTO)
-  message(STATUS "Looking for a Fortran compiler")
+  include(CheckLanguage)
+  check_language(Fortran)
   if(CMAKE_Fortran_COMPILER)
-    set(fcomp_args "-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}")
-  endif()
-  file(MAKE_DIRECTORY "${ADIOS2_BINARY_DIR}/cmake/check_f90")
-  execute_process(
-    COMMAND
-      "${CMAKE_COMMAND}" "${fcomp_args}" "${ADIOS2_SOURCE_DIR}/cmake/check_f90"
-    WORKING_DIRECTORY "${ADIOS2_BINARY_DIR}/cmake/check_f90"
-    RESULT_VARIABLE ADIOS2_FortranCompiles
-  )
-  if(ADIOS2_FortranCompiles EQUAL 0)
-    message(STATUS "Looking for a Fortran compiler -- found")
     enable_language(Fortran)
-  else()
-    message(STATUS "Looking for a Fortran compiler -- not found")
   endif()
 elseif(ADIOS2_USE_Fortran)
   enable_language(Fortran)

cmake/FindMPI.cmake

@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 # This module is already included in new versions of CMake
-if(CMAKE_VERSION VERSION_LESS 3.12)
+if(CMAKE_VERSION VERSION_LESS 4.0)
   include(${CMAKE_CURRENT_LIST_DIR}/upstream/FindMPI.cmake)
 else()
   include(${CMAKE_ROOT}/Modules/FindMPI.cmake)

cmake/GoogleTest.cmake

@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 # This module is already included in new versions of CMake
-if(CMAKE_VERSION VERSION_LESS 3.10)
+if(CMAKE_VERSION VERSION_LESS 4)
   include(${CMAKE_CURRENT_LIST_DIR}/upstream/GoogleTest.cmake)
 else()
   include(${CMAKE_ROOT}/Modules/GoogleTest.cmake)

scripts/circle/circle_el7-gnu7-openmpi.cmake

@@ -44,7 +44,7 @@ ADIOS2_USE_Python:STRING=ON
 ADIOS2_USE_ZeroMQ:STRING=ON
 #ZFP_ROOT:PATH=/opt/zfp/install
 
-MPIEXEC_MAX_NUMPROCS:STRING=16
+MPIEXEC_MAX_NUMPROCS:STRING=8
 
 PYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
 ")

scripts/circle/circle_fedora-openmpi-ubsan.cmake

@@ -3,7 +3,7 @@ set(CTEST_SITE "CircleCI")
 set(CTEST_BUILD_CONFIGURATION Debug)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 set(CTEST_BUILD_FLAGS "-k -j4")
-set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
+set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
 
 set(dashboard_model Experimental)
 set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}")
@@ -35,6 +35,8 @@ ADIOS2_USE_MPI:STRING=ON
 ADIOS2_USE_Python:STRING=ON
 ADIOS2_USE_ZFP:STRING=OFF
 ADIOS2_USE_ZeroMQ:STRING=ON
+
+MPIEXEC_MAX_NUMPROCS:STRING=4
 ")
 
 include(${CMAKE_CURRENT_LIST_DIR}/../dashboard/adios_common.cmake)