Merge pull request #323 from rapidsai/branch-0.13

[gpuCI] Auto-merge branch-0.13 to branch-0.14 [skip ci]

Author: GPUtester

CHANGELOG.md

@@ -24,6 +24,7 @@
 - PR #283 Add random allocation benchmark.
 - PR #287 Enabled CUDA CXX11 for unit tests.
 - PR #292 Revamped RMM exceptions.
+- PR #303 Added replay benchmark.
 - PR #297 Use spdlog to implement `logging_resource_adaptor`
 
 ## Improvements

CMakeLists.txt

@@ -115,7 +115,8 @@ include_directories("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}"
                     "${CMAKE_CURRENT_SOURCE_DIR}/include"
                     "${CMAKE_CURRENT_SOURCE_DIR}/include/rmm"
                     "${CMAKE_CURRENT_SOURCE_DIR}/src"
-                    "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnmem/include")
+                    "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnmem/include"
+                    "${CMAKE_SOURCE_DIR}/thirdparty")
 
 ###################################################################################################
 # - library paths ---------------------------------------------------------------------------------

benchmarks/CMakeLists.txt

@@ -10,7 +10,7 @@ function(ConfigureBench CMAKE_BENCH_NAME CMAKE_BENCH_SRC)
                    ${CMAKE_BENCH_SRC}
                    "${CMAKE_CURRENT_SOURCE_DIR}/synchronization/synchronization.cpp")
     set_target_properties(${CMAKE_BENCH_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(${CMAKE_BENCH_NAME} benchmark benchmark_main pthread rmm )
+    target_link_libraries(${CMAKE_BENCH_NAME} benchmark pthread rmm )
     set_target_properties(${CMAKE_BENCH_NAME} PROPERTIES
                             RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/gbenchmarks")
 endfunction(ConfigureBench)
@@ -54,4 +54,11 @@ ConfigureBench(TEST_BENCH "${TEST_BENCH_SRC}")
 set(RANDOM_ALLOCATIONS_BENCH_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/random_allocations/random_allocations.cpp")
 
-ConfigureBench(RANDOM_ALLOCATIONS_BENCH "${RANDOM_ALLOCATIONS_BENCH_SRC}")
+ConfigureBench(RANDOM_ALLOCATIONS_BENCH "${RANDOM_ALLOCATIONS_BENCH_SRC}")
+###################################################################################################
+# - replay benchmark --------------------------------------------------------------------------------
+
+set(REPLAY_BENCH_SRC
+  "${CMAKE_CURRENT_SOURCE_DIR}/replay/replay.cpp")
+
+ConfigureBench(REPLAY_BENCH "${REPLAY_BENCH_SRC}")

benchmarks/random_allocations/random_allocations.cpp

@@ -171,6 +171,8 @@ static void BM_RandomAllocationsCnmem(State& state) {
 }
 BENCHMARK(BM_RandomAllocationsCnmem)->Unit(benchmark::kMillisecond);
 
+BENCHMARK_MAIN();
+
 /*int main(void) {
   std::vector<int> state(1);
   BM_RandomAllocationsSub(state);