unified logging infrastructure (#1426)

* start moved to unified logging lib

* new core logging lib

* gen and use config header

* gen config fix

* simplify, more error checking and more tests

* add close to test

* wire init of new logging, keep old marcos wired

* add test for logging

* add test srouce

* prevent use of bad comm if user forgot to pass one

* windows fix and typo fix

* add ascent_logging lib to mk config

* msg and log rank options and mpi log tests

* address comments and a few tweaks

CHANGELOG.md

@@ -12,9 +12,11 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - [email protected]
 - [email protected]
 - [email protected]
-- [email protected]
+- [email protected]
+- [email protected]
 
 ### Added
+- Added a new unified logging infrastructure.
 - Added support for unstructured topologies with mixed elements types (for example, hexs and tets).
 - Added support for `pyramid` and `wedge` elements.
 - Added `sphere`, `cylinder`, `box`, and `plane` options to the slice filter.

src/config/ascent_config.mk.in

@@ -302,6 +302,7 @@ ASCENT_LIB_FLAGS = $(ASCENT_DEVICE_OBJECT) \
                    -lascent \
                    -lascent_flow \
                    -lascent_lodepng \
+                   -lascent_logging \
                    $(ASCENT_ROVER_LIB_FLAGS) $(DRAY_LIB_FLAGS) $(ASCENT_VTKH_LIB_FLAGS)  $(ASCENT_VTKM_LIB_FLAGS) $(VTKH_LIB_FLAGS) $(ASCENT_CONDUIT_LIB_FLAGS) $(ASCENT_MFEM_LIB_FLAGS) $(ASCENT_RAJA_LIB_FLAGS) $(ASCENT_UMPIRE_LIB_FLAGS) $(ASCENT_CAMP_LIB_FLAGS) $(ASCENT_OCCA_LIB_FLAGS) $(ASCENT_GENTEN_LIB_FLAGS)  $(ASCENT_PYTHON_LIBS) $(ASCENT_CALIPER_LIB_FLAGS) $(ASCENT_ADIAK_LIB_FLAGS) $(ASCENT_OPENMP_LINK_FLAGS) $(ASCENT_CUDA_LIB_FLAGS)
 
 # if using Ascent with mpi and/or cuda with a non-GPU sim
@@ -310,6 +311,7 @@ ASCENT_MPI_LIB_FLAGS = $(ASCENT_DEVICE_OBJECT_MPI) \
                        -lascent_mpi \
                        -lascent_flow \
                        -lascent_lodepng \
+                       -lascent_logging \
                        $(ASCENT_ROVER_MPI_LIB_FLAGS) $(DRAY_MPI_LIB_FLAGS) $(ASCENT_VTKH_MPI_LIB_FLAGS)  $(ASCENT_VTKM_LIB_FLAGS) $(VTKH_MPI_LIB_FLAGS) $(ASCENT_CONDUIT_MPI_LIB_FLAGS) $(ASCENT_MFEM_LIB_FLAGS) $(ASCENT_FIDES_LIB_FLAGS) $(ASCENT_ADIOS2_LIB_FLAGS) $(ASCENT_PMT_LIB_FLAGS) $(ASCENT_STREAMSTAT_LIB_FLAGS) $(ASCENT_TOPOFILEPARSER_LIB_FLAGS) $(ASCENT_BABELFLOW_LIB_FLAGS)  $(ASCENT_RAJA_LIB_FLAGS) $(ASCENT_UMPIRE_LIB_FLAGS) $(ASCENT_CAMP_LIB_FLAGS) $(ASCENT_OCCA_LIB_FLAGS) $(ASCENT_GENTEN_LIB_FLAGS) $(ASCENT_PYTHON_LIBS) $(ASCENT_CALIPER_LIB_FLAGS) $(ASCENT_OPENMP_LINK_FLAGS) $(ASCENT_CUDA_LIB_FLAGS)
 
 
@@ -319,5 +321,6 @@ ASCENT_MPI_CUDA_LIB_FLAGS = -L $(ASCENT_DIR)/lib \
                             -lascent_mpi \
                             -lascent_flow \
                             -lascent_lodepng \
+                            -lascent_logging \
                             $(ASCENT_ROVER_MPI_LIB_FLAGS) $(DRAY_MPI_LIB_FLAGS) $(ASCENT_VTKH_MPI_LIB_FLAGS) $(ASCENT_VTKM_LIB_FLAGS) $(VTKH_MPI_LIB_FLAGS) $(ASCENT_CONDUIT_MPI_LIB_FLAGS) $(ASCENT_MFEM_LIB_FLAGS) $(ASCENT_OCCA_LIB_FLAGS) $(ASCENT_GENTEN_LIB_FLAGS) $(ASCENT_FIDES_LIB_FLAGS) $(ASCENT_ADIOS2_LIB_FLAGS) $(ASCENT_PMT_LIB_FLAGS) $(ASCENT_STREAMSTAT_LIB_FLAGS) $(ASCENT_TOPOFILEPARSER_LIB_FLAGS) $(ASCENT_BABELFLOW_LIB_FLAGS)  $(ASCENT_RAJA_LIB_FLAGS) $(ASCENT_UMPIRE_LIB_FLAGS) $(ASCENT_CAMP_LIB_FLAGS) $(ASCENT_PYTHON_LIBS) $(ASCENT_CALIPER_LIB_FLAGS) $(ASCENT_OPENMP_LINK_FLAGS) $(ASCENT_CUDA_LIB_FLAGS)
 

src/libs/CMakeLists.txt

@@ -2,14 +2,9 @@
 # Project developers. See top-level LICENSE AND COPYRIGHT files for dates and
 # other details. No copyright assignment is required to contribute to Ascent.
 
-
-################################
-# Add flow
-################################
-add_subdirectory(flow)
-
-
+#######################################
 # display info about optional features
+#######################################
 if(ENABLE_APCOMP)
     message(STATUS "Building APComp    (ENABLE_APCOMP=ON)")
 else()
@@ -29,10 +24,23 @@ else()
 endif()
 
 
+################################
 # ascent_png_utils object lib
 # shared for testing of all libs
+################################
 add_subdirectory(png_utils)
 
+################################
+# ascent_logging lib
+# shared logging for all libs
+################################
+add_subdirectory(logging)
+
+################################
+# Add flow
+################################
+add_subdirectory(flow)
+
 ################################
 # Add ap comp
 ################################

src/libs/ascent/CMakeLists.txt

@@ -171,15 +171,14 @@ set(ascent_headers
     # utils
     utils/ascent_actions_utils.hpp
     utils/ascent_data_logger.hpp
-    utils/ascent_logging.hpp
+    utils/ascent_logging_old.hpp
     utils/ascent_block_timer.hpp
     utils/ascent_mpi_utils.hpp
     utils/ascent_string_utils.hpp
     utils/ascent_web_interface.hpp
     utils/ascent_resources.hpp
     utils/ascent_resources_cinema_web.hpp
     utils/ascent_resources_ascent_web.hpp
-    utils/ascent_annotations.hpp
     # hola
     hola/ascent_hola.hpp)
 
@@ -238,12 +237,11 @@ set(ascent_sources
     utils/ascent_actions_utils.cpp
     utils/ascent_data_logger.cpp
     utils/ascent_block_timer.cpp
-    utils/ascent_logging.cpp
+    utils/ascent_logging_old.cpp
     utils/ascent_mpi_utils.cpp
     utils/ascent_string_utils.cpp
     utils/ascent_web_interface.cpp
     utils/ascent_resources.cpp
-    utils/ascent_annotations.cpp
     # hola
     hola/ascent_hola.cpp)
 
@@ -371,7 +369,8 @@ set(ascent_thirdparty_libs
     conduit::conduit
     ascent_flow
     ascent_lodepng
-    ascent_png_utils)
+    ascent_png_utils
+    ascent_logging)
 
 ##################
 # optional libs