Refactor benchmarking to be outside the vtkm folder structure

The benchmarking isn't installed as part of vtk-m and therefore shouldn't
be under vtkm/

CMakeLists.txt

@@ -276,6 +276,12 @@ set(CPACK_RESOURCE_FILE_LICENSE ${VTKm_SOURCE_DIR}/LICENSE.txt)
 set(CPACK_RESOURCE_FILE_README ${VTKm_SOURCE_DIR}/README.md)
 include(CPack)
 
+#-----------------------------------------------------------------------------
+#add the benchmarking folder
+if(VTKm_ENABLE_BENCHMARKS)
+    add_subdirectory(benchmarking)
+endif()
+
 #-----------------------------------------------------------------------------
 # Build examples
 if(VTKm_ENABLE_EXAMPLES)

benchmarking/BenchmarkArrayTransfer.cxx

@@ -18,7 +18,7 @@
 //  this software.
 //============================================================================
 
-#include <vtkm/benchmarking/Benchmarker.h>
+#include "Benchmarker.h"
 
 #include <vtkm/TypeTraits.h>
 

benchmarking/BenchmarkCopySpeeds.cxx

@@ -20,7 +20,7 @@
 
 #include <vtkm/TypeTraits.h>
 
-#include <vtkm/benchmarking/Benchmarker.h>
+#include "Benchmarker.h"
 
 #include <vtkm/cont/DeviceAdapter.h>
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>

benchmarking/BenchmarkDeviceAdapter.cxx

@@ -18,8 +18,8 @@
 //  this software.
 //============================================================================
 
+#include "Benchmarker.h"
 #include <vtkm/TypeTraits.h>
-#include <vtkm/benchmarking/Benchmarker.h>
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleConstant.h>
 #include <vtkm/cont/ArrayHandleCounting.h>

benchmarking/BenchmarkFieldAlgorithms.cxx

@@ -32,7 +32,7 @@
 #include <vtkm/worklet/WorkletMapField.h>
 #include <vtkm/worklet/WorkletMapTopology.h>
 
-#include <vtkm/benchmarking/Benchmarker.h>
+#include "Benchmarker.h"
 #include <vtkm/cont/testing/Testing.h>
 
 #include <random>

benchmarking/BenchmarkRayTracing.cxx

@@ -18,7 +18,7 @@
 //  this software.
 //============================================================================
 
-#include <vtkm/benchmarking/Benchmarker.h>
+#include "Benchmarker.h"
 
 #include <vtkm/TypeTraits.h>
 

benchmarking/BenchmarkTopologyAlgorithms.cxx

@@ -29,7 +29,7 @@
 #include <vtkm/worklet/WorkletMapField.h>
 #include <vtkm/worklet/WorkletMapTopology.h>
 
-#include <vtkm/benchmarking/Benchmarker.h>
+#include "Benchmarker.h"
 #include <vtkm/cont/testing/Testing.h>
 
 #include <random>

examples/demo/Demo.cu

@@ -1,24 +0,0 @@
-//============================================================================
-//  Copyright (c) Kitware, Inc.
-//  All rights reserved.
-//  See LICENSE.txt for details.
-//  This software is distributed WITHOUT ANY WARRANTY; without even
-//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the above copyright notice for more information.
-//
-//  Copyright 2014 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
-//  Copyright 2014 UT-Battelle, LLC.
-//  Copyright 2014 Los Alamos National Security.
-//
-//  Under the terms of Contract DE-NA0003525 with NTESS,
-//  the U.S. Government retains certain rights in this software.
-//
-//  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
-//  Laboratory (LANL), the U.S. Government retains certain rights in
-//  this software.
-//============================================================================
-
-//Define the CUDA device adapter as being the default
-#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_CUDA
-
-#include "Demo.cxx"

vtkm/CMakeLists.txt

@@ -89,12 +89,6 @@ add_subdirectory(rendering)
 
 add_subdirectory(interop)
 
-#-----------------------------------------------------------------------------
-#add the benchmarking folder
-if(VTKm_ENABLE_BENCHMARKS)
-    add_subdirectory(benchmarking)
-endif()
-
 #-----------------------------------------------------------------------------
 #add the io folder
 add_subdirectory(io)