Merge branch 'develop' into release/3.0.0

LLNL · Jul 6, 2020 · 47992d7 · 47992d7
2 parents 058b44d + e9f1e9b
commit 47992d7
Show file tree

Hide file tree

Showing 10 changed files with 215 additions and 211 deletions.
diff --git a/src/umpire/interface/c_fortran/typesUmpire.h b/src/umpire/interface/c_fortran/typesUmpire.h
@@ -1,5 +1,5 @@
 // typesUmpire.h
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //
@@ -74,7 +74,8 @@ struct s_umpire_SHROUD_array {
     int type;        /* type of element */
     size_t elem_len; /* bytes-per-item or character len in c++ */
     size_t size;     /* size of data in c++ */
-    int rank;        /* number of dimensions */
+    int rank;        /* number of dimensions, 0=scalar */
+    long shape[7];
 };
 typedef struct s_umpire_SHROUD_array umpire_SHROUD_array;
 

diff --git a/src/umpire/interface/c_fortran/utilUmpire.cpp b/src/umpire/interface/c_fortran/utilUmpire.cpp
@@ -1,5 +1,5 @@
 // utilUmpire.cpp
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //

diff --git a/src/umpire/interface/c_fortran/wrapAllocator.cpp b/src/umpire/interface/c_fortran/wrapAllocator.cpp
@@ -1,5 +1,5 @@
 // wrapAllocator.cpp
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //
@@ -18,9 +18,10 @@ extern "C" {
 
 // helper ShroudStrToArray
 // Save str metadata into array to allow Fortran to access values.
+// CHARACTER(len=elem_size) src
 static void ShroudStrToArray(umpire_SHROUD_array *array, const std::string * src, int idtor)
 {
-    array->cxx.addr = static_cast<void *>(const_cast<std::string *>(src));
+    array->cxx.addr = const_cast<std::string *>(src);
     array->cxx.idtor = idtor;
     if (src->empty()) {
         array->addr.ccharp = NULL;
@@ -30,7 +31,7 @@ static void ShroudStrToArray(umpire_SHROUD_array *array, const std::string * src
         array->elem_len = src->length();
     }
     array->size = 1;
-    array->rank = 1;
+    array->rank = 0;  // scalar
 }
 // splicer begin class.Allocator.C_definitions
 // splicer end class.Allocator.C_definitions

diff --git a/src/umpire/interface/c_fortran/wrapAllocator.h b/src/umpire/interface/c_fortran/wrapAllocator.h
@@ -1,5 +1,5 @@
 // wrapAllocator.h
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //

diff --git a/src/umpire/interface/c_fortran/wrapResourceManager.cpp b/src/umpire/interface/c_fortran/wrapResourceManager.cpp
@@ -1,5 +1,5 @@
 // wrapResourceManager.cpp
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //
@@ -31,7 +31,7 @@ umpire_resourcemanager * umpire_resourcemanager_get_instance(
     // splicer begin class.ResourceManager.method.get_instance
     umpire::ResourceManager & SHCXX_rv =
         umpire::ResourceManager::getInstance();
-    SHC_rv->addr = static_cast<void *>(&SHCXX_rv);
+    SHC_rv->addr = &SHCXX_rv;
     SHC_rv->idtor = 0;
     return SHC_rv;
     // splicer end class.ResourceManager.method.get_instance
@@ -47,7 +47,7 @@ umpire_allocator * umpire_resourcemanager_get_allocator_by_name(
     const std::string SHCXX_name(name);
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->getAllocator(SHCXX_name);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.get_allocator_by_name
@@ -63,7 +63,7 @@ umpire_allocator * umpire_resourcemanager_get_allocator_by_name_bufferify(
     const std::string SHCXX_name(name, Lname);
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->getAllocator(SHCXX_name);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.get_allocator_by_name_bufferify
@@ -78,7 +78,7 @@ umpire_allocator * umpire_resourcemanager_get_allocator_by_id(
     // splicer begin class.ResourceManager.method.get_allocator_by_id
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->getAllocator(id);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.get_allocator_by_id
@@ -98,7 +98,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_pool(
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->makeAllocator<umpire::strategy::DynamicPool>(
         SHCXX_name, *SHCXX_allocator, initial_size, block);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_pool
@@ -118,7 +118,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_pool(
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->makeAllocator<umpire::strategy::DynamicPool>(
         SHCXX_name, *SHCXX_allocator, initial_size, block);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_pool
@@ -139,7 +139,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_list_pool(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::DynamicPoolList>(
         SHCXX_name, *SHCXX_allocator, initial_size, block);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_list_pool
@@ -160,7 +160,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_list_pool(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::DynamicPoolList>(
         SHCXX_name, *SHCXX_allocator, initial_size, block);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_list_pool
@@ -182,7 +182,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_advisor(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::AllocationAdvisor>(
         SHCXX_name, *SHCXX_allocator, SHCXX_advice_op, device_id);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_advisor
@@ -204,7 +204,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_advisor(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::AllocationAdvisor>(
         SHCXX_name, *SHCXX_allocator, SHCXX_advice_op, device_id);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_advisor
@@ -224,7 +224,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_named(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::NamedAllocationStrategy>(
         SHCXX_name, *SHCXX_allocator);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_named
@@ -244,7 +244,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_named(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::NamedAllocationStrategy>(
         SHCXX_name, *SHCXX_allocator);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_named
@@ -264,7 +264,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_thread_safe(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::ThreadSafeAllocator>(
         SHCXX_name, *SHCXX_allocator);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_thread_safe
@@ -284,7 +284,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_thread_safe(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::ThreadSafeAllocator>(
         SHCXX_name, *SHCXX_allocator);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_thread_safe
@@ -304,7 +304,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_fixed_pool(
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->makeAllocator<umpire::strategy::FixedPool>(
         SHCXX_name, *SHCXX_allocator, object_size);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_fixed_pool
@@ -324,7 +324,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_fixed_pool(
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->makeAllocator<umpire::strategy::FixedPool>(
         SHCXX_name, *SHCXX_allocator, object_size);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_fixed_pool
@@ -345,7 +345,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_prefetcher(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::AllocationPrefetcher>(
         SHCXX_name, *SHCXX_allocator, device_id);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_prefetcher
@@ -366,7 +366,7 @@ umpire_allocator * umpire_resourcemanager_make_allocator_bufferify_prefetcher(
     *SHCXX_rv =
         SH_this->makeAllocator<umpire::strategy::AllocationPrefetcher>(
         SHCXX_name, *SHCXX_allocator, device_id);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.make_allocator_bufferify_prefetcher
@@ -409,7 +409,7 @@ umpire_allocator * umpire_resourcemanager_get_allocator_for_ptr(
     // splicer begin class.ResourceManager.method.get_allocator_for_ptr
     umpire::Allocator * SHCXX_rv = new umpire::Allocator;
     *SHCXX_rv = SH_this->getAllocator(ptr);
-    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->addr = SHCXX_rv;
     SHC_rv->idtor = 1;
     return SHC_rv;
     // splicer end class.ResourceManager.method.get_allocator_for_ptr

diff --git a/src/umpire/interface/c_fortran/wrapResourceManager.h b/src/umpire/interface/c_fortran/wrapResourceManager.h
@@ -1,5 +1,5 @@
 // wrapResourceManager.h
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //

diff --git a/src/umpire/interface/c_fortran/wrapUmpire.cpp b/src/umpire/interface/c_fortran/wrapUmpire.cpp
@@ -1,5 +1,5 @@
 // wrapUmpire.cpp
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //
@@ -22,9 +22,10 @@ extern "C" {
 
 // helper ShroudStrToArray
 // Save str metadata into array to allow Fortran to access values.
+// CHARACTER(len=elem_size) src
 static void ShroudStrToArray(umpire_SHROUD_array *array, const std::string * src, int idtor)
 {
-    array->cxx.addr = static_cast<void *>(const_cast<std::string *>(src));
+    array->cxx.addr = const_cast<std::string *>(src);
     array->cxx.idtor = idtor;
     if (src->empty()) {
         array->addr.ccharp = NULL;
@@ -34,7 +35,7 @@ static void ShroudStrToArray(umpire_SHROUD_array *array, const std::string * src
         array->elem_len = src->length();
     }
     array->size = 1;
-    array->rank = 1;
+    array->rank = 0;  // scalar
 }
 // splicer begin C_definitions
 // splicer end C_definitions
@@ -65,7 +66,7 @@ void umpire_get_backtrace_bufferify(void * ptr,
     // splicer end function.get_backtrace_bufferify
 }
 
-size_t umpire_get_process_memory_usage()
+size_t umpire_get_process_memory_usage(void)
 {
     // splicer begin function.get_process_memory_usage
     size_t SHC_rv = umpire::get_process_memory_usage();

diff --git a/src/umpire/interface/c_fortran/wrapUmpire.h b/src/umpire/interface/c_fortran/wrapUmpire.h
@@ -1,5 +1,5 @@
 // wrapUmpire.h
-// This file is generated by Shroud 0.11.0. Do not edit.
+// This file is generated by Shroud 0.12.1. Do not edit.
 // Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and Umpire
 // project contributors. See the COPYRIGHT file for details.
 //
@@ -38,7 +38,7 @@ bool umpire_pointer_contains(void * left, void * right);
 void umpire_get_backtrace_bufferify(void * ptr,
     umpire_SHROUD_array *DSHF_rv);
 
-size_t umpire_get_process_memory_usage();
+size_t umpire_get_process_memory_usage(void);
 
 size_t umpire_get_device_memory_usage(int device_id);