Merge branch 'STEllAR-GROUP:master' into master

Author: charan-003

.github/workflows/linux_debug.yml

@@ -45,4 +45,5 @@ jobs:
           ctest \
             --output-on-failure \
             --tests-regex tests.examples \
-            --exclude-regex tests.examples.transpose.transpose_block_numa
+            --exclude-regex tests.examples.transpose.transpose_block_numa \
+            --exclude-regex tests.examples.quickstart.1d_wave_equation

.jenkins/lsu/env-common.sh

@@ -14,6 +14,9 @@ if [ "${build_type}" = "Debug" ]; then
 #    configure_extra_options+=" -DHPX_WITH_VERIFY_LOCKS_BACKTRACE=ON"
 fi
 
+# These tests only make sense if hpx is being installed
+configure_extra_options+=" -DHPX_WITH_TESTS_EXTERNAL_BUILD=OFF"
+
 ctest_extra_args+=" --verbose "
 
 hostname

CMakeLists.txt

@@ -95,6 +95,7 @@ hpx_set_cmake_policy(CMP0042 NEW)
 hpx_set_cmake_policy(CMP0060 NEW)
 hpx_set_cmake_policy(CMP0074 NEW)
 hpx_set_cmake_policy(CMP0167 OLD)
+hpx_set_cmake_policy(CMP0144 NEW)
 
 # We save the passed compiler flag to a special variable. This is needed for our
 # build system unit tests. Some flags might influence the created symbols
@@ -1407,6 +1408,9 @@ if((HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_MPI)
     # hpx_add_compile_flag() below does not add the extra options to the top
     # level directory
     hpx_add_config_define(OMPI_IMPORTS)
+    if(HPX_WITH_CUDA)
+      hpx_add_config_cond_define(NOMINMAX)
+    endif()
   endif()
 endif()
 
@@ -1500,6 +1504,24 @@ if(NOT "${HPX_PLATFORM_UC}" STREQUAL "BLUEGENEQ")
 endif()
 
 # Debugging related build options
+hpx_option(
+  HPX_WITH_CONTRACTS BOOL "Enable C++ contracts support in HPX" OFF
+  CATEGORY "Debugging"
+)
+
+if(HPX_WITH_CONTRACTS)
+  hpx_add_config_define(HPX_HAVE_CONTRACTS)
+endif()
+
+hpx_option(
+  HPX_WITH_ASSERTS_AS_CONTRACT_ASSERTS BOOL
+  "Swap hpx_assert with hpx_contract_assert" OFF CATEGORY "Debugging"
+)
+
+if(HPX_WITH_ASSERTS_AS_CONTRACT_ASSERTS)
+  hpx_add_config_define(HPX_HAVE_ASSERTS_AS_CONTRACT_ASSERTS)
+endif()
+
 hpx_option(
   HPX_WITH_VALGRIND BOOL "Enable Valgrind instrumentation support." OFF
   CATEGORY "Debugging"
@@ -2425,7 +2447,7 @@ endif()
 include(HPX_GitCommit)
 hpx_add_config_define(HPX_HAVE_GIT_COMMIT "\"${HPX_WITH_GIT_COMMIT}\"")
 
-hpx_include(SetOutputPaths)
+include(HPX_SetOutputPaths)
 
 # ##############################################################################
 # Fixing git tag, if necessary
@@ -2523,7 +2545,7 @@ add_subdirectory(wrap)
 # ##############################################################################
 # Documentation toolchain (Sphinx, Doxygen, Breathe)
 # ##############################################################################
-hpx_include(Documentation)
+include(HPX_Documentation)
 
 # ##############################################################################
 # Add core configuration

cmake/FindAmplifier.cmake

@@ -6,43 +6,26 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 if(NOT TARGET Amplifier::amplifier)
-  # compatibility with older CMake versions
-  if(AMPLIFIER_ROOT AND NOT Amplifier_ROOT)
-    set(Amplifier_ROOT
-        ${AMPLIFIER_ROOT}
-        CACHE PATH "Amplifier base directory"
-    )
-    unset(AMPLIFIER_ROOT CACHE)
-  endif()
 
   find_package(PkgConfig QUIET)
   pkg_check_modules(PC_AMPLIFIER QUIET amplifier)
 
   find_path(
     Amplifier_INCLUDE_DIR ittnotify.h
-    HINTS ${Amplifier_ROOT} ENV AMPLIFIER_ROOT ${PC_Amplifier_INCLUDEDIR}
+    HINTS ${AMPLIFIER_ROOT} ENV AMPLIFIER_ROOT ${PC_Amplifier_INCLUDEDIR}
           ${PC_Amplifier_INCLUDE_DIRS}
     PATH_SUFFIXES include
   )
 
   find_library(
     Amplifier_LIBRARY
     NAMES ittnotify libittnotify
-    HINTS ${Amplifier_ROOT} ENV AMPLIFIER_ROOT ${PC_Amplifier_LIBDIR}
+    HINTS ${AMPLIFIER_ROOT} ENV AMPLIFIER_ROOT ${PC_Amplifier_LIBDIR}
           ${PC_Amplifier_LIBRARY_DIRS}
     PATH_SUFFIXES lib lib64
   )
 
-  # Set Amplifier_ROOT in case the other hints are used
-  if(Amplifier_ROOT)
-    # The call to file is for compatibility for windows paths
-    file(TO_CMAKE_PATH ${Amplifier_ROOT} Amplifier_ROOT)
-  elseif(DEFINED ENV{AMPLIFIER_ROOT})
-    file(TO_CMAKE_PATH $ENV{AMPLIFIER_ROOT} Amplifier_ROOT)
-  else()
-    file(TO_CMAKE_PATH "${Amplifier_INCLUDE_DIR}" Amplifier_INCLUDE_DIR)
-    string(REPLACE "/include" "" Amplifier_ROOT "${Amplifier_INCLUDE_DIR}")
-  endif()
+  get_filename_component(Amplifier_ROOT ${Amplifier_INCLUDE_DIR} DIRECTORY)
 
   set(Amplifier_LIBRARIES ${Amplifier_LIBRARY})
   set(Amplifier_INCLUDE_DIRS ${Amplifier_INCLUDE_DIR})

cmake/FindAsio.cmake

@@ -8,37 +8,14 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 if(NOT TARGET Asio::asio)
-  # compatibility with older CMake versions
-  if(ASIO_ROOT AND NOT Asio_ROOT)
-    set(Asio_ROOT
-        ${ASIO_ROOT}
-        CACHE PATH "Asio base directory"
-    )
-    unset(ASIO_ROOT CACHE)
-  endif()
 
   find_path(
     Asio_INCLUDE_DIR asio.hpp
-    HINTS "${Asio_ROOT}" ENV ASIO_ROOT "${HPX_ASIO_ROOT}"
+    HINTS "${ASIO_ROOT}" ENV ASIO_ROOT "${HPX_ASIO_ROOT}"
     PATH_SUFFIXES include
   )
 
-  if(NOT Asio_INCLUDE_DIR)
-    hpx_error(
-      "Could not find Asio. Set Asio_ROOT as a CMake or environment variable to point to the Asio root install directory. Alternatively, set HPX_WITH_FETCH_ASIO=ON to fetch Asio using CMake's FetchContent (when using this option Asio will be installed together with HPX, be careful about conflicts with separately installed versions of Asio)."
-    )
-  endif()
-
-  # Set Asio_ROOT in case the other hints are used
-  if(Asio_ROOT)
-    # The call to file is for compatibility with windows paths
-    file(TO_CMAKE_PATH ${Asio_ROOT} Asio_ROOT)
-  elseif(DEFINED ENV{ASIO_ROOT})
-    file(TO_CMAKE_PATH $ENV{ASIO_ROOT} Asio_ROOT)
-  else()
-    file(TO_CMAKE_PATH "${Asio_INCLUDE_DIR}" Asio_INCLUDE_DIR)
-    string(REPLACE "/include" "" Asio_ROOT "${Asio_INCLUDE_DIR}")
-  endif()
+  get_filename_component(Asio_ROOT ${Asio_INCLUDE_DIR} DIRECTORY)
 
   if(Asio_INCLUDE_DIR AND EXISTS "${Asio_INCLUDE_DIR}/asio/version.hpp")
     # Matches a line of the form:
@@ -64,7 +41,6 @@ if(NOT TARGET Asio::asio)
     Asio
     REQUIRED_VARS Asio_INCLUDE_DIR
     VERSION_VAR Asio_VERSION_STRING
-    FOUND_VAR Asio_FOUND
   )
 
   add_library(Asio::asio INTERFACE IMPORTED)

cmake/FindBreathe.cmake

@@ -4,29 +4,16 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-# compatibility with older CMake versions
-if(BREATHE_APIDOC_ROOT AND NOT Breathe_APIDOC_ROOT)
-  set(Breathe_APIDOC_ROOT
-      ${BREATHE_APIDOC_ROOT}
-      CACHE PATH "Breathe base directory"
-  )
-  unset(BREATHE_ROOT CACHE)
-endif()
-
 find_program(
   Breathe_APIDOC_EXECUTABLE
   NAMES breathe-apidoc
-  PATHS ${Breathe_APIDOC_ROOT} ENV Breathe_APIDOC_ROOT
+  PATHS ${BREATHE_APIDOC_ROOT} ENV BREATHE_APIDOC_ROOT
   DOC "Path to breathe-apidoc executable"
 )
 
-if(Breathe_APIDOC_ROOT)
-  file(TO_CMAKE_PATH ${Breathe_APIDOC_ROOT} Breathe_APIDOC_ROOT)
-endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  Breathe DEFAULT_MESSAGE Breathe_APIDOC_EXECUTABLE
+)
 
-if(Breathe_APIDOC_EXECUTABLE)
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(
-    Breathe DEFAULT_MESSAGE Breathe_APIDOC_EXECUTABLE
-  )
-endif()
+mark_as_advanced(Breathe_APIDOC_EXECUTABLE)

cmake/FindHwloc.cmake

@@ -8,21 +8,13 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 if(NOT TARGET Hwloc::hwloc)
-  # compatibility with older CMake versions
-  if(HWLOC_ROOT AND NOT Hwloc_ROOT)
-    set(Hwloc_ROOT
-        ${HWLOC_ROOT}
-        CACHE PATH "Hwloc base directory"
-    )
-    unset(HWLOC_ROOT CACHE)
-  endif()
 
   find_package(PkgConfig QUIET)
   pkg_check_modules(PC_HWLOC QUIET hwloc)
 
   find_path(
     Hwloc_INCLUDE_DIR hwloc.h
-    HINTS ${Hwloc_ROOT}
+    HINTS ${HWLOC_ROOT}
           ENV
           HWLOC_ROOT
           ${HPX_HWLOC_ROOT}
@@ -36,7 +28,7 @@ if(NOT TARGET Hwloc::hwloc)
   find_library(
     Hwloc_LIBRARY
     NAMES libhwloc.so libhwloc.lib hwloc
-    HINTS ${Hwloc_ROOT}
+    HINTS ${HWLOC_ROOT}
           ENV
           HWLOC_ROOT
           ${HPX_Hwloc_ROOT}
@@ -47,16 +39,7 @@ if(NOT TARGET Hwloc::hwloc)
     PATH_SUFFIXES lib lib64
   )
 
-  # Set Hwloc_ROOT in case the other hints are used
-  if(Hwloc_ROOT)
-    # The call to file is for compatibility with windows paths
-    file(TO_CMAKE_PATH ${Hwloc_ROOT} Hwloc_ROOT)
-  elseif(DEFINED ENV{HWLOC_ROOT})
-    file(TO_CMAKE_PATH $ENV{HWLOC_ROOT} Hwloc_ROOT)
-  else()
-    file(TO_CMAKE_PATH "${Hwloc_INCLUDE_DIR}" Hwloc_INCLUDE_DIR)
-    string(REPLACE "/include" "" Hwloc_ROOT "${Hwloc_INCLUDE_DIR}")
-  endif()
+  get_filename_component(Hwloc_ROOT ${Hwloc_INCLUDE_DIR} DIRECTORY)
 
   set(Hwloc_LIBRARIES ${Hwloc_LIBRARY})
   set(Hwloc_INCLUDE_DIRS ${Hwloc_INCLUDE_DIR})

cmake/FindJemalloc.cmake

@@ -7,21 +7,12 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-# compatibility with older CMake versions
-if(JEMALLOC_ROOT AND NOT Jemalloc_ROOT)
-  set(Jemalloc_ROOT
-      ${JEMALLOC_ROOT}
-      CACHE PATH "Jemalloc base directory"
-  )
-  unset(JEMALLOC_ROOT CACHE)
-endif()
-
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
 
 find_path(
   Jemalloc_INCLUDE_DIR jemalloc/jemalloc.h
-  HINTS ${Jemalloc_ROOT}
+  HINTS ${JEMALLOC_ROOT}
         ENV
         JEMALLOC_ROOT
         ${HPX_JEMALLOC_ROOT}
@@ -37,7 +28,7 @@ if(MSVC)
   # missing posix headers
   find_path(
     Jemalloc_ADDITIONAL_INCLUDE_DIR msvc_compat/strings.h
-    HINTS ${Jemalloc_ROOT}
+    HINTS ${JEMALLOC_ROOT}
           ENV
           JEMALLOC_ROOT
           ${HPX_JEMALLOC_ROOT}
@@ -49,21 +40,10 @@ if(MSVC)
   )
 endif()
 
-# Set Jemalloc_ROOT in case the other hints are used
-if(Jemalloc_ROOT)
-  # The call to file is for compatibility with windows paths
-  file(TO_CMAKE_PATH ${Jemalloc_ROOT} Jemalloc_ROOT)
-elseif(DEFINED ENV{JEMALLOC_ROOT})
-  file(TO_CMAKE_PATH $ENV{JEMALLOC_ROOT} Jemalloc_ROOT)
-else()
-  file(TO_CMAKE_PATH "${Jemalloc_INCLUDE_DIR}" Jemalloc_INCLUDE_DIR)
-  string(REPLACE "/include" "" Jemalloc_ROOT "${Jemalloc_INCLUDE_DIR}")
-endif()
-
 find_library(
   Jemalloc_LIBRARY
   NAMES jemalloc libjemalloc
-  HINTS ${Jemalloc_ROOT}
+  HINTS ${JEMALLOC_ROOT}
         ENV
         JEMALLOC_ROOT
         ${HPX_JEMALLOC_ROOT}
@@ -74,12 +54,7 @@ find_library(
   PATH_SUFFIXES lib lib64
 )
 
-# Set Jemalloc_ROOT in case the other hints are used
-if(NOT Jemalloc_ROOT AND DEFINED ENV{JEMALLOC_ROOT})
-  set(Jemalloc_ROOT $ENV{JEMALLOC_ROOT})
-elseif(NOT Jemalloc_ROOT)
-  string(REPLACE "/include" "" Jemalloc_ROOT "${Jemalloc_INCLUDE_DIR}")
-endif()
+get_filename_component(Jemalloc_ROOT ${Jemalloc_INCLUDE_DIR} DIRECTORY)
 
 set(Jemalloc_LIBRARIES ${Jemalloc_LIBRARY})
 set(Jemalloc_INCLUDE_DIRS ${Jemalloc_INCLUDE_DIR})

cmake/FindLibSigSegv.cmake

@@ -4,23 +4,14 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-# compatibility with older CMake versions
-if(LIBSIGSEGV_ROOT AND NOT Libsigsegv_ROOT)
-  set(Libsigsegv_ROOT
-      ${LIBSIGSEGV_ROOT}
-      CACHE PATH "Libsigsegv base directory"
-  )
-  unset(LIBSIGSEGV_ROOT CACHE)
-endif()
-
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBSIGSEGV QUIET libsigsegv)
 
 find_path(
   Libsigsegv_INCLUDE_DIR sigsegv.h
-  HINTS ${Libsigsegv_ROOT}
+  HINTS ${LIBSIGSEGV_ROOT}
         ENV
-        Libsigsegv_ROOT
+        LIBSIGSEGV_ROOT
         ${PC_Libsigsegv_MINIMAL_INCLUDEDIR}
         ${PC_Libsigsegv_MINIMAL_INCLUDE_DIRS}
         ${PC_Libsigsegv_INCLUDEDIR}
@@ -31,26 +22,17 @@ find_path(
 find_library(
   Libsigsegv_LIBRARY
   NAMES sigsegv libsigsegv
-  HINTS ${Libsigsegv_ROOT}
+  HINTS ${LIBSIGSEGV_ROOT}
         ENV
-        Libsigsegv_ROOT
+        LIBSIGSEGV_ROOT
         ${PC_Libsigsegv_MINIMAL_LIBDIR}
         ${PC_Libsigsegv_MINIMAL_LIBRARY_DIRS}
         ${PC_Libsigsegv_LIBDIR}
         ${PC_Libsigsegv_LIBRARY_DIRS}
   PATH_SUFFIXES lib lib64
 )
 
-# Set Libsigsegv_ROOT in case the other hints are used
-if(Libsigsegv_ROOT)
-  # The call to file is for compatibility with windows paths
-  file(TO_CMAKE_PATH ${Libsigsegv_ROOT} Libsigsegv_ROOT)
-elseif(DEFINED ENV{LIBSIGSEGV_ROOT})
-  file(TO_CMAKE_PATH $ENV{LIBSIGSEGV_ROOT} Libsigsegv_ROOT)
-else()
-  file(TO_CMAKE_PATH "${Libsigsegv_INCLUDE_DIR}" Libsigsegv_INCLUDE_DIR)
-  string(REPLACE "/include" "" Libsigsegv_ROOT "${Libsigsegv_INCLUDE_DIR}")
-endif()
+get_filename_component(Libsigsegv_ROOT ${Libsigsegv_INCLUDE_DIR} DIRECTORY)
 
 set(Libsigsegv_LIBRARIES ${Libsigsegv_LIBRARY})
 set(Libsigsegv_INCLUDE_DIRS ${Libsigsegv_INCLUDE_DIR})