Skip to content

Catalyst Adaptor merge. #3

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Catalyst Adaptor merge. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ if(TINYOBJLOADER_FOUND)
set(DEFINE_HAVE_TINYOBJLOADER "#define HAVE_TINYOBJLOADER 1")
endif()

if(catalyst_FOUND)
set(DEFINE_HAVE_CATALYST "#define HAVE_CATALYST")
endif()

include_directories(SYSTEM ${MPI_INCLUDE_PATH})

add_subdirectory (src)
Expand All @@ -23,5 +27,6 @@ get_directory_property(hasParent PARENT_DIRECTORY)
if(hasParent)
set(DEFINE_HAVE_TINYOBJLOADER ${DEFINE_HAVE_TINYOBJLOADER} CACHE INTERNAL "")
set(DEFINE_HAVE_HDF5 ${DEFINE_HAVE_HDF5} CACHE INTERNAL "")
set(DEFINE_HAVE_CATALYST ${DEFINE_HAVE_CATALYST} CACHE INTERNAL "")
endif()

28 changes: 28 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ if ( CUDA_ON_BACKEND STREQUAL "HIP" AND HIP_FOUND )

hip_add_executable(io main.cpp
MetaParser/MetaParser_unit_test.cpp
Catalyst/catalyst_unit_test.cpp
${CUDA_SOURCES}
ObjReader/ObjReader_unit_test.cpp
CSVReader/tests/CSVReader_unit_test.cpp)
else()
add_executable(io main.cpp
MetaParser/MetaParser_unit_test.cpp
Catalyst/catalyst_unit_test.cpp
${CUDA_SOURCES}
ObjReader/ObjReader_unit_test.cpp
CSVReader/tests/CSVReader_unit_test.cpp)
Expand Down Expand Up @@ -66,6 +68,7 @@ target_include_directories (io PUBLIC ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../openfpm_devices/src/)
target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../openfpm_vcluster/src/)
target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../openfpm_pdata/src/)
target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../openfpm_data/src/)
target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src/)
target_include_directories (io PUBLIC ${CMAKE_BINARY_DIR}/config)
Expand All @@ -74,6 +77,26 @@ target_include_directories (io PUBLIC ${TINYOBJLOADER_INCLUDE_DIRS} )
target_include_directories (io PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories (io PUBLIC ${ALPAKA_ROOT}/include)

if (catalyst_FOUND)
target_link_libraries(io catalyst::catalyst)

# libraries for Catalyst unit tests
target_include_directories (io PUBLIC ${METIS_ROOT}/include)
target_include_directories (io PUBLIC ${PARMETIS_ROOT}/include)
target_include_directories (io PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
target_link_libraries(io ${PARMETIS_LIBRARIES})

if (Vc_FOUND)
target_include_directories (io PUBLIC ${Vc_INCLUDE_DIR})
target_link_libraries(io ${Vc_LIBRARIES})
endif()

if (PNG_FOUND)
target_include_directories (io PUBLIC ${PNG_INCLUDE_DIRS})
target_link_libraries(io ${PNG_LIBRARIES})
endif()
endif()

if (PETSC_FOUND)
target_include_directories(io PUBLIC ${PETSC_INCLUDES})
endif()
Expand Down Expand Up @@ -165,3 +188,8 @@ install(FILES Plot/GoogleChart.hpp Plot/util.hpp
DESTINATION openfpm_io/include/Plot
COMPONENT OpenFPM)

install(FILES Catalyst/catalyst_adaptor.hpp
Catalyst/catalyst_adaptor_grid_dist.hpp
Catalyst/catalyst_adaptor_vector_dist.hpp
DESTINATION openfpm_io/include/Catalyst
COMPONENT OpenFPM)
Loading