Bugfix/mpi wtime profiler

doc/shared/sundials/Profiling.rst

@@ -51,7 +51,7 @@ setting the ``CALI_CONFIG`` environment variable.
 
 .. note:: 
 
-   The SUNDIALS profilers requires POSIX timers or the Windows ``profileapi.h`` timers.
+   The SUNDIALS profiler requires POSIX timers or the Windows ``profileapi.h`` timers.
 
 .. warning::
 

include/sundials/sundials_profiler.h

@@ -82,10 +82,6 @@ SUNDIALS_EXPORT int SUNProfiler_Reset(SUNProfiler p);
 
 #define SUNDIALS_MARK_END(profobj, name)
 
-#ifdef __cplusplus
-#define SUNDIALS_CXX_MARK_FUNCTION(profobj)
-#endif
-
 #endif
 
 #ifdef __cplusplus

src/sundials/CMakeLists.txt

@@ -42,6 +42,7 @@ set(sundials_HEADERS
   sundials_nvector.h
   sundials_nvector.hpp
   sundials_profiler.h
+  sundials_profiler.hpp
   sundials_logger.h
   sundials_types.h
   sundials_version.h

test/unit_tests/arkode/CXX_serial/CMakeLists.txt

@@ -50,10 +50,17 @@ foreach(test_tuple ${unit_tests})
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/src)
 
-    # Libraries to link against
+    # We explicitly choose which object libraries to link to
+    # and link in the arkode objects so that we have access to
+    # private functions w/o changing their visibility in the installed libraries.
     target_link_libraries(${test_target}
-      sundials_arkode
-      sundials_nvecserial
+      $<TARGET_OBJECTS:sundials_arkode_obj>
+      sundials_sunmemsys_obj
+      sundials_nvecserial_obj
+      sundials_sunlinsolband_obj
+      sundials_sunlinsoldense_obj
+      sundials_sunnonlinsolnewton_obj
+      sundials_sunnonlinsolfixedpoint_obj
       ${EXE_EXTRA_LINK_LIBS})
 
   endif()

test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp

@@ -22,9 +22,10 @@
  *-----------------------------------------------------------------*/
 
 // Header files
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <cmath>
 #include <arkode/arkode_arkstep.h>
 #include <arkode/arkode_mristep.h>
@@ -99,8 +100,8 @@ int main(int argc, char* argv[])
 
   // if an argument supplied, set fixedpoint (otherwise use SUNFALSE)
   fixedpoint = SUNFALSE;
-  if (argc > 1)  fixedpoint = stoi(argv[1], NULL);
-  if (argc > 2)  Nt = stoi(argv[2], NULL);
+  if (argc > 1)  fixedpoint = std::stoi(argv[1], NULL);
+  if (argc > 2)  Nt = std::stoi(argv[2], NULL);
 
   // Initial problem output
   cout << "\nAnalytical ODE test problem:\n";

test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp

@@ -17,10 +17,11 @@
  * ---------------------------------------------------------------------------*/
 
 // Header files
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
-#include <string.h>
+#include <cstring>
 #include <cmath>
+#include <string>
 
 #include <arkode/arkode_arkstep.h>
 #include <arkode/arkode_mristep.h>
@@ -91,12 +92,12 @@ int main(int argc, char* argv[])
   UserData udata;
 
   // Check for inputs
-  if (argc > 1) udata.lambda_e = stod(argv[1]);
-  if (argc > 2) udata.lambda_i = stod(argv[2]);
-  if (argc > 3) udata.lambda_f = stod(argv[3]);
-  if (argc > 4) hs = stod(argv[4]);
-  if (argc > 5) hf = stod(argv[5]);
-  if (argc > 5) nsteps = stoi(argv[6]);
+  if (argc > 1) udata.lambda_e = std::stod(argv[1]);
+  if (argc > 2) udata.lambda_i = std::stod(argv[2]);
+  if (argc > 3) udata.lambda_f = std::stod(argv[3]);
+  if (argc > 4) hs = std::stod(argv[4]);
+  if (argc > 5) hf = std::stod(argv[5]);
+  if (argc > 5) nsteps = std::stoi(argv[6]);
 
   // Output problem setup
   cout << "\nDahlquist ODE test problem:\n";

test/unit_tests/arkode/C_serial/CMakeLists.txt

@@ -55,10 +55,16 @@ foreach(test_tuple ${ARKODE_unit_tests})
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/src)
 
-    # libraries to link against
+    # We explicitly choose which object libraries to link to
+    # and link in the arkode objects so that we have access to
+    # private functions w/o changing their visibility in the installed libraries.
     target_link_libraries(${test}
-      sundials_arkode
-      sundials_nvecserial
+      $<TARGET_OBJECTS:sundials_arkode_obj>
+      sundials_sunmemsys_obj
+      sundials_nvecserial_obj
+      sundials_sunlinsolband_obj
+      sundials_sunlinsoldense_obj
+      sundials_sunnonlinsolnewton_obj
       ${EXE_EXTRA_LINK_LIBS})
 
   endif()

test/unit_tests/profiling/test_profiling.cpp

@@ -33,7 +33,7 @@ int sleep(SUNProfiler prof, int sec, double* chrono)
   std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
   *chrono =
     std::chrono::duration_cast<std::chrono::nanoseconds>(end - begin).count() *
-    1e-9;
+    1000000000;
   return 0;
 }