Merge pull request #606 from masterleinad/fix_dtk_release

Fix compiling with gcc-13
ORNL-CEES · Oct 14, 2023 · bfb7673 · bfb7673
2 parents 60a4cbd + 69ad3d7
commit bfb7673
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/packages/Utils/src/DTK_ConfigDefs.hpp b/packages/Utils/src/DTK_ConfigDefs.hpp
@@ -21,13 +21,8 @@
 
 #include <string>
 
-namespace DataTransferKit
-{
-
 #include "DTK_Types.h"
 
 #define DTK_MARK_REGION( x ) std::string( "DTK_" ) + x
 
-} // namespace DataTransferKit
-
 #endif // #ifndef DTK_CONFIGDEFS_HPP
diff --git a/packages/Utils/src/DTK_Core.cpp b/packages/Utils/src/DTK_Core.cpp
@@ -33,8 +33,7 @@ void initKokkos( Args &&... args )
         // Kokkos doesn't have a global is_initialized().  However,
         // Kokkos::initialize() always initializes the default execution
         // space, so it suffices to check whether that was initialized.
-        const bool kokkosIsInitialized =
-            Kokkos::DefaultExecutionSpace::impl_is_initialized();
+        const bool kokkosIsInitialized = Kokkos::is_initialized();
 
         if ( !kokkosIsInitialized )
         {
@@ -45,8 +44,7 @@ void initKokkos( Args &&... args )
         }
     }
 
-    const bool kokkosIsInitialized =
-        Kokkos::DefaultExecutionSpace::impl_is_initialized();
+    const bool kokkosIsInitialized = Kokkos::is_initialized();
 
     if ( !kokkosIsInitialized )
         throw DataTransferKitException( "At the end of initKokkos, Kokkos"

diff --git a/packages/Utils/src/DTK_Types.h b/packages/Utils/src/DTK_Types.h
@@ -23,6 +23,8 @@
 #endif
 #endif
 
+namespace DataTransferKit {
+
 //! Coordinate typedef.
 typedef double Coordinate;
 
@@ -32,4 +34,6 @@ typedef int LocalOrdinal;
 //! Global ordinal typedef.
 typedef long long GlobalOrdinal;
 
+}
+
 #endif // DTK_TYPES_H