[WIP] Fixing and improving algorithms with view expressions

.gitignore

@@ -7,6 +7,9 @@ build.mic*
 build.min*
 build.nasty*
 build.cov*
+build.gcc*
+build.clang*
+build.icc*
 build.analyze*
 build-ci*
 compile_commands.json
@@ -21,7 +24,7 @@ dash/include/dash/util/StaticConfig.h
 *.log
 *.out
 ipm/*/GEN.*
-my.*.sh
+my.*
 .syntastic*
 .clang*
 tags

CMakeExt/CompilerFlags.cmake

@@ -5,6 +5,8 @@
 # -rdynamic   Instructs the linker to add all symbols, not only used ones,
 #             to the dynamic symbol table
 
+set(CMAKE_CXX_STANDARD ${DASH_CXX_STANDARD})
+
 
 find_package(OpenMP)
 
@@ -62,6 +64,8 @@ if (ENABLE_DEV_COMPILER_WARNINGS
        "${DASH_DEVELOPER_CCXX_FLAGS} -Wunused -Wtrigraphs")
   set (DASH_DEVELOPER_CCXX_FLAGS
        "${DASH_DEVELOPER_CCXX_FLAGS} -Wdeprecated -Wno-float-equal")
+  set (DASH_DEVELOPER_CCXX_FLAGS
+       "${DASH_DEVELOPER_CCXX_FLAGS} -ftemplate-backtrace-limit=0")
 
   if (OPENMP_FOUND)
     set (DASH_DEVELOPER_CCXX_FLAGS
@@ -154,6 +158,11 @@ endif()
 # Set C++ compiler flags:
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang")
   # using Clang
+  set (CXX_GDB_FLAG "-g"
+       CACHE STRING "C++ compiler (clang++) debug symbols flag")
+  set (CXX_OMP_FLAG ${OpenMP_CXX_FLAGS})
+  set (CC_OMP_FLAG  ${OpenMP_CC_FLAGS})
+
   set (CXX_STD_FLAG "--std=c++${DASH_CXX_STD_PREFERED}"
        CACHE STRING "C++ compiler std flag")
 
@@ -163,9 +172,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang")
 
 elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   # using GCC
+  set (CXX_GDB_FLAG "-ggdb3 -rdynamic"
+       CACHE STRING "C++ compiler GDB debug symbols flag")
+  set (CXX_OMP_FLAG ${OpenMP_CXX_FLAGS})
+  set (CC_OMP_FLAG  ${OpenMP_CC_FLAGS})
+
   set (CXX_STD_FLAG "--std=c++${DASH_CXX_STD_PREFERED}"
        CACHE STRING "C++ compiler std flag")
-  set (CXX_GDB_FLAG "-ggdb3 -rdynamic")
+
   if(ENABLE_LT_OPTIMIZATION)
     set (CXX_LTO_FLAG "-flto -fwhole-program -fno-use-linker-plugin")
   endif()
@@ -176,25 +190,28 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 
 elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
   # using Intel C++
+  set (CXX_OMP_FLAG ${OpenMP_CXX_FLAGS})
+  set (CC_OMP_FLAG  ${OpenMP_CC_FLAGS})
+
   set (CXX_STD_FLAG "-std=c++${DASH_CXX_STD_PREFERED}"
        CACHE STRING "C++ compiler std flag")
+
   if(ENABLE_LT_OPTIMIZATION)
     set (CXX_LTO_FLAG "-ipo")
   endif()
   if(ENABLE_CC_REPORTS)
     set (CC_REPORT_FLAG "-qopt-report=4 -qopt-report-phase ipo")
   endif()
 
-
   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "15.0.0")
     message(FATAL_ERROR "Insufficient Intel compiler version (< 15.0.0)")
   endif()
 
 elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Cray")
   # Cray compiler not supported for C++
-  message(FATAL_ERROR,
-          "Cray compiler does not support C++11 features and is only "
-          "eligible for building DART.")
+  message(WARNING,
+    "Cray compiler does not support C++11/14 features and is "
+    "only eligible for building DART.")
 endif()
 
 set (CC_GDB_FLAG "-g"

CMakeLists.txt

@@ -24,8 +24,8 @@ if(POLICY CMP0016)
   cmake_policy(SET CMP0016 OLD)
 endif(POLICY CMP0016)
 if(POLICY CMP0058)
-  cmake_policy(SET CMP0058 NEW)
-endif()
+  cmake_policy(SET CMP0058 OLD)
+endif(POLICY CMP0058)
 
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   set(DEFAULT_COMPTIME_RED on)
@@ -34,6 +34,9 @@ else()
 endif()
 
 ## Build options
+set(DASH_CXX_STANDARD "14"
+    CACHE STRING "C++ standard version for DASH")
+
 option(BUILD_TESTS
        "Whether tests should be built" on)
 option(INSTALL_TESTS
@@ -122,14 +125,6 @@ include(${CMAKE_SOURCE_DIR}/CMakeExt/Platform.cmake)
 include(${CMAKE_SOURCE_DIR}/CMakeExt/Environment.cmake)
 include(${CMAKE_SOURCE_DIR}/CMakeExt/StdLib.cmake)
 
-if (ENABLE_THREADSUPPORT)
-  include(${CMAKE_SOURCE_DIR}/CMakeExt/Threading.cmake)
-endif()
-
-if (ENABLE_COMPTIME_RED)
-  include(${CMAKE_SOURCE_DIR}/CMakeExt/cotire.cmake)
-endif()
-
 # Load build modules to locate libraries after environment setup
 # has been loaded:
 include(${CMAKE_SOURCE_DIR}/CMakeExt/MPI.cmake)
@@ -218,6 +213,14 @@ set(DASH_DART_BASE_INCLUDE_DIR
 ## Set compiler flags (depend on CMake options)
 include(${CMAKE_SOURCE_DIR}/CMakeExt/CompilerFlags.cmake)
 
+if (ENABLE_THREADSUPPORT)
+  include(${CMAKE_SOURCE_DIR}/CMakeExt/Threading.cmake)
+endif()
+
+if (ENABLE_COMPTIME_RED)
+  include(${CMAKE_SOURCE_DIR}/CMakeExt/cotire.cmake)
+endif()
+
 ## Build results output directories (/bin, /lib, /doc)
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -245,10 +248,19 @@ message(EMPH "Install prefix:           (INSTALL_PREFIX)                 "
         ${CMAKE_INSTALL_PREFIX})
 message(EMPH "Build type:               (CMAKE_BUILD_TYPE)               "
         ${CMAKE_BUILD_TYPE})
+message(EMPH "C   compiler:             (CMAKE_C_COMPILER)               "
+        ${CMAKE_C_COMPILER_ID})
+message(EMPH "C++ compiler:             (CMAKE_CXX_COMPILER)             "
+        ${CMAKE_CXX_COMPILER_ID})
+message(EMPH "C++ standard version:     (DASH_CXX_STANDARD)              "
+        ${CMAKE_CXX_STANDARD})
 message(EMPH "Generic build:            (BUILD_GENERIC)                  "
         ${BUILD_GENERIC})
 message(EMPH "Build shared libraries:   (BUILD_SHARED_LIBS)              "
         ${BUILD_SHARED_LIBS})
+if (MPI_FOUND)
+  message(EMPH "MPI implementation:       " ${MPI_IMPL_ID})
+endif()
 
 message(INFO "Build tests:              (BUILD_TESTS)                    "
         ${BUILD_TESTS})
@@ -305,12 +317,15 @@ message(INFO "HDF5 support:             (ENABLE_HDF5)                    "
         ${ENABLE_HDF5})
 message(INFO "Enabled DART backends:    (DART_IMPLEMENTATIONS)           "
         ${DART_IMPLEMENTATIONS})
+
+
 message(INFO "C   compiler id:          ${CMAKE_C_COMPILER_ID}")
 message(INFO "C++ compiler id:          ${CMAKE_CXX_COMPILER_ID}")
 if (DEFINED MPI_IMPL_ID)
   message(INFO "MPI implementation:       " ${MPI_IMPL_ID})
 endif()
 
+
 if (ENABLE_PAPI)
   if (PAPI_FOUND)
     message(INFO "PAPI                      enabled")

build.analyze.sh → build-tools/build.analyze.sh

@@ -1,17 +1,14 @@
 #!/bin/sh
+
+if ! [ -z ${SOURCING+x} ]; then
+
 # This script runs scan-build to perform a static code analysis
 # https://clang-analyzer.llvm.org/scan-build.html
 #
 # The actual compilers have to be set in the CCC prefix env. variables. e.g:
 # export CCC_CC=clang-3.8
 # export CCC_CXX=clang++3.8
 
-BUILD_DIR=./build.analyze
-REPORT_DIR=report            # relative to BUILD_DIR
-BUILD_WRAPPER="${SCANBUILD_BIN}";
-
-
-
 ## !! NOTE !!
 #
 #  See documentation of scan-build for details on recommended build
@@ -21,44 +18,6 @@ BUILD_WRAPPER="${SCANBUILD_BIN}";
 #
 ##
 
-
-
-# try to find build wrapper
-if [ "$BUILD_WRAPPER" = "" ]; then
-  BUILD_WRAPPER="scan-build"
-fi
-if [ "$SCANBUILD_OPTS" = "" ]; then
-  SCANBUILD_OPTS="-analyze-headers -plist-html"
-fi
-SCANBUILD_OPTS="-o $REPORT_DIR ${SCANBUILD_OPTS}"
-SCANBUILD_OPTS="--force-analyze-debug-code -v ${SCANBUILD_OPTS}"
-
-which $BUILD_WRAPPER ||
-  (echo "This build requires $BUILD_WRAPPER. Set env. var SCANBUILD_BIN" \
-   & exit 1);
-
-FORCE_BUILD=false
-if [ "$1" = "-f" ]; then
-  FORCE_BUILD=true
-fi
-
-await_confirm() {
-  if ! $FORCE_BUILD; then
-    echo ""
-    echo "   To build and analyze using these settings, hit ENTER"
-    read confirm
-  fi
-}
-
-exit_message() {
-  echo "--------------------------------------------------------"
-  echo "Done. To install DASH, run    make install    in $BUILD_DIR"
-}
-
-if [ "${PAPI_HOME}" = "" ]; then
-  PAPI_HOME=$PAPI_BASE
-fi
-
 # To specify a build configuration for a specific system, use:
 #
 #                    -DENVIRONMENT_TYPE=<type> \
@@ -86,11 +45,30 @@ fi
 # For likwid support, ensure that the likwid development headers are
 # installed.
 
-# Configure with default release build settings:
-rm -Rf $BUILD_DIR/*
-mkdir -p $BUILD_DIR/$REPORT_DIR
-(cd $BUILD_DIR && $BUILD_WRAPPER $SCANBUILD_OPTS \
-                  cmake3 -DCMAKE_BUILD_TYPE=Debug \
+
+BUILD_DIR=build.analyze
+REPORT_DIR=report            # relative to BUILD_DIR
+BUILD_WRAPPER="${SCANBUILD_BIN}";
+
+# try to find build wrapper
+if [ "$BUILD_WRAPPER" = "" ]; then
+  BUILD_WRAPPER="scan-build"
+fi
+if [ "$SCANBUILD_OPTS" = "" ]; then
+  SCANBUILD_OPTS="-analyze-headers -plist-html"
+fi
+SCANBUILD_OPTS="-o $REPORT_DIR ${SCANBUILD_OPTS}"
+SCANBUILD_OPTS="--force-analyze-debug-code -v ${SCANBUILD_OPTS}"
+
+which $BUILD_WRAPPER ||
+  (echo "This build requires $BUILD_WRAPPER. Set env. var SCANBUILD_BIN" \
+   & exit 1);
+
+# custom cmake command
+CMAKE_COMMAND="$BUILD_WRAPPER $SCANBUILD_OPTS cmake3"
+
+# default release build settings:
+CMAKE_OPTIONS="         -DCMAKE_BUILD_TYPE=Debug \
                         -DENVIRONMENT_TYPE=default \
                         -DENABLE_COMPTIME_RED=OFF \
                         \
@@ -130,10 +108,14 @@ mkdir -p $BUILD_DIR/$REPORT_DIR
                         -DIPM_PREFIX=${IPM_HOME} \
                         -DPAPI_PREFIX=${PAPI_HOME} \
                         \
-                        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-                        ../ && \
- await_confirm && \
- $BUILD_WRAPPER $SCANBUILD_OPTS make) && \
- (cp $BUILD_DIR/compile_commands.json .) && \
-exit_message
+                        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+
+# the make command used
+MAKE_COMMAND="$BUILD_WRAPPER $SCANBUILD_OPTS make"
+
+else
+
+  $(dirname $0)/build.sh analyze $@
+
+fi