Some renaming

aprokop · May 3, 2024 · 94c8f16 · 94c8f16
1 parent 170087a
commit 94c8f16
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/benchmarks/bvh_driver/CMakeLists.txt b/benchmarks/bvh_driver/CMakeLists.txt
@@ -1,9 +1,9 @@
-set(BENCHMARKS_UTILS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/utils)
+set(ARBORX_BENCHMARK_UTILS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/utils)
 set(UNIT_TESTS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/test)
 
 add_executable(ArborX_Benchmark_BoundingVolumeHierarchy.exe bvh_driver.cpp)
 target_link_libraries(ArborX_Benchmark_BoundingVolumeHierarchy.exe ArborX::ArborX benchmark::benchmark Boost::program_options)
-target_include_directories(ArborX_Benchmark_BoundingVolumeHierarchy.exe PRIVATE ${BENCHMARKS_UTILS_INCLUDE_DIR} ${UNIT_TESTS_INCLUDE_DIR})
+target_include_directories(ArborX_Benchmark_BoundingVolumeHierarchy.exe PRIVATE ${ARBORX_BENCHMARK_UTILS_INCLUDE_DIR} ${UNIT_TESTS_INCLUDE_DIR})
 add_test(NAME ArborX_Benchmark_BoundingVolumeHierarchy COMMAND ArborX_Benchmark_BoundingVolumeHierarchy.exe --buffer=0 --benchmark_color=true)
 if(ARBORX_PERFORMANCE_TESTING)
   target_compile_definitions(ArborX_Benchmark_BoundingVolumeHierarchy.exe PRIVATE ARBORX_PERFORMANCE_TESTING)

diff --git a/benchmarks/bvh_driver/benchmark_registration.hpp b/benchmarks/bvh_driver/benchmark_registration.hpp
@@ -12,6 +12,7 @@
 #ifndef BENCHMARK_REGISTRATION_HPP
 #define BENCHMARK_REGISTRATION_HPP
 
+#include <ArborXBenchmark_PointClouds.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Predicates.hpp>
 
@@ -21,7 +22,6 @@
 #include <cmath> // cbrt
 
 #include <benchmark/benchmark.h>
-#include <point_clouds.hpp>
 
 struct Spec
 {

diff --git a/benchmarks/bvh_driver/bvh_driver.cpp b/benchmarks/bvh_driver/bvh_driver.cpp
@@ -9,6 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
+#include <ArborXBenchmark_PointClouds.hpp>
 #include <ArborX_BoostRTreeHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <ArborX_Version.hpp>
@@ -21,7 +22,6 @@
 #include <iostream>
 
 #include "benchmark_registration.hpp"
-#include <point_clouds.hpp>
 
 #ifdef ARBORX_PERFORMANCE_TESTING
 #include <mpi.h>

diff --git a/benchmarks/distributed_tree_driver/CMakeLists.txt b/benchmarks/distributed_tree_driver/CMakeLists.txt
@@ -1,6 +1,6 @@
-set(BENCHMARKS_UTILS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/utils)
+set(ARBORX_BENCHMARK_UTILS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/utils)
 
 add_executable(ArborX_Benchmark_DistributedTree.exe distributed_tree_driver.cpp)
 target_link_libraries(ArborX_Benchmark_DistributedTree.exe ArborX::ArborX Boost::program_options)
-target_include_directories(ArborX_Benchmark_DistributedTree.exe PRIVATE ${BENCHMARKS_UTILS_INCLUDE_DIR})
+target_include_directories(ArborX_Benchmark_DistributedTree.exe PRIVATE ${ARBORX_BENCHMARK_UTILS_INCLUDE_DIR})
 add_test(NAME ArborX_Benchmark_DistributedTree COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ArborX_Benchmark_DistributedTree.exe> ${MPIEXEC_POSTFLAGS})
diff --git a/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp b/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
@@ -9,6 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
+#include <ArborXBenchmark_TimeMonitor.hpp>
 #include <ArborX_DistributedTree.hpp>
 #include <ArborX_PairIndexRank.hpp>
 #include <ArborX_Version.hpp>
@@ -23,7 +24,6 @@
 #include <vector>
 
 #include <mpi.h>
-#include <time_monitor.hpp>
 
 struct HelpPrinted
 {};

diff --git a/benchmarks/triangulated_surface_distance/CMakeLists.txt b/benchmarks/triangulated_surface_distance/CMakeLists.txt
@@ -1,6 +1,6 @@
-set(BENCHMARKS_UTILS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/utils)
+set(ARBORX_BENCHMARK_UTILS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/utils)
 
 add_executable(ArborX_Benchmark_TriangulatedSurfaceDistance.exe triangulated_surface_distance.cpp)
-target_include_directories(ArborX_Benchmark_TriangulatedSurfaceDistance.exe PRIVATE ${BENCHMARKS_UTILS_INCLUDE_DIR})
+target_include_directories(ArborX_Benchmark_TriangulatedSurfaceDistance.exe PRIVATE ${ARBORX_BENCHMARK_UTILS_INCLUDE_DIR})
 target_link_libraries(ArborX_Benchmark_TriangulatedSurfaceDistance.exe ArborX::ArborX Boost::program_options)
 add_test(NAME ArborX_Benchmark_TriangulatedSurfaceDistance COMMAND ArborX_Benchmark_TriangulatedSurfaceDistance.exe)
diff --git a/benchmarks/triangulated_surface_distance/triangulated_surface_distance.cpp b/benchmarks/triangulated_surface_distance/triangulated_surface_distance.cpp
@@ -10,6 +10,7 @@
  ****************************************************************************/
 
 #include <ArborX.hpp>
+#include <ArborXBenchmark_PointClouds.hpp>
 #include <ArborX_HyperTriangle.hpp>
 #include <ArborX_Version.hpp>
 
@@ -22,8 +23,6 @@
 #include <iostream>
 #include <string>
 
-#include <point_clouds.hpp>
-
 using Point = ArborX::ExperimentalHyperGeometry::Point<3>;
 using Triangle = ArborX::ExperimentalHyperGeometry::Triangle<3>;
 

diff --git a/benchmarks/utils/point_clouds.hpp → ...rks/utils/ArborXBenchmark_PointClouds.hpp b/benchmarks/utils/point_clouds.hpp → ...rks/utils/ArborXBenchmark_PointClouds.hpp
diff --git a/benchmarks/utils/time_monitor.hpp → ...rks/utils/ArborXBenchmark_TimeMonitor.hpp b/benchmarks/utils/time_monitor.hpp → ...rks/utils/ArborXBenchmark_TimeMonitor.hpp