Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ include(FetchContent)
FetchContent_Declare(
csv-parser
GIT_REPOSITORY https://github.com/vincentlaucsb/csv-parser
GIT_TAG 2.5.1)
GIT_TAG 3.1.0)
FetchContent_GetProperties(csv-parser)
if(NOT csv-parser_POPULATED)
FetchContent_MakeAvailable(csv-parser)
Expand Down Expand Up @@ -136,7 +136,7 @@ endif()
FetchContent_Declare(
simdjson
GIT_REPOSITORY https://github.com/simdjson/simdjson
GIT_TAG v4.3.0)
GIT_TAG v4.6.1)
FetchContent_GetProperties(simdjson)
if(NOT simdjson_POPULATED)
FetchContent_MakeAvailable(simdjson)
Expand Down Expand Up @@ -168,10 +168,9 @@ target_include_directories(
dsf PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:include>)

target_include_directories(dsf PRIVATE ${csv-parser_SOURCE_DIR}/single_include)

# Link other libraries
target_link_libraries(dsf PUBLIC TBB::tbb SQLiteCpp PRIVATE simdjson::simdjson spdlog::spdlog)
target_link_libraries(dsf PUBLIC TBB::tbb SQLiteCpp
PRIVATE $<BUILD_INTERFACE:simdjson::simdjson> spdlog::spdlog $<BUILD_INTERFACE:csv>)

# Install dsf library
install(
Expand Down Expand Up @@ -204,7 +203,7 @@ if(BUILD_PYTHON_BINDINGS)
FetchContent_Declare(
pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11.git
GIT_TAG v3.0.2)
GIT_TAG v3.0.3)
FetchContent_GetProperties(pybind11)
if(NOT pybind11_POPULATED)
FetchContent_MakeAvailable(pybind11)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
[![Standard](https://img.shields.io/badge/C%2B%2B-20/23-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization)
[![TBB](https://img.shields.io/badge/TBB-2022.3.0-blue.svg)](https://github.com/oneapi-src/oneTBB)
[![SPDLOG](https://img.shields.io/badge/spdlog-1.17.0-blue.svg)](https://github.com/gabime/spdlog)
[![CSV](https://img.shields.io/badge/csv_parser-2.5.0-blue.svg)](https://github.com/vincentlaucsb/csv-parser)
[![JSON](https://img.shields.io/badge/simdjson-4.3.0-blue.svg)](https://github.com/simdjson/simdjson)
[![CSV](https://img.shields.io/badge/csv_parser-3.1.0-blue.svg)](https://github.com/vincentlaucsb/csv-parser)
[![JSON](https://img.shields.io/badge/simdjson-4.6.1-blue.svg)](https://github.com/simdjson/simdjson)
[![SQLite](https://img.shields.io/badge/SQLiteCpp-3.3.3-blue.svg)](https://github.com/SRombauts/SQLiteCpp)
[![codecov](https://codecov.io/gh/physycom/DynamicalSystemFramework/graph/badge.svg?token=JV53J6IUJ3)](https://codecov.io/gh/physycom/DynamicalSystemFramework)

Expand Down
4 changes: 2 additions & 2 deletions benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set(BENCHMARK_ENABLE_TESTING OFF)
FetchContent_Declare(
benchmark
GIT_REPOSITORY https://github.com/google/benchmark
GIT_TAG v1.9.4
GIT_TAG v1.9.5
)
FetchContent_MakeAvailable(benchmark)

Expand All @@ -37,6 +37,6 @@ foreach(SOURCE ${SOURCES})
get_filename_component(EXE_NAME ${SOURCE} NAME_WE)
add_executable(${EXE_NAME}.out ${SOURCE})
target_compile_definitions(${EXE_NAME}.out PRIVATE SPDLOG_USE_STD_FORMAT)
target_link_libraries(${EXE_NAME}.out PRIVATE dsf TBB::tbb simdjson::simdjson spdlog::spdlog benchmark::benchmark)
target_link_libraries(${EXE_NAME}.out PRIVATE dsf TBB::tbb $<BUILD_INTERFACE:simdjson::simdjson> spdlog::spdlog benchmark::benchmark)
target_include_directories(${EXE_NAME}.out PRIVATE $<INSTALL_INTERFACE:include>)
endforeach()
10 changes: 5 additions & 5 deletions profiling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include(FetchContent)
FetchContent_Declare(
csv-parser
GIT_REPOSITORY https://github.com/vincentlaucsb/csv-parser
GIT_TAG 2.4.1)
GIT_TAG 3.1.0)
FetchContent_GetProperties(csv-parser)
if(NOT csv-parser_POPULATED)
FetchContent_MakeAvailable(csv-parser)
Expand All @@ -33,13 +33,13 @@ file(GLOB SOURCES "../src/dsf/base/*.cpp" "../src/dsf/mobility/*.cpp"

# Define the executable
add_executable(prof.out main.cpp ${SOURCES})
target_include_directories(prof.out PRIVATE ../src/ ${csv-parser_SOURCE_DIR}/single_include)
target_include_directories(prof.out PRIVATE ../src/)
target_link_libraries(prof.out PRIVATE TBB::tbb fmt::fmt spdlog::spdlog
simdjson::simdjson)
$<BUILD_INTERFACE:simdjson::simdjson> $<BUILD_INTERFACE:csv>)
target_compile_options(prof.out PRIVATE -pg)
target_link_options(prof.out PRIVATE -pg)
add_executable(mem.out main.cpp ${SOURCES})
target_include_directories(mem.out PRIVATE ../src/ ${csv-parser_SOURCE_DIR}/single_include)
target_include_directories(mem.out PRIVATE ../src/)
target_link_libraries(mem.out PRIVATE TBB::tbb fmt::fmt spdlog::spdlog
simdjson::simdjson)
$<BUILD_INTERFACE:simdjson::simdjson> $<BUILD_INTERFACE:csv>)
add_executable(parse_massif.out parse_massif.cpp)
Loading