From 6d030fa95f30d008a4a6a092e2b6f9042216b5c2 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Thu, 11 Apr 2024 12:23:21 -0400 Subject: stuff --- CMakeLists.txt | 76 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 08a8225..8395fc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 3.13) +#set(CMAKE_C_COMPILER clang) +#set(CMAKE_CXX_COMPILER clang++) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED True) @@ -21,11 +24,8 @@ if (BSD) add_link_options(-L/usr/local/lib) add_compile_options(-I/usr/local/include) set(CMAKE_CXX_EXTENSIONS) -else() -target_link_libraries() endif() - if (debug) add_compile_options(-g -O0) if (!BSD) @@ -44,106 +44,104 @@ if (tests) file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests/data") add_executable(augbtree_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/augbtree_tests.cpp) - target_link_libraries(augbtree_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(augbtree_tests PUBLIC gsl check subunit pthread atomic) target_link_options(augbtree_tests PUBLIC -mcx16) target_include_directories(augbtree_tests PRIVATE include external/psudb-common/cpp/include external/ctpl) add_executable(internal_level_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/internal_level_tests.cpp) - target_link_libraries(internal_level_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(internal_level_tests PUBLIC gsl check subunit pthread atomic) target_link_options(internal_level_tests PUBLIC -mcx16) target_include_directories(internal_level_tests PRIVATE include external/psudb-common/cpp/include) add_executable(mutable_buffer_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/mutable_buffer_tests.cpp) - target_link_libraries(mutable_buffer_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(mutable_buffer_tests PUBLIC gsl check subunit pthread atomic) target_link_options(mutable_buffer_tests PUBLIC -mcx16) target_include_directories(mutable_buffer_tests PRIVATE include external/psudb-common/cpp/include) add_executable(rangequery_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/rangequery_tests.cpp) - target_link_libraries(rangequery_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(rangequery_tests PUBLIC gsl check subunit pthread atomic) target_link_options(rangequery_tests PUBLIC -mcx16) target_include_directories(rangequery_tests PRIVATE include external/psudb-common/cpp/include) add_executable(rangecount_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/rangecount_tests.cpp) - target_link_libraries(rangecount_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(rangecount_tests PUBLIC gsl check subunit pthread atomic) target_link_options(rangecount_tests PUBLIC -mcx16) target_include_directories(rangecount_tests PRIVATE include external/psudb-common/cpp/include) add_executable(vptree_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/vptree_tests.cpp) - target_link_libraries(vptree_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(vptree_tests PUBLIC gsl check subunit pthread atomic) target_link_options(vptree_tests PUBLIC -mcx16) target_include_directories(vptree_tests PRIVATE include external/vptree external/psudb-common/cpp/include) add_executable(de_tier_tag ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_tier_tag.cpp) - target_link_libraries(de_tier_tag PUBLIC gsl cblas check pthread atomic) + target_link_libraries(de_tier_tag PUBLIC gsl check subunit pthread atomic) target_link_options(de_tier_tag PUBLIC -mcx16) target_include_directories(de_tier_tag PRIVATE include external/psudb-common/cpp/include external) add_executable(de_tier_tomb ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_tier_tomb.cpp) - target_link_libraries(de_tier_tomb PUBLIC gsl cblas check pthread atomic) + target_link_libraries(de_tier_tomb PUBLIC gsl check subunit pthread atomic) target_link_options(de_tier_tomb PUBLIC -mcx16) target_include_directories(de_tier_tomb PRIVATE include external/PLEX/include external/psudb-common/cpp/include external) add_executable(de_level_tag ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_level_tag.cpp) - target_link_libraries(de_level_tag PUBLIC gsl cblas check pthread atomic) + target_link_libraries(de_level_tag PUBLIC gsl check subunit pthread atomic) target_link_options(de_level_tag PUBLIC -mcx16) target_include_directories(de_level_tag PRIVATE include external/psudb-common/cpp/include external) add_executable(de_level_tomb ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_level_tomb.cpp) - target_link_libraries(de_level_tomb PUBLIC gsl cblas check pthread atomic) + target_link_libraries(de_level_tomb PUBLIC gsl check subunit pthread atomic) target_link_options(de_level_tomb PUBLIC -mcx16) target_include_directories(de_level_tomb PRIVATE include external/ctpl external/PLEX/include external/psudb-common/cpp/include external) add_executable(de_level_concurrent ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_level_concurrent.cpp) - target_link_libraries(de_level_concurrent PUBLIC gsl cblas check pthread atomic) + target_link_libraries(de_level_concurrent PUBLIC gsl check subunit pthread atomic) target_link_options(de_level_concurrent PUBLIC -mcx16) target_include_directories(de_level_concurrent PRIVATE include external/ctpl external/PLEX/include external/psudb-common/cpp/include external) add_executable(de_tier_concurrent ${CMAKE_CURRENT_SOURCE_DIR}/tests/de_tier_concurrent.cpp) - target_link_libraries(de_tier_concurrent PUBLIC gsl cblas check pthread atomic) + target_link_libraries(de_tier_concurrent PUBLIC gsl check subunit pthread atomic) target_link_options(de_tier_concurrent PUBLIC -mcx16) target_include_directories(de_tier_concurrent PRIVATE include external/ctpl external/PLEX/include external/psudb-common/cpp/include external) add_executable(memisam_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/memisam_tests.cpp) - target_link_libraries(memisam_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(memisam_tests PUBLIC gsl check subunit pthread atomic) target_link_options(memisam_tests PUBLIC -mcx16) target_include_directories(memisam_tests PRIVATE include external/psudb-common/cpp/include) add_executable(triespline_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/triespline_tests.cpp) - target_link_libraries(triespline_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(triespline_tests PUBLIC gsl check subunit pthread atomic) target_link_options(triespline_tests PUBLIC -mcx16) target_include_directories(triespline_tests PRIVATE include external/psudb-common/cpp/include external/PLEX/include) add_executable(alias_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/alias_tests.cpp) - target_link_libraries(alias_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(alias_tests PUBLIC gsl check subunit pthread atomic) target_link_options(alias_tests PUBLIC -mcx16) target_include_directories(alias_tests PRIVATE include external/psudb-common/cpp/include) # OpenBSD doesn't have OpenMP support, so don't build the PGM code on that # platform. - if (!BSD) - add_executable(pgm_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/pgm_tests.cpp) - target_link_libraries(pgm_tests PUBLIC gsl cblas check pthread gomp atomic) - target_include_directories(pgm_tests PRIVATE include external/PGM-index/include external/psudb-common/cpp/include) - target_link_options(pgm_tests PUBLIC -mcx16) - target_compile_options(pgm_tests PUBLIC -fopenmp) - endif() - - + #if (!BSD) + # add_executable(pgm_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/pgm_tests.cpp) + #target_link_libraries(pgm_tests PUBLIC gsl cblas check subunit pthread gomp atomic) + #target_include_directories(pgm_tests PRIVATE include external/PGM-index/include external/psudb-common/cpp/include) + #target_link_options(pgm_tests PUBLIC -mcx16) + #target_compile_options(pgm_tests PUBLIC -fopenmp) + #endif() # Triespline code doesn't build under OpenBSD either due to ambiguous function call; # this is likely a difference between gcc and clang, rather than an OS thing if (!BSD) add_executable(triespline_debug ${CMAKE_CURRENT_SOURCE_DIR}/tests/triespline_debug.cpp) - target_link_libraries(triespline_debug PUBLIC gsl cblas check pthread atomic) + target_link_libraries(triespline_debug PUBLIC gsl check subunit pthread atomic) target_link_options(triespline_debug PUBLIC -mcx16) target_include_directories(triespline_debug PRIVATE include external/psudb-common/cpp/include external/PLEX/include) endif() add_executable(fst_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/fst_tests.cpp) - target_link_libraries(fst_tests PUBLIC gsl cblas check pthread atomic) + target_link_libraries(fst_tests PUBLIC gsl check subunit pthread atomic) target_link_options(fst_tests PUBLIC -mcx16) target_include_directories(fst_tests PRIVATE include external/psudb-common/cpp/include external/PLEX/include external/fast_succinct_trie/include) @@ -153,29 +151,29 @@ if (bench) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/benchmarks") add_executable(reconstruction_interference ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/reconstruction_interference.cpp) - target_link_libraries(reconstruction_interference PUBLIC gsl cblas pthread atomic) + target_link_libraries(reconstruction_interference PUBLIC gsl pthread atomic) target_link_options(reconstruction_interference PUBLIC -mcx16) target_include_directories(reconstruction_interference PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) add_executable(insertion_tput ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/insertion_tput.cpp) - target_link_libraries(insertion_tput PUBLIC gsl cblas pthread atomic) + target_link_libraries(insertion_tput PUBLIC gsl pthread atomic) target_include_directories(insertion_tput PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(insertion_tput PUBLIC -mcx16) add_executable(string_insertion_tput ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/string_insertion_tput.cpp) - target_link_libraries(string_insertion_tput PUBLIC gsl cblas pthread atomic) + target_link_libraries(string_insertion_tput PUBLIC gsl pthread atomic) target_include_directories(string_insertion_tput PRIVATE include external external/fast_succinct_trie/include external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(string_insertion_tput PUBLIC -mcx16) add_executable(query_workload_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/query_workload_bench.cpp) - target_link_libraries(query_workload_bench PUBLIC gsl cblas pthread atomic) + target_link_libraries(query_workload_bench PUBLIC gsl pthread atomic) target_include_directories(query_workload_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(query_workload_bench PUBLIC -mcx16) add_executable(insert_query_tput ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/insert_query_tput.cpp) - target_link_libraries(insert_query_tput PUBLIC gsl cblas pthread atomic) + target_link_libraries(insert_query_tput PUBLIC gsl pthread atomic) target_include_directories(insert_query_tput PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(insert_query_tput PUBLIC -mcx16) @@ -186,24 +184,24 @@ if (bench) #target_link_options(btree_insert_query_tput PUBLIC -mcx16) add_executable(watermark_testing ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/watermark_testing.cpp) - target_link_libraries(watermark_testing PUBLIC gsl cblas pthread atomic) + target_link_libraries(watermark_testing PUBLIC gsl pthread atomic) target_include_directories(watermark_testing PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(watermark_testing PUBLIC -mcx16) add_executable(irs_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/irs_bench.cpp) - target_link_libraries(irs_bench PUBLIC gsl cblas pthread atomic) + target_link_libraries(irs_bench PUBLIC gsl pthread atomic) target_include_directories(irs_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(irs_bench PUBLIC -mcx16) add_executable(vptree_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/vptree_bench.cpp) - target_link_libraries(vptree_bench PUBLIC gsl cblas pthread atomic) + target_link_libraries(vptree_bench PUBLIC gsl pthread atomic) target_include_directories(vptree_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(vptree_bench PUBLIC -mcx16) if(!BSD) add_executable(ts_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/ts_bench.cpp) - target_link_libraries(ts_bench PUBLIC gsl cblas pthread atomic) + target_link_libraries(ts_bench PUBLIC gsl pthread atomic) target_include_directories(ts_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(ts_bench PUBLIC -mcx16) endif() @@ -214,7 +212,7 @@ endif() #target_link_options(static_dynamic_comp PUBLIC -mcx16) add_executable(insert_tail_latency ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/insert_tail_latency.cpp) - target_link_libraries(insert_tail_latency PUBLIC gsl cblas pthread atomic) + target_link_libraries(insert_tail_latency PUBLIC gsl pthread atomic) target_include_directories(insert_tail_latency PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include bench/include external/psudb-common/cpp/include) target_link_options(insert_tail_latency PUBLIC -mcx16) endif() -- cgit v1.2.3