Skip to content

Updates for finding hdf5, to adding vector<pair<string,string>> to classes_def.xml, updating catch.hpp #77

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

Open
gartung wants to merge 3 commits into
base: master
Choose a base branch
from
+397 −248
Open

Updates for finding hdf5, to adding vector<pair<string,string>> to classes_def.xml, updating catch.hpp #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c55573
Update catch.hpp
gartung Aug 20, 2025
c4a75eb
Find HDF5 with cmake -DHDF5_ROOT=hdf5_install_root
gartung Aug 20, 2025
08d7eff
Add <class name="vector<pair<string,string> >"/> to classes_def.xml
gartung Aug 20, 2025
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
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(NOT CMAKE_BUILD_TYPE)
endif()

# set the project name
project(threaded_io_test VERSION 0.1 LANGUAGES CXX)
project(threaded_io_test VERSION 0.1 LANGUAGES CXX C)

list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules)

Expand All @@ -29,6 +29,7 @@ find_package(ROOT REQUIRED COMPONENTS Core RIO Tree ROOTNTuple)
find_package(TBB REQUIRED)
find_package(zstd REQUIRED)
find_package(lz4 REQUIRED)
find_package(HDF5 REQUIRED COMPONENTS C HL)

set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
Expand Down Expand Up @@ -207,9 +208,9 @@ if(ENABLE_HDF5)
HDFBatchEventsOutputer.cc
HDFOutputer.cc
HDFSource.cc)
target_include_directories(threaded_io_test PRIVATE "${PROJECT_BINARY_DIR}" ${HDF5_DIR}/include)
target_include_directories(threaded_io_test PRIVATE "${PROJECT_BINARY_DIR}" ${HDF5_DIR}/include ${MPI_CXX_COMPILER_INCLUDE_DIRS})
target_link_directories(threaded_io_test PRIVATE ${HDF5_DIR}/lib)
target_link_libraries(threaded_io_test PRIVATE hdf5 hdf5_hl)
target_link_libraries(threaded_io_test PRIVATE hdf5::hdf5 hdf5::hdf5_hl)
add_test(NAME HDFOutputerEmptyTest COMMAND threaded_io_test -s EmptySource -t 1 -n 10 -o HDFOutputer=test_empty.h5)
add_test(NAME TestProductsHDF COMMAND bash -c "${CMAKE_CURRENT_BINARY_DIR}/threaded_io_test -s TestProductsSource -t 1 -n 10 -o HDFOutputer=test_prod.h5; ${CMAKE_CURRENT_BINARY_DIR}/threaded_io_test -s HDFSource=test_prod.h5 -t 1 -n 10 -o TestProductsOutputer")
add_test(NAME HDFEventOutputerEmptyTest COMMAND threaded_io_test -s EmptySource -t 1 -n 10 -o HDFEventOutputer=test_empty_event.h5)
Expand Down
1 change: 1 addition & 0 deletions classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<class name="cce::tf::SequenceFinderForBuiltins<char>" ClassVersion="3"/>
<class name="cce::tf::SequenceFinderForBuiltins<float>" ClassVersion="3"/>
<class name="cce::tf::SequenceFinderForBuiltins<double>" ClassVersion="3"/>
<class name="vector<pair<string,string> >"/>
</lcgdict>
1 change: 1 addition & 0 deletions cms/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
<version ClassVersion="10" checksum="580036702"/>
</class>
<class name="edm::ProcessHistoryID"/>
<class name="vector<pair<string,string> >"/>
</lcgdict>
1 change: 1 addition & 0 deletions test_classes/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@
<class name="cce::tf::test::RecursiveClass" ClassVersion="3"/>
<class name="cce::tf::test::RecursivePointerClass" ClassVersion="3"/>
<class name="cce::tf::test::OffsetTest<short,cce::tf::test::TestClassWithFloatVector>"/>
<class name="vector<pair<string,string> >"/>
</lcgdict>
Loading