Merge pull request rapidsai#384 from rapidsai/branch-0.14

[gpuCI] Auto-merge branch-0.14 to branch-0.15 [skip ci]
jjacobelli · May 25, 2020 · 6ca2a04 · 6ca2a04
2 parents a14bf44 + 212bac8
commit 6ca2a04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,7 +40,8 @@
 - PR #367 Fix flake8 issues
 - PR #368 Fix `clang-format` missing comma bug
 - PR #370 Fix stream and mr use in `device_buffer` methods
-- PR #379  Remove deprecated calls from synchronization.cpp
+- PR #379 Remove deprecated calls from synchronization.cpp
+- PR #381 Remove test_benchmark.cpp from cmakelists
 
 
 # RMM 0.13.0 (Date TBD)

diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -40,14 +40,6 @@ link_directories("${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}" # CMAKE_CUDA_IMPLICIT
 ### test sources ##################################################################################
 ###################################################################################################
 
-###################################################################################################
-# - test benchmark --------------------------------------------------------------------------------
-
-set(TEST_BENCH_SRC
-  "${CMAKE_CURRENT_SOURCE_DIR}/test/test_benchmark.cpp")
-
-ConfigureBench(TEST_BENCH "${TEST_BENCH_SRC}")
-
 ###################################################################################################
 # - random allocations benchmark --------------------------------------------------------------------------------