Update shroud wrappers (LLNL#558)

Author: daboehme

examples/apps/CMakeLists.txt

@@ -40,7 +40,7 @@ if (CALIPER_HAVE_MPI)
     target_link_libraries(${app} caliper ${MPI_CXX_LIBRARIES})
   endforeach()
 endif()
-  
+
 if (WITH_FORTRAN)
   foreach(app ${CALIPER_Fortran_EXAMPLE_APPS})
     add_executable(${app} ${app}.f)

examples/apps/fortran-example.f

@@ -35,7 +35,9 @@ program fortran_example
     ! A scope annotation. Start region 'main'
     call cali_begin_region('main')
 
+    call cali_begin_phase('init')
     count = 4
+    call cali_end_phase('init')
 
     !   Annotate a loop. We'll have to find Caliper's built-in "loop"
     ! attribute first and create a loop iteration attribute, using the region
@@ -45,17 +47,16 @@ program fortran_example
     iter_attribute = cali_make_loop_iteration_attribute('mainloop')
 
     call cali_begin_string(loop_attribute, 'mainloop')
-
     do i = 1, count
         call cali_begin_int(iter_attribute, i)
 
         ! ...
 
         call cali_end(iter_attribute)
     end do
-
     call cali_end(loop_attribute)
 
+
     ! End 'main'
     call cali_end_region('main')
 

scripts/radiuss-spack-configs

@@ -37,6 +37,7 @@ if (CALIPER_HAVE_FORTRAN)
   target_include_directories(
       caliper
     PUBLIC
+      "$<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>"
       "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/caliper/fortran>"
   )
 endif()

scripts/uberenv

@@ -2,7 +2,6 @@ set(CALIPER_INTERFACE_SOURCES
   BufferedRegionProfile.cpp
   wrapAnnotation.cpp
   wrapBufferedRegionProfile.cpp
-  wrapCaliper.cpp
   wrapConfigManager.cpp
   wrapScopeAnnotation.cpp
   utilCaliper.cpp)

src/CMakeLists.txt

@@ -1,17 +1,22 @@
 // typesCaliper.h
-// This file is generated by Shroud 0.12.2. Do not edit.
+// This file is generated by Shroud 0.13.0. Do not edit.
 // For C users and C++ implementation
 
 #ifndef TYPESCALIPER_H
 #define TYPESCALIPER_H
 
 #include <stddef.h>
 
+// splicer begin types.CXX_declarations
+// splicer end types.CXX_declarations
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+// splicer begin types.C_declarations
+// splicer end types.C_declarations
+
 // helper capsule_data_helper
 struct s_cali_SHROUD_capsule_data {
     void *addr;     /* address of C++ memory */

src/interface/c_fortran/CMakeLists.txt

@@ -1,6 +1,10 @@
 // utilCaliper.cpp
-// This file is generated by Shroud 0.12.2. Do not edit.
+// This file is generated by Shroud 0.13.0. Do not edit.
 
+#include "caliper/cali.h"
+#include "caliper/ConfigManager.h"
+#include <string>
+#include "BufferedRegionProfile.h"
 #include "typesCaliper.h"
 #include <cstddef>
 #include <cstring>
@@ -22,6 +26,60 @@ void cali_ShroudCopyStringAndFree(cali_SHROUD_array *data, char *c_var, size_t c
 }
 
 
+// Release library allocated memory.
+void cali_SHROUD_memory_destructor(cali_SHROUD_capsule_data *cap)
+{
+    void *ptr = cap->addr;
+    switch (cap->idtor) {
+    case 0:   // --none--
+    {
+        // Nothing to delete
+        break;
+    }
+    case 1:   // cali::ScopeAnnotation
+    {
+        cali::ScopeAnnotation *cxx_ptr = 
+            reinterpret_cast<cali::ScopeAnnotation *>(ptr);
+        delete cxx_ptr;
+        break;
+    }
+    case 2:   // cali::Annotation
+    {
+        cali::Annotation *cxx_ptr = 
+            reinterpret_cast<cali::Annotation *>(ptr);
+        delete cxx_ptr;
+        break;
+    }
+    case 3:   // cali::ConfigManager
+    {
+        cali::ConfigManager *cxx_ptr = 
+            reinterpret_cast<cali::ConfigManager *>(ptr);
+        delete cxx_ptr;
+        break;
+    }
+    case 4:   // new_string
+    {
+        std::string *cxx_ptr = reinterpret_cast<std::string *>(ptr);
+        delete cxx_ptr;
+        break;
+    }
+    case 5:   // cali::BufferedRegionProfile
+    {
+        cali::BufferedRegionProfile *cxx_ptr = 
+            reinterpret_cast<cali::BufferedRegionProfile *>(ptr);
+        delete cxx_ptr;
+        break;
+    }
+    default:
+    {
+        // Unexpected case in destructor
+        break;
+    }
+    }
+    cap->addr = nullptr;
+    cap->idtor = 0;  // avoid deleting again
+}
+
 #ifdef __cplusplus
 }
 #endif

src/interface/c_fortran/typesCaliper.h

@@ -1,9 +1,9 @@
 // wrapAnnotation.cpp
-// This file is generated by Shroud 0.12.2. Do not edit.
-#include "wrapAnnotation.h"
+// This file is generated by Shroud 0.13.0. Do not edit.
 
 #include "caliper/cali.h"
 #include <cstddef>
+#include "wrapAnnotation.h"
 
 // splicer begin class.Annotation.CXX_definitions
 // splicer end class.Annotation.CXX_definitions
@@ -14,24 +14,24 @@ extern "C" {
 // splicer end class.Annotation.C_definitions
 
 cali_Annotation * cali_Annotation_new(const char * key,
-    cali_Annotation * SHadow_rv)
+    cali_Annotation * SHC_rv)
 {
     // splicer begin class.Annotation.method.new
     cali::Annotation *SHCXX_rv = new cali::Annotation(key);
-    SHadow_rv->addr = static_cast<void *>(SHCXX_rv);
-    SHadow_rv->idtor = 2;
-    return SHadow_rv;
+    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->idtor = 2;
+    return SHC_rv;
     // splicer end class.Annotation.method.new
 }
 
 cali_Annotation * cali_Annotation_new_with_properties(const char * key,
-    int properties, cali_Annotation * SHadow_rv)
+    int properties, cali_Annotation * SHC_rv)
 {
     // splicer begin class.Annotation.method.new_with_properties
     cali::Annotation *SHCXX_rv = new cali::Annotation(key, properties);
-    SHadow_rv->addr = static_cast<void *>(SHCXX_rv);
-    SHadow_rv->idtor = 2;
-    return SHadow_rv;
+    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->idtor = 2;
+    return SHC_rv;
     // splicer end class.Annotation.method.new_with_properties
 }
 

src/interface/c_fortran/utilCaliper.cpp

@@ -1,5 +1,5 @@
 // wrapAnnotation.h
-// This file is generated by Shroud 0.12.2. Do not edit.
+// This file is generated by Shroud 0.13.0. Do not edit.
 /**
  * \file wrapAnnotation.h
  * \brief Shroud generated wrapper for Annotation class
@@ -22,10 +22,10 @@ extern "C" {
 // splicer end class.Annotation.C_declarations
 
 cali_Annotation * cali_Annotation_new(const char * key,
-    cali_Annotation * SHadow_rv);
+    cali_Annotation * SHC_rv);
 
 cali_Annotation * cali_Annotation_new_with_properties(const char * key,
-    int properties, cali_Annotation * SHadow_rv);
+    int properties, cali_Annotation * SHC_rv);
 
 void cali_Annotation_delete(cali_Annotation * self);
 

src/interface/c_fortran/wrapAnnotation.cpp

@@ -1,9 +1,9 @@
 // wrapBufferedRegionProfile.cpp
-// This file is generated by Shroud 0.12.2. Do not edit.
-#include "wrapBufferedRegionProfile.h"
+// This file is generated by Shroud 0.13.0. Do not edit.
 
 #include "BufferedRegionProfile.h"
 #include <cstddef>
+#include "wrapBufferedRegionProfile.h"
 
 // splicer begin class.BufferedRegionProfile.CXX_definitions
 // splicer end class.BufferedRegionProfile.CXX_definitions
@@ -14,14 +14,14 @@ extern "C" {
 // splicer end class.BufferedRegionProfile.C_definitions
 
 cali_BufferedRegionProfile * cali_BufferedRegionProfile_new(
-    cali_BufferedRegionProfile * SHadow_rv)
+    cali_BufferedRegionProfile * SHC_rv)
 {
     // splicer begin class.BufferedRegionProfile.method.new
     cali::BufferedRegionProfile *SHCXX_rv =
         new cali::BufferedRegionProfile();
-    SHadow_rv->addr = static_cast<void *>(SHCXX_rv);
-    SHadow_rv->idtor = 5;
-    return SHadow_rv;
+    SHC_rv->addr = static_cast<void *>(SHCXX_rv);
+    SHC_rv->idtor = 5;
+    return SHC_rv;
     // splicer end class.BufferedRegionProfile.method.new
 }
 

src/interface/c_fortran/wrapAnnotation.h

@@ -1,5 +1,5 @@
 // wrapBufferedRegionProfile.h
-// This file is generated by Shroud 0.12.2. Do not edit.
+// This file is generated by Shroud 0.13.0. Do not edit.
 /**
  * \file wrapBufferedRegionProfile.h
  * \brief Shroud generated wrapper for BufferedRegionProfile class
@@ -22,7 +22,7 @@ extern "C" {
 // splicer end class.BufferedRegionProfile.C_declarations
 
 cali_BufferedRegionProfile * cali_BufferedRegionProfile_new(
-    cali_BufferedRegionProfile * SHadow_rv);
+    cali_BufferedRegionProfile * SHC_rv);
 
 void cali_BufferedRegionProfile_delete(
     cali_BufferedRegionProfile * self);

src/interface/c_fortran/wrapBufferedRegionProfile.cpp

@@ -1,5 +1,5 @@
 // wrapCaliper.h
-// This file is generated by Shroud 0.12.2. Do not edit.
+// This file is generated by Shroud 0.13.0. Do not edit.
 /**
  * \file wrapCaliper.h
  * \brief Shroud generated wrapper for cali namespace
@@ -18,6 +18,11 @@
 extern "C" {
 #endif
 
+// typedef cali::cali_id_t
+// splicer begin typedef.cali_id_t
+typedef uint64_t cali_cali_id_t;
+// splicer end typedef.cali_id_t
+
 //  cali::cali_attr_properties
 enum cali_cali_attr_properties {
     cali_CALI_ATTR_DEFAULT = 0,
@@ -30,7 +35,8 @@ enum cali_cali_attr_properties {
     cali_CALI_ATTR_HIDDEN = 128,
     cali_CALI_ATTR_NESTED = 256,
     cali_CALI_ATTR_GLOBAL = 512,
-    cali_CALI_ATTR_UNALIGNED = 1024
+    cali_CALI_ATTR_UNALIGNED = 1024,
+    cali_CALI_ATTR_AGGREGATABLE = 2048
 };
 
 //  cali::cali_attr_type