Merge branch 'develop'

quinoacomputing · Sep 11, 2019 · 8102401 · 8102401
2 parents 10445a3 + fbf98a6
commit 8102401
Show file tree

Hide file tree

Showing 815 changed files with 30,407 additions and 10,686 deletions.
diff --git a/.azure.yml b/.azure.yml
@@ -5,7 +5,7 @@
 
 jobs:
 - job: "Quinoa"
-  timeoutInMinutes: 180
+  timeoutInMinutes: 240
   pool:
     vmImage: 'Ubuntu 16.04'
   variables:
@@ -69,6 +69,7 @@ jobs:
         DISTRO: 'debian-clang-smp'
         SMP: 'on'
       doc:
+        COMPILER: 'gnu'
         DOC: true
         DISTRO: 'debian-doc'
   steps:

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <img src="https://quinoacomputing.github.io/quinoa.svg" align="right" width="25%" background=transparent>
 
-_Adaptive computational fluid dynamics_ - https://quinoacomputing.github.io
+_Adaptive computational fluid dynamics_ - https://quinoacomputing.org
 
 Quinoa is a set of computational tools that enables research and numerical
 analysis in fluid dynamics. Using the [Charm++](http://charmplusplus.org)
@@ -18,21 +18,6 @@ problems with a production-quality code that is extensible and maintainable,
 using hardware resources efficiently, even for problems with _a priori_
 unknown, heterogeneous, and dynamic load distribution.
 
-## Directory layout
-
-    quinoa
-      ├── cmake/ - CMake code, shared between github.com/quinoacomputing/quinoa-tpl and src/
-      ├── doc/ - Documentation, rendered at quinoacomputing.org
-      ├── external/ - External packages, pulled in as submodules from github.com/quinoacomputing/quinoa-tpl
-      ├── src/ - Compilable sources, see quinoacomputing.org/files.html
-      ├── tests/ - Unit-, and regression tests
-      ├── tools/ - Development utilities and docker files
-      ├── LICENSE - Copyright and license
-      └── README.md - This file, rendered at github.com/quinoacomputing/quinoa
-
-## More info
-
 For more details on philosophy, documentation, software design, journal papers,
-license, and contributing see the
-[documentation](https://quinoacomputing.github.io).
+license, and contributing see the [documentation](https://quinoacomputing.org).
 
diff --git a/cmake/BuildType.cmake b/cmake/BuildType.cmake
@@ -10,8 +10,8 @@
 ################################################################################
 
 if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "CMAKE_BUILD_TYPE not specified, setting to 'Debug'")
-  set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type. Possible values: DEBUG | RELEASE | RELWITHDEBINFO | MINSIZEREL" FORCE)
+  message(STATUS "CMAKE_BUILD_TYPE not specified, setting to 'Release'")
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type. Possible values: DEBUG | RELEASE | RELWITHDEBINFO | MINSIZEREL" FORCE)
   # Set the possible values of build type for cmake-gui
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 else()

diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake
@@ -47,8 +47,8 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE suite path targetname testrunner)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}"
                         ${ARGN})
 
-  IF(NOT LCOV)
-    MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
+  IF(NOT FASTCOV)
+    MESSAGE(FATAL_ERROR "fastcov not found! Aborting...")
   ENDIF()
 
   IF(NOT GENHTML)
@@ -68,18 +68,12 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE suite path targetname testrunner)
 
   # Setup code coverage target
   ADD_CUSTOM_TARGET(${targetname}
-    # Cleanup lcov
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --directory . --zerocounters
-    # Capture initial state yielding zero coverage baseline
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --capture --initial --directory . --output-file ${OUTPUT}.base.info
+    # Zero coverage counters
+    COMMAND ${FASTCOV} --zerocounters
     # Run test suite
     COMMAND ${testrunner} ${ARG_TESTRUNNER_ARGS}
-    # Capture lcov counters
-    COMMAND ${LCOV} --gcov-tool ${GCOV}  --capture --rc lcov_branch_coverage=1 --directory . --output-file ${OUTPUT}.test.info
-    # Combine trace files
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --rc lcov_branch_coverage=1 --add-tracefile ${OUTPUT}.base.info --add-tracefile ${OUTPUT}.test.info --output-file ${OUTPUT}.total.info
-    # Filter out unwanted files
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --rc lcov_branch_coverage=1 --remove ${OUTPUT}.total.info "*/tests/*" "*/c++/*" "*/include/*" "*/boost/*" "*/charm/*" "*.decl.h" "*.def.h" "*/STDIN" "*/openmpi/*" "*/pstreams/*" "*/Random123/*" "*/pegtl/*" "*/tut/*" "*/highwayhash/*" "*/moduleinit*" --output-file ${OUTPUT}.filtered.info
+    # Process gcov output for genhtml
+    COMMAND ${FASTCOV} --branch-coverage --exceptional-branch-coverage --lcov -o ${OUTPUT}.info --exclude tests/ c++/ include/ boost/ charm/ decl.h def.h openmpi pstreams Random123 pegtl tut/ highwayhash/ moduleinit
     # Copy over report customization files for genhtml
     COMMAND ${CMAKE_COMMAND} -E copy
             ${CMAKE_SOURCE_DIR}/../doc/quinoa.gcov.css
@@ -88,13 +82,13 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE suite path targetname testrunner)
             ${CMAKE_SOURCE_DIR}/../doc/quinoa.lcov.prolog
             ${CMAKE_BINARY_DIR}
     # Generate HTML report
-    COMMAND ${GENHTML} --legend --branch-coverage --demangle-cpp --css-file quinoa.gcov.css --ignore-errors source --html-prolog quinoa.lcov.prolog --title "${GIT_SHA1}" -o ${OUTPUT} ${OUTPUT}.filtered.info
+    COMMAND ${GENHTML} --legend --rc genhtml_branch_coverage=1 --demangle-cpp --css-file quinoa.gcov.css --ignore-errors source --html-prolog quinoa.lcov.prolog --title "${GIT_SHA1}" -o ${OUTPUT} ${OUTPUT}.info
     # Customize page headers in generated html to own
     COMMAND find ${OUTPUT} -type f -exec ${SED} -i "s/LCOV - code coverage report/Quinoa ${suite} test code coverage report/g" {} +
     COMMAND find ${OUTPUT} -type f -exec ${SED} -i "s/<td class=\"headerItem\">Test:<\\/td>/<td class=\"headerItem\">Commit:<\\/td>/g" {} +
     COMMAND find ${OUTPUT} -type f -exec ${SED} -i "s/Quinoa_v\\\(.*\\\)-\\\(.*\\\)-g\\\(.*\\\)<\\/td>/<a href=\"https:\\/\\/github.com\\/quinoacomputing\\/quinoa\\/commit\\/\\3\">Quinoa_v\\1-\\2-g\\3<\\/a><\\/td>/g" {} +
     # Cleanup intermediate data
-    COMMAND ${CMAKE_COMMAND} -E remove ${OUTPUT}.base.info ${OUTPUT}.test.info ${OUTPUT}.total.info ${OUTPUT}.filtered.info
+    COMMAND ${CMAKE_COMMAND} -E remove ${OUTPUT}.info
     # Set work directory for target
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     # Echo what is being done
@@ -153,8 +147,8 @@ FUNCTION(SETUP_TARGET_FOR_ALL_COVERAGE suite path targetname unittestrunner
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}"
                         ${ARGN})
 
-  IF(NOT LCOV)
-    MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
+  IF(NOT FASTCOV)
+    MESSAGE(FATAL_ERROR "fastcov not found! Aborting...")
   ENDIF()
 
   IF(NOT GENHTML)
@@ -171,19 +165,13 @@ FUNCTION(SETUP_TARGET_FOR_ALL_COVERAGE suite path targetname unittestrunner
 
   # Setup code coverage target
   ADD_CUSTOM_TARGET(${targetname}
-    # Cleanup lcov
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --directory . --zerocounters
-    # Capture initial state yielding zero coverage baseline
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --capture --initial --directory . --output-file ${OUTPUT}.base.info
+    # Zero coverage counters
+    COMMAND ${FASTCOV} --zerocounters
     # Run all test suites
     COMMAND ${unittestrunner} ${unittestrunner_ncpus_arg} ${PROCESSOR_COUNT} Main/${UNITTEST_EXECUTABLE} -v
-    COMMAND ${CMAKE_CTEST_COMMAND} -j${PROCESSOR_COUNT}
-    # Capture lcov counters
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --capture --rc lcov_branch_coverage=1 --directory . --output-file ${OUTPUT}.test.info
-    # Combine trace files
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --rc lcov_branch_coverage=1 --add-tracefile ${OUTPUT}.base.info --add-tracefile ${OUTPUT}.test.info --output-file ${OUTPUT}.total.info
-    # Filter out unwanted files
-    COMMAND ${LCOV} --gcov-tool ${GCOV} --rc lcov_branch_coverage=1 --remove ${OUTPUT}.total.info "*/tests/*" "*/c++/*" "*/include/*" "*/boost/*" "*/charm/*" "*.decl.h" "*.def.h" "*/STDIN" "*/openmpi/*" "*/pstreams/*" "*/Random123/*" "*/pegtl/*" "*/tut/*" "*/highwayhash/*" "*/moduleinit*" --output-file ${OUTPUT}.filtered.info
+    COMMAND ${CMAKE_CTEST_COMMAND} -j${PROCESSOR_COUNT} -LE insane
+    # Process gcov output for genhtml
+    COMMAND ${FASTCOV} --branch-coverage --exceptional-branch-coverage --lcov -o ${OUTPUT}.info --exclude tests/ c++/ include/ boost/ charm/ decl.h def.h openmpi pstreams Random123 pegtl tut/ highwayhash/ moduleinit
     # Copy over report customization files for genhtml
     COMMAND ${CMAKE_COMMAND} -E copy
             ${CMAKE_SOURCE_DIR}/../doc/quinoa.gcov.css
@@ -192,13 +180,13 @@ FUNCTION(SETUP_TARGET_FOR_ALL_COVERAGE suite path targetname unittestrunner
             ${CMAKE_SOURCE_DIR}/../doc/quinoa.lcov.prolog
             ${CMAKE_BINARY_DIR}
     # Generate HTML report
-    COMMAND ${GENHTML} --legend --branch-coverage --demangle-cpp --css-file quinoa.gcov.css --ignore-errors source --html-prolog quinoa.lcov.prolog --title "${GIT_SHA1}" -o ${OUTPUT} ${OUTPUT}.filtered.info
+    COMMAND ${GENHTML} --legend --rc genhtml_branch_coverage=1 --demangle-cpp --css-file quinoa.gcov.css --ignore-errors source --html-prolog quinoa.lcov.prolog --title "${GIT_SHA1}" -o ${OUTPUT} ${OUTPUT}.info
     # Customize page headers in generated html to own
     COMMAND find ${OUTPUT} -type f -exec ${SED} -i "s/LCOV - code coverage report/Quinoa ${suite} test code coverage report/g" {} +
     COMMAND find ${OUTPUT} -type f -exec ${SED} -i "s/<td class=\"headerItem\">Test:<\\/td>/<td class=\"headerItem\">Commit:<\\/td>/g" {} +
     COMMAND find ${OUTPUT} -type f -exec ${SED} -i "s/Quinoa_v\\\(.*\\\)-\\\(.*\\\)-g\\\(.*\\\)<\\/td>/<a href=\"https:\\/\\/github.com\\/quinoacomputing\\/quinoa\\/commit\\/\\3\">Quinoa_v\\1-\\2-g\\3<\\/a><\\/td>/g" {} +
     # Cleanup intermediate data
-    COMMAND ${CMAKE_COMMAND} -E remove ${OUTPUT}.base.info ${OUTPUT}.test.info ${OUTPUT}.total.info ${OUTPUT}.filtered.info
+    COMMAND ${CMAKE_COMMAND} -E remove ${OUTPUT}.info
     # Set work directory for target
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     # Echo what is being done

diff --git a/cmake/DetectCodeCoverage.cmake b/cmake/DetectCodeCoverage.cmake
@@ -11,27 +11,21 @@
 
 # Attempt to find tools required for code coverage analysis
 
-if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
-  find_program( GCOV ${CMAKE_CURRENT_SOURCE_DIR}/../script/llvm-gcov.sh )
-elseif( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-  find_program( GCOV gcov )
-endif()
-
-find_program( LCOV lcov )
+find_program( GCOV gcov )
+find_program( FASTCOV fastcov.py )
 find_program( GENHTML genhtml )
 find_program( SED sed )
 
 # Code coverage analysis only supported if all prerequisites found and the user
-# has requested it via the cmake variable COVERAGE=on..
+# has requested it via the cmake variable COVERAGE=on.
 if ( COVERAGE AND
      GCOV AND
-     LCOV AND
+     FASTCOV AND
      GENHTML AND
      SED AND
-     ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
-       CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ) )
+     CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
 
-  message(STATUS "Code coverage analysis enabled: All prerequisites found: COVERAGE:${COVERAGE}, compiler:${CMAKE_CXX_COMPILER_ID}, gcov:${GCOV}, lcov:${LCOV}, genhtml:${GENHTML}, sed:${SED}")
+  message(STATUS "Code coverage analysis enabled with compiler:${CMAKE_CXX_COMPILER_ID}, gcov:${GCOV}, fastcov:${FASTCOV}, genhtml:${GENHTML}, sed:${SED}")
 
   # Enable code coverage analysis.
   SET(CODE_COVERAGE ON)
@@ -44,6 +38,6 @@ if ( COVERAGE AND
 
 else()
 
-  message(STATUS "Code coverage analysis disabled. Not all prerequisites found: COVERAGE:${COVERAGE}, compiler:${CMAKE_CXX_COMPILER_ID}, gcov:${GCOV}, lcov:${LCOV}, genhtml:${GENHTML}, sed:${SED}")
+  message(STATUS "Code coverage analysis disabled. Not all prerequisites found: COVERAGE (must be true):${COVERAGE}, compiler (must be GNU):${CMAKE_CXX_COMPILER_ID}, and the following must be found: gcov:${GCOV}, fastcov:${FASTCOV}, genhtml:${GENHTML}, sed:${SED}")
 
 endif()
diff --git a/cmake/FindHighwayHash.cmake b/cmake/FindHighwayHash.cmake
@@ -28,10 +28,9 @@ if(HIGHWAYHASH_INCLUDE_DIRS)
   set (HIGHWAYHASH_FIND_QUIETLY TRUE)
 endif()
 
-find_path(HIGHWAYHASH_INCLUDE_DIR NAMES sip_hash.h
+find_path(HIGHWAYHASH_INCLUDE_DIR NAMES highwayhash/sip_hash.h
                                   HINTS ${HIGHWAYHASH_ROOT}
-                                        $ENV{HIGHWAYHASH_ROOT}
-                                  PATH_SUFFIXES include highwayhash)
+                                        $ENV{HIGHWAYHASH_ROOT})
 
 set(HIGHWAYHASH_INCLUDE_DIRS ${HIGHWAYHASH_INCLUDE_DIR})
 

diff --git a/cmake/FindLibCXX.cmake b/cmake/FindLibCXX.cmake
@@ -37,22 +37,30 @@ find_path(LIBCXX_INCLUDE_DIR NAMES cxxabi.h HINTS ${LIBCXX_ROOT}/include
                                             $ENV{LIBCXX_ROOT}/include/c++/v1)
 
 if(BUILD_SHARED_LIBS)
-  find_library(LIBCXX_LIBRARIES NAMES c++ HINTS ${LIBCXX_ROOT}/lib
-                                                $ENV{LIBCXX_ROOT}/lib)
-  find_library(LIBCXXABI_LIBRARIES NAMES c++abi HINTS ${LIBCXX_ROOT}/lib
-                                                $ENV{LIBCXX_ROOT}/lib)
+  find_library(LIBCXX_LIBRARY NAMES c++ HINTS ${LIBCXX_ROOT}/lib
+                                              $ENV{LIBCXX_ROOT}/lib)
+  find_library(LIBCXXABI_LIBRARY NAMES c++abi HINTS ${LIBCXX_ROOT}/lib
+                                              $ENV{LIBCXX_ROOT}/lib)
 else()
-  find_library(LIBCXX_LIBRARIES NAMES libc++.a HINTS ${LIBCXX_ROOT}/lib
-                                                     $ENV{LIBCXX_ROOT}/lib)
+  find_library(LIBCXX_LIBRARY NAMES libc++.a HINTS ${LIBCXX_ROOT}/lib
+                                                   $ENV{LIBCXX_ROOT}/lib)
   if(ARCH MATCHES "ppc64")
-    set(LIBCXXABI_LIBRARIES " ")
+    set(LIBCXXABI_LIBRARY "")
   else()
-    find_library(LIBCXXABI_LIBRARIES NAMES libc++abi.a HINTS ${LIBCXX_ROOT}/lib
-                                                       $ENV{LIBCXX_ROOT}/lib)
+    find_library(LIBCXXABI_LIBRARY NAMES libc++abi.a HINTS ${LIBCXX_ROOT}/lib
+                                                     $ENV{LIBCXX_ROOT}/lib)
   endif()
 endif()
 
-set(LIBCXX_INCLUDE_DIRS ${LIBCXX_INCLUDE_DIR})
+if(LIBCXX_INCLUDE_DIR AND LIBCXX_LIBRARY AND LIBCXXABI_LIBRARY)
+  set(LIBCXX_INCLUDE_DIRS ${LIBCXX_INCLUDE_DIR})
+  set(LIBCXX_LIBRARIES ${LIBCXX_LIBRARY})
+  set(LIBCXXABI_LIBRARIES ${LIBCXXABI_LIBRARY})
+else()
+  set(LIBCXX_INCLUDE_DIRS "")
+  set(LIBCXX_LIBRARIES "")
+  set(LIBCXXABI_LIBRARIES "")
+endif()
 
 # Handle the QUIETLY and REQUIRED arguments and set LIBCXX_FOUND to TRUE if
 # all listed variables are TRUE.

diff --git a/cmake/FindMCSS.cmake b/cmake/FindMCSS.cmake
@@ -24,9 +24,6 @@ if(MCSS_DOX2HTML5 AND PYTHONINTERP_FOUND AND PYGMENTS_FOUND AND JINJA2_FOUND AND
   set (MCSS_FIND_QUIETLY TRUE)
 endif()
 
-# Find Python 3 and prerequisites for m.css
-find_package(PythonInterp 3.6)
-
 if (PYTHONINTERP_FOUND)
 
   execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import pygments"

diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
@@ -47,6 +47,7 @@ find_path (NETCDF_INCLUDES netcdf_par.h
                  ${NETCDF_DIR}
                  $ENV{NETCDF_DIR}
                  ${CMAKE_INSTALL_PREFIX}
+                 /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/netcdf/mpi
             PATH_SUFFIXES include)
 
 if(NOT BUILD_SHARED_LIBS)
@@ -55,13 +56,15 @@ if(NOT BUILD_SHARED_LIBS)
                       ${NETCDF_DIR}
                       $ENV{NETCDF_DIR}
                       ${CMAKE_INSTALL_PREFIX}
+                      /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/netcdf/mpi
                 PATH_SUFFIXES lib lib64)
 else()
   find_library (NETCDF_LIBRARIES_C NAMES netcdf
                 HINTS ${NETCDF_ROOT}
                       ${NETCDF_DIR}
                       $ENV{NETCDF_DIR}
                       ${CMAKE_INSTALL_PREFIX}
+                      /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/netcdf/mpi
                 PATH_SUFFIXES lib lib64)
 endif()
 mark_as_advanced(NETCDF_LIBRARIES_C)

diff --git a/cmake/FindPEGTL.cmake b/cmake/FindPEGTL.cmake
@@ -23,29 +23,29 @@
 #  find_package(PEGTL)
 #  include_directories(${PEGTL_INCLUDE_DIRS})
 
-function(_PEGTL_GET_VERSION _OUT_major _OUT_minor _OUT_micro _metisversion_hdr)
-    file(STRINGS ${_metisversion_hdr} _contents REGEX "#define TAOCPP_PEGTL_VERSION_[A-Z]+[ \t]+")
+function(_PEGTL_GET_VERSION _OUT_major _OUT_minor _OUT_micro _version_hdr)
+    file(STRINGS ${_version_hdr} _contents REGEX "#define TAO.*_PEGTL_VERSION_[A-Z]+[ \t]+")
     if(_contents)
-        string(REGEX REPLACE ".*#define TAOCPP_PEGTL_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" ${_OUT_major} "${_contents}")
-        string(REGEX REPLACE ".*#define TAOCPP_PEGTL_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" ${_OUT_minor} "${_contents}")
-        string(REGEX REPLACE ".*#define TAOCPP_PEGTL_VERSION_PATCH[ \t]+([0-9]+).*" "\\1" ${_OUT_micro} "${_contents}")
+        string(REGEX REPLACE ".*#define TAO.*_PEGTL_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" ${_OUT_major} "${_contents}")
+        string(REGEX REPLACE ".*#define TAO.*_PEGTL_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" ${_OUT_minor} "${_contents}")
+        string(REGEX REPLACE ".*#define TAO.*_PEGTL_VERSION_PATCH[ \t]+([0-9]+).*" "\\1" ${_OUT_micro} "${_contents}")
 
         if(NOT ${_OUT_major} MATCHES "[0-9]+")
-            message(FATAL_ERROR "Version parsing failed for TAOCPP_PEGTL_VERSION_MAJOR!")
+            message(FATAL_ERROR "Version parsing failed for TAO.*_PEGTL_VERSION_MAJOR!")
         endif()
         if(NOT ${_OUT_minor} MATCHES "[0-9]+")
-            message(FATAL_ERROR "Version parsing failed for TAOCPP_PEGTL_VERSION_MINOR!")
+            message(FATAL_ERROR "Version parsing failed for TAO.*_PEGTL_VERSION_MINOR!")
         endif()
         if(NOT ${_OUT_micro} MATCHES "[0-9]+")
-            message(FATAL_ERROR "Version parsing failed for TAOCPP_PEGTL_VERSION_PATCH!")
+            message(FATAL_ERROR "Version parsing failed for TAO.*_PEGTL_VERSION_PATCH!")
         endif()
 
         set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
         set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
         set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
 
     else()
-        message(FATAL_ERROR "Include file ${_metisversion_hdr} does not exist")
+        message(FATAL_ERROR "Include file ${_version_hdr} does not exist")
     endif()
 endfunction()
 

diff --git a/cmake/FindRandom123.cmake b/cmake/FindRandom123.cmake
@@ -29,20 +29,17 @@ if(RANDOM123_INCLUDE_DIRS)
   set (RANDOM123_FIND_QUIETLY TRUE)
 endif()
 
-find_path(RANDOM123_INCLUDE_PHILOX NAMES philox.h
-                                   HINTS ${RANDOM123_ROOT}/include
-                                         $ENV{RANDOM123_ROOT}
-                                   PATH_SUFFIXES Random123)
-
-find_path(RANDOM123_INCLUDE_THREEFRY NAMES threefry.h
-                                     HINTS ${RANDOM123_ROOT}/include
-                                           $ENV{RANDOM123_ROOT}
-                                     PATH_SUFFIXES Random123)
-
-find_path(RANDOM123_INCLUDE_UNIFORM NAMES uniform.hpp
-                                    HINTS ${RANDOM123_ROOT}/include
-                                          $ENV{RANDOM123_ROOT}
-                                    PATH_SUFFIXES Random123)
+find_path(RANDOM123_INCLUDE_PHILOX NAMES Random123/philox.h
+                                   HINTS ${RANDOM123_ROOT}
+                                         $ENV{RANDOM123_ROOT})
+
+find_path(RANDOM123_INCLUDE_THREEFRY NAMES Random123/threefry.h
+                                     HINTS ${RANDOM123_ROOT}
+                                           $ENV{RANDOM123_ROOT})
+
+find_path(RANDOM123_INCLUDE_UNIFORM NAMES Random123/uniform.hpp
+                                    HINTS ${RANDOM123_ROOT}
+                                          $ENV{RANDOM123_ROOT})
 
 set(RANDOM123_INCLUDE_DIRS ${RANDOM123_INCLUDE_PHILOX}
                            ${RANDOM123_INCLUDE_THREEFRY}