Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unified logging infrastructure #1426

Merged
merged 15 commits into from
Dec 17, 2024
Merged

unified logging infrastructure #1426

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b4691c8
start moved to unified logging lib
cyrush Nov 21, 2024
1ab134a
new core logging lib
cyrush Nov 21, 2024
a1207e6
gen and use config header
cyrush Nov 22, 2024
70bd652
gen config fix
cyrush Nov 22, 2024
4a6b619
simplify, more error checking and more tests
cyrush Nov 22, 2024
f11cdd3
add close to test
cyrush Nov 22, 2024
37b805f
wire init of new logging, keep old marcos wired
cyrush Dec 9, 2024
4b320c6
add test for logging
cyrush Dec 9, 2024
ffc94bb
add test srouce
cyrush Dec 9, 2024
d961df8
prevent use of bad comm if user forgot to pass one
cyrush Dec 12, 2024
3bbe7cc
windows fix and typo fix
cyrush Dec 12, 2024
f0f411d
Merge branch 'develop' into task/2024_11_unified_logging
cyrush Dec 13, 2024
6555bcf
add ascent_logging lib to mk config
cyrush Dec 13, 2024
5075f20
msg and log rank options and mpi log tests
cyrush Dec 13, 2024
8bfc3f0
address comments and a few tweaks
cyrush Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/config/ascent_config.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)


Expand All @@ -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)

22 changes: 15 additions & 7 deletions src/libs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
################################
Expand Down
9 changes: 4 additions & 5 deletions src/libs/ascent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -371,7 +369,8 @@ set(ascent_thirdparty_libs
conduit::conduit
ascent_flow
ascent_lodepng
ascent_png_utils)
ascent_png_utils
ascent_logging)

##################
# optional libs
Expand Down
Loading
Loading