Merge pull request #1009 from LLNL/bugfix/kweiss/odds-and-ends

Fixes several outstanding bugs

src/axom/quest/examples/CMakeLists.txt

@@ -53,9 +53,11 @@ if(ENABLE_MPI AND AXOM_ENABLE_SIDRE)
 
         # Run the distributed closest point example on N ranks for each enabled policy
         set(_policies "seq")
-        blt_list_append(TO _policies ELEMENTS "omp" IF ENABLE_OPENMP)
-        blt_list_append(TO _policies ELEMENTS "cuda" IF ENABLE_CUDA)
-        blt_list_append(TO _policies ELEMENTS "hip" IF ENABLE_HIP)
+        if(RAJA_FOUND)
+            blt_list_append(TO _policies ELEMENTS "cuda" IF ENABLE_CUDA)
+            blt_list_append(TO _policies ELEMENTS "hip" IF ENABLE_HIP)
+            blt_list_append(TO _policies ELEMENTS "omp" IF ENABLE_OPENMP)
+        endif()
 
         # Non-zero empty-rank probability tests domain underloading case
         set(_meshes "mdmesh.2x1" "mdmesh.2x3")

src/axom/spin/internal/linear_bvh/build_radix_tree.hpp

@@ -264,7 +264,7 @@ void sort_mcodes(Array<uint32>& mcodes, int32 size, const ArrayView<int32> iter)
 
     std::stable_sort(iter.begin(),
                      iter.begin() + size,
-                     [=](int32 i1, int32 i2) { return mcodes[i1] < mcodes[i2]; });
+                     [&](int32 i1, int32 i2) { return mcodes[i1] < mcodes[i2]; });
 
   );
 

src/cmake/thirdparty/SetupAxomThirdParty.cmake

@@ -99,6 +99,25 @@ if (RAJA_DIR)
         message(STATUS "RAJA loaded: ${RAJA_DIR}")
         set(RAJA_FOUND TRUE CACHE BOOL "")
     endif()
+
+    # Suppress warnings from cub and cuda related to the (low) version 
+    # of clang that XL compiler pretends to be.
+    if(C_COMPILER_FAMILY_IS_XL)
+        if(TARGET RAJA::cub)
+            blt_add_target_definitions(
+                TO RAJA::cub
+                SCOPE INTERFACE
+                TARGET_DEFINITIONS CUB_IGNORE_DEPRECATED_CPP_DIALECT)
+        endif()
+
+        if(TARGET cuda)
+            blt_add_target_definitions(
+                TO cuda
+                SCOPE INTERFACE
+                TARGET_DEFINITIONS THRUST_IGNORE_DEPRECATED_CPP_DIALECT)
+        endif()
+    endif()
+
 else()
     message(STATUS "RAJA support is OFF" )
     set(RAJA_FOUND FALSE CACHE BOOL "")

src/thirdparty/axom/fmt/README

@@ -11,5 +11,6 @@ We also put fmt in the axom namespace to isolate it from other libraries that mi
 > find . -type f -regex .*[.]h$ -exec sed -i "s/fmt::/axom::fmt::/g" {} \;
 * Add `namespace axom { \` to `AXOM_FMT_BEGIN_NAMESPACE` in `fmt/core.h`
 * Add `}                \` to `AXOM_FMT_END_NAMESPACE` in `fmt/core.h`
-* Apply `src/thirdparty/axom/fmt/xl_clang.patch` -- bugfix for XL compiler
+* Apply `src/thirdparty/axom/fmt/xl_printf.patch` -- bugfix for XL compiler
 * Apply `src/thirdparty/axom/fmt/hipcc_long_double.patch` -- bugfix for dealing with `long double` type on EAS architecture with hip compiler
+* Apply `src/thirdparty/axom/fmt/runtime_error.patch` -- workaround for dealing with `std::runtime_error` bug in nvcc

src/thirdparty/axom/fmt/format-inl.h

@@ -121,11 +121,17 @@ template <typename Char> AXOM_FMT_FUNC Char decimal_point_impl(locale_ref) {
 AXOM_FMT_API AXOM_FMT_FUNC format_error::~format_error() noexcept = default;
 #endif
 
-AXOM_FMT_FUNC std::system_error vsystem_error(int error_code, string_view format_str,
+// BEGIN AXOM BUGFIX
+// NVCC's preprocessor converts 'std::error_code' to `class std::error_code'
+// and then complains that `return class std::error_code' isn't valid!
+using axom_fmt_system_error = std::system_error;
+
+AXOM_FMT_FUNC axom_fmt_system_error vsystem_error(int error_code, string_view format_str,
                                          format_args args) {
   auto ec = std::error_code(error_code, std::generic_category());
-  return std::system_error(ec, vformat(format_str, args));
+  return axom_fmt_system_error(ec, vformat(format_str, args));
 }
+// END AXOM BUGFIX
 
 namespace detail {
 
@@ -1449,16 +1455,18 @@ AXOM_FMT_FUNC detail::utf8_to_utf16::utf8_to_utf16(string_view s) {
   buffer_.push_back(0);
 }
 
+// BEGIN AXOM BUGFIX
 AXOM_FMT_FUNC void format_system_error(detail::buffer<char>& out, int error_code,
                                   const char* message) noexcept {
   AXOM_FMT_TRY {
     auto ec = std::error_code(error_code, std::generic_category());
-    write(std::back_inserter(out), std::system_error(ec, message).what());
+    write(std::back_inserter(out), axom_fmt_system_error(ec, message).what());
     return;
   }
   AXOM_FMT_CATCH(...) {}
   format_error_code(out, error_code, message);
 }
+// END AXOM BUGFIX
 
 AXOM_FMT_FUNC void report_system_error(int error_code,
                                   const char* message) noexcept {

src/thirdparty/axom/fmt/format.h

@@ -3393,14 +3393,6 @@ template <typename Char> struct arg_formatter {
   const basic_format_specs<Char>& specs;
   locale_ref locale;
 
-  // BEGIN AXOM BUGFIX
-  arg_formatter(buffer_appender<Char> it, const basic_format_specs<Char>& s)
-  : out (it), specs (s) {}
-
-  arg_formatter(buffer_appender<Char> it, const basic_format_specs<Char>& s, locale_ref l)
-  : out (it), specs (s), locale (l) {}
-  // END AXOM BUGFIX
-
   template <typename T>
   AXOM_FMT_CONSTEXPR AXOM_FMT_INLINE auto operator()(T value) -> iterator {
     return detail::write(out, value, specs, locale);

src/thirdparty/axom/fmt/printf.h

@@ -220,6 +220,16 @@ template <typename Char> class printf_width_handler {
   }
 };
 
+// BEGIN AXOM BUGFIX
+// Workaround for a bug with the XL compiler when initializing
+// printf_arg_formatter's base class.
+template <typename Char>
+auto make_arg_formatter(buffer_appender<Char> iter, basic_format_specs<Char>& s)
+    -> arg_formatter<Char> {
+  return {iter, s, locale_ref()};
+}
+// END AXOM BUGFIX
+
 // The ``printf`` argument formatter.
 template <typename OutputIt, typename Char>
 class printf_arg_formatter : public arg_formatter<Char> {
@@ -237,10 +247,10 @@ class printf_arg_formatter : public arg_formatter<Char> {
   }
 
  public:
-  // BEGIN AXOM BUGFIX
+// BEGIN AXOM BUGFIX
   printf_arg_formatter(OutputIt iter, format_specs& s, context_type& ctx)
-      : base{iter, s}, context_(ctx) {}
-  // END AXOM BUGFIX
+      : base(make_arg_formatter(iter, s)), context_(ctx) {}
+// END AXOM BUGFIX
 
   OutputIt operator()(monostate value) { return base::operator()(value); }
 

src/thirdparty/axom/fmt/runtime_error.patch

@@ -0,0 +1,44 @@
+diff --git a/src/thirdparty/axom/fmt/format-inl.h b/src/thirdparty/axom/fmt/format-inl.h
+index ff6e6323f..efdbeb40a 100644
+--- a/src/thirdparty/axom/fmt/format-inl.h
++++ b/src/thirdparty/axom/fmt/format-inl.h
+@@ -121,11 +121,17 @@ template <typename Char> AXOM_FMT_FUNC Char decimal_point_impl(locale_ref) {
+ AXOM_FMT_API AXOM_FMT_FUNC format_error::~format_error() noexcept = default;
+ #endif
+
+-AXOM_FMT_FUNC std::system_error vsystem_error(int error_code, string_view format_str,
++// BEGIN AXOM BUGFIX
++// NVCC's preprocessor converts 'std::error_code' to `class std::error_code'
++// and then complains that `return class std::error_code' isn't valid!
++using axom_fmt_system_error = std::system_error;
++
++AXOM_FMT_FUNC axom_fmt_system_error vsystem_error(int error_code, string_view format_str,
+                                          format_args args) {
+   auto ec = std::error_code(error_code, std::generic_category());
+-  return std::system_error(ec, vformat(format_str, args));
++  return axom_fmt_system_error(ec, vformat(format_str, args));
+ }
++// END AXOM BUGFIX
+
+ namespace detail {
+
+@@ -1449,16 +1455,18 @@ AXOM_FMT_FUNC detail::utf8_to_utf16::utf8_to_utf16(string_view s) {
+   buffer_.push_back(0);
+ }
+
++// BEGIN AXOM BUGFIX
+ AXOM_FMT_FUNC void format_system_error(detail::buffer<char>& out, int error_code,
+                                   const char* message) noexcept {
+   AXOM_FMT_TRY {
+     auto ec = std::error_code(error_code, std::generic_category());
+-    write(std::back_inserter(out), std::system_error(ec, message).what());
++    write(std::back_inserter(out), axom_fmt_system_error(ec, message).what());
+     return;
+   }
+   AXOM_FMT_CATCH(...) {}
+   format_error_code(out, error_code, message);
+ }
++// END AXOM BUGFIX
+
+ AXOM_FMT_FUNC void report_system_error(int error_code,
+                                   const char* message) noexcept {

src/thirdparty/axom/fmt/xl_printf.patch

@@ -0,0 +1,33 @@
+diff --git a/src/thirdparty/axom/fmt/printf.h b/src/thirdparty/axom/fmt/printf.h
+index 1c6f960a6..7f221d01b 100644
+--- a/src/thirdparty/axom/fmt/printf.h
++++ b/src/thirdparty/axom/fmt/printf.h
+@@ -220,6 +220,16 @@ template <typename Char> class printf_width_handler {
+   }
+ };
+
++// BEGIN AXOM BUGFIX
++// Workaround for a bug with the XL compiler when initializing
++// printf_arg_formatter's base class.
++template <typename Char>
++auto make_arg_formatter(buffer_appender<Char> iter, basic_format_specs<Char>& s)
++    -> arg_formatter<Char> {
++  return {iter, s, locale_ref()};
++}
++// END AXOM BUGFIX
++
+ // The ``printf`` argument formatter.
+ template <typename OutputIt, typename Char>
+ class printf_arg_formatter : public arg_formatter<Char> {
+@@ -237,8 +247,10 @@ class printf_arg_formatter : public arg_formatter<Char> {
+   }
+
+  public:
++// BEGIN AXOM BUGFIX
+   printf_arg_formatter(OutputIt iter, format_specs& s, context_type& ctx)
+-      : base{iter, s, locale_ref()}, context_(ctx) {}
++      : base(make_arg_formatter(iter, s)), context_(ctx) {}
++// END AXOM BUGFIX
+
+   OutputIt operator()(monostate value) { return base::operator()(value); }
+

src/thirdparty/tests/CMakeLists.txt

@@ -130,11 +130,14 @@ endif()
 #------------------------------------------------------------------------------
 # Smoke test for fmt third party library
 #------------------------------------------------------------------------------
+set(fmt_smoke_dependencies fmt gtest)
+blt_list_append( TO fmt_smoke_dependencies ELEMENTS cuda IF ENABLE_CUDA)
+
 blt_add_executable(
     NAME fmt_smoke_test
     SOURCES fmt_smoke.cpp
     OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY}
-    DEPENDS_ON fmt gtest
+    DEPENDS_ON ${fmt_smoke_dependencies}
     FOLDER axom/thirdparty/tests )
 
 axom_add_test(NAME    fmt_smoke

src/thirdparty/tests/fmt_smoke.cpp

@@ -16,6 +16,10 @@
 
 #include "gtest/gtest.h"
 
+// Note: The following line generates an error with nvcc on [email protected]
+// Axom has a patch to workaround this error.
+using namespace std;
+
 //-----------------------------------------------------------------------------
 TEST(fmt_smoke, basic_use)
 {