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.

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

Debug/ams def libs #60

Draft
wants to merge 23 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
847c9cc
Completely turnoff torch
koparasy Mar 8, 2024
96bf52d
Modifications on cmakes to align our configurations
koparasy Mar 8, 2024
bb2988b
Fixes to correctly find static hdf5
koparasy Mar 12, 2024
3a0fe69
Merge branch 'develop' into debug/ams_def_libs
rblake-llnl Mar 19, 2024
a3422bc
Checking in a version that links shared.
rblake-llnl Mar 20, 2024
765f6f5
Updating chunk to 256KB.
rblake-llnl Mar 20, 2024
53a3990
We need to separate public/private to link shared/static combos
rblake-llnl Mar 20, 2024
e1a2c39
Bugfix, this should have been interface.
rblake-llnl Mar 21, 2024
b71e967
Checking in CMake changes to get pytorch working.
rblake-llnl Mar 22, 2024
d783ae4
Fix bug of DeltaUQ when running on CUDA. Data are not copied correctl…
koparasy Mar 22, 2024
1f4b81a
Merge remote-tracking branch 'origin/uq/tests' into debug/ams_def_libs
rblake-llnl Mar 22, 2024
b83e364
Adding cuda device synchronizes frequently and peeking at cuda errors
koparasy Mar 14, 2024
8c51165
Fix Load Balancer to not call init on constructor and thus avoid Broa…
koparasy Mar 25, 2024
bd9ecb4
Merge remote-tracking branch 'origin/bugfix/load_balance' into debug/…
rblake-llnl Mar 25, 2024
67dbe8c
Guard destructor
koparasy Mar 25, 2024
1b2f6f2
Merge remote-tracking branch 'origin/bugfix/load_balance' into debug/…
rblake-llnl Mar 25, 2024
5580eea
Rename DBTypes to prefix with 'DB'
koparasy Mar 25, 2024
0acb0a3
Merge remote-tracking branch 'origin/features/rename_db_types' into d…
rblake-llnl Mar 25, 2024
8e8dc41
Add extensive prints of the device memory allocator
koparasy Mar 26, 2024
56ac1b2
Merge remote-tracking branch 'origin/debug/torch_memory_info' into de…
rblake-llnl Mar 26, 2024
292bc7a
Changes necessary to compile on CPU.
rblake-llnl Mar 26, 2024
4b6b362
Rest of the DDDB changes.
rblake-llnl Mar 26, 2024
2c0d1b7
Fixed CPU build fixes from torch_memory_info
rblake-llnl Mar 26, 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
112 changes: 103 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ option(WITH_WORKFLOW "Install python drivers used by the outer workflow" O
option(WITH_AMS_LIB "Install C++ library to support scientific applications" ON)
option(WITH_ADIAK "Use Adiak for recording metadata" OFF)
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
option(EXCLUDE_STATIC_LIBS "Exclude static libs from the linking line" OFF)

if (WITH_MPI)
# SET(CMAKE_CXX_COMPILER "${MPI_CXX_COMPILER}" CACHE FILEPATH "CXX compiler overridden with MPI C++ wrapper")
Expand All @@ -69,6 +70,7 @@ if (WITH_CUDA)
if (BUILD_SHARED_LIBS)
set(CUDA_RUNTIME_LIBRARY "Shared")
else()
set(HDF5_USE_STATIC_LIBRARIES True)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should delete this line in the future. There is no reason we should always demand a static HDF5 if AMS is static. By deleting this you can always explicitly define it in the CLI and have better control. I prefer when possible explicit control to the user instead of implicitly defining things.

set(CUDA_RUNTIME_LIBRARY "Static")
endif()

Expand Down Expand Up @@ -132,14 +134,14 @@ endif() # WITH_REDIS

if (WITH_HDF5)
if (HDF5_USE_STATIC_LIBRARIES)
find_package(HDF5 NAMES hdf5 COMPONENTS C static NO_DEFAULT_PATH PATHS ${AMS_HDF5_DIR} ${AMS_HDF5_DIR}/share/cmake)
list(APPEND AMS_APP_LIBRARIES ${HDF5_C_STATIC_LIBRARY})
message(STATUS "HDF5 Static Library : ${HDF5_C_STATIC_LIBRARY}")
else()
find_package(HDF5 NAMES hdf5 COMPONENTS C shared NO_DEFAULT_PATH PATHS ${AMS_HDF5_DIR} ${AMS_HDF5_DIR}/share/cmake)
list(APPEND AMS_APP_LIBRARIES ${HDF5_C_SHARED_LIBRARY})
message(STATUS "HDF5 Shared Library : ${HDF5_C_SHARED_LIBRARY}")
endif()
find_package(HDF5 NAMES hdf5 COMPONENTS C static NO_DEFAULT_PATH PATHS ${AMS_HDF5_DIR} ${AMS_HDF5_DIR}/share/cmake)
list(APPEND AMS_APP_LIBRARIES ${HDF5_C_STATIC_LIBRARY})
message(STATUS "HDF5 Static Library : ${HDF5_C_STATIC_LIBRARY}")
else()
find_package(HDF5 NAMES hdf5 COMPONENTS C shared NO_DEFAULT_PATH PATHS ${AMS_HDF5_DIR} ${AMS_HDF5_DIR}/share/cmake)
list(APPEND AMS_APP_LIBRARIES ${HDF5_C_SHARED_LIBRARY})
message(STATUS "HDF5 Shared Library : ${HDF5_C_SHARED_LIBRARY}")
endif()
list(APPEND AMS_APP_INCLUDES ${HDF5_INCLUDE_DIR})
list(APPEND AMS_APP_DEFINES "-D__ENABLE_HDF5__")
message(STATUS "HDF5 Include directories: ${HDF5_INCLUDE_DIR}")
Expand Down Expand Up @@ -191,7 +193,7 @@ if (WITH_TORCH)
find_package(Torch REQUIRED)
# This is annoying, torch populates all my cuda flags
# and resets them
set(CMAKE_CUDA_FLAGS "")
# set(CMAKE_CUDA_FLAGS "")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember why I did this in the first place. But did you maybe investigate the implications of commenting this out?

set(CMAKE_CUDA_ARCHITECTURES ON)

list(APPEND AMS_APP_INCLUDES "${TORCH_INCLUDE_DIRS}")
Expand Down Expand Up @@ -253,6 +255,98 @@ if (WITH_PERFFLOWASPECT)
endif()


macro(inherit_target_nostatic)
set(options)
set(singleValueArgs TO FROM OBJECT)
set(multiValueArgs)

# Parse the arguments
cmake_parse_arguments(arg "${options}" "${singleValueArgs}"
"${multiValueArgs}" ${ARGN} )

# Check arguments
if ( NOT DEFINED arg_TO )
message( FATAL_ERROR "Must provide a TO argument to the 'blt_inherit_target' macro" )
endif()

if ( NOT DEFINED arg_FROM )
message( FATAL_ERROR "Must provide a FROM argument to the 'blt_inherit_target' macro" )
endif()

set(_scope INTERFACE)

get_target_property(_interface_system_includes
${arg_FROM} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
if ( _interface_system_includes )
target_include_directories(${arg_TO} SYSTEM ${_scope} ${_interface_system_includes})
endif()

get_target_property(_interface_includes
${arg_FROM} INTERFACE_INCLUDE_DIRECTORIES)
if ( _interface_includes )
target_include_directories(${arg_TO} ${_scope} ${_interface_includes})
endif()

get_target_property(_interface_defines
${arg_FROM} INTERFACE_COMPILE_DEFINITIONS)
if ( _interface_defines )
target_compile_definitions( ${arg_TO} ${_scope} ${_interface_defines})
endif()

if( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0" )
get_target_property(_interface_link_options
${arg_FROM} INTERFACE_LINK_OPTIONS)
if ( _interface_link_options )
target_link_options( ${arg_TO} ${_scope} ${_interface_link_options})
endif()
endif()

get_target_property(_interface_compile_options
${arg_FROM} INTERFACE_COMPILE_OPTIONS)
if ( _interface_compile_options )
target_compile_options( ${arg_TO} ${_scope} ${_interface_compile_options})
endif()

if ( NOT arg_OBJECT )
#get_target_property(_interface_link_directories
# ${arg_FROM} INTERFACE_LINK_DIRECTORIES)
#if ( _interface_link_directories )
# target_link_directories( ${arg_TO} ${_scope} ${_interface_link_directories})
#endif()

#get_target_property(_interface_link_libraries
# ${arg_FROM} INTERFACE_LINK_LIBRARIES)
#if ( _interface_link_libraries )
# target_link_libraries( ${arg_TO} ${_scope} ${_interface_link_libraries})
#endif()
endif()

endmacro(inherit_target_nostatic)


if (EXCLUDE_STATIC_LIBS)
set(NONSTATIC_AMS_APP_INTERFACE_LIBRARIES "")
set(NONSTATIC_AMS_APP_PRIVATE_LIBRARIES "")
foreach (THIS_LIB ${AMS_APP_LIBRARIES})
list(APPEND NONSTATIC_AMS_APP_INTERFACE_LIBRARIES ${THIS_LIB})
if (TARGET ${THIS_LIB})
get_target_property(target_type ${THIS_LIB} TYPE)
if (NOT target_type STREQUAL STATIC_LIBRARY)
list(APPEND NONSTATIC_AMS_APP_PRIVATE_LIBRARIES ${THIS_LIB})
else()
add_library("${THIS_LIB}::nostatic" INTERFACE IMPORTED)
inherit_target_nostatic(TO "${THIS_LIB}::nostatic" FROM ${THIS_LIB})
list(APPEND NONSTATIC_AMS_APP_PRIVATE_LIBRARIES "${THIS_LIB}::nostatic")
endif()
else()
get_filename_component(THIS_EXT ${THIS_LIB} EXT)
if (NOT ".a" STREQUAL "${THIS_EXT}")
list(APPEND NONSTATIC_AMS_APP_PRIVATE_LIBRARIES ${THIS_LIB})
endif()
endif()
endforeach()
endif()

Comment on lines +297 to +388
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a ams_macros.cmake file under cmake directory and have these macros? Not for now. Just asking.

add_subdirectory(src)

# ------------------------------------------------------------------------------
Expand Down
10 changes: 8 additions & 2 deletions src/AMSlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ target_include_directories(AMS PUBLIC
$<INSTALL_INTERFACE:include/>)
target_include_directories(AMS PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_directories(AMS PUBLIC ${AMS_APP_LIB_DIRS})
target_link_libraries(AMS PUBLIC ${AMS_APP_LIBRARIES} stdc++fs)
if (EXCLUDE_STATIC_LIBS)
target_link_libraries(AMS PRIVATE ${NONSTATIC_AMS_APP_PRIVATE_LIBRARIES} stdc++fs)
target_link_libraries(AMS PRIVATE ${NONSTATIC_AMS_APP_INTERFACE_LIBRARIES} stdc++fs)
target_link_options(AMS PRIVATE "-Wl,--unresolved-symbols=ignore-all")
else()
target_link_libraries(AMS PUBLIC ${AMS_APP_LIBRARIES} stdc++fs)
endif()

#-------------------------------------------------------------------------------
# create the configuration header file with the respective information
Expand Down Expand Up @@ -75,7 +81,7 @@ install(TARGETS AMS
DESTINATION lib)

install(EXPORT AMSTargets
FILE AMS.cmake
FILE AMSConfig.cmake
DESTINATION lib/cmake/AMS)

install(FILES ${PROJECT_BINARY_DIR}/include/AMS.h DESTINATION include)
Expand Down
2 changes: 1 addition & 1 deletion src/AMSlib/wf/basedb.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ class hdf5DB final : public FileDB<TypeValue>
*/
hid_t getDataSet(hid_t group,
std::string dName,
const size_t Chunk = 32L * 1024L * 1024L)
const size_t Chunk = 256L * 1024L)
{
// Our datasets a.t.m are 1-D vectors
const int nDims = 1;
Expand Down
Loading