From 8eed21d0853800fb1e5e8afb0a8027a26b6828d4 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Wed, 28 Apr 2021 14:37:10 -0600 Subject: [PATCH] Do not declare headers for virtual classes that are removed --- CMake/testing/VTKmCheckSourceInInstall.cmake | 11 +++++++++++ vtkm/cont/CMakeLists.txt | 2 +- vtkm/cont/cuda/internal/CMakeLists.txt | 7 ++++++- vtkm/cont/internal/CMakeLists.txt | 13 +++++++++---- vtkm/cont/kokkos/internal/CMakeLists.txt | 8 +++++++- vtkm/cont/openmp/internal/CMakeLists.txt | 7 ++++++- vtkm/cont/serial/internal/CMakeLists.txt | 8 +++++++- vtkm/cont/tbb/internal/CMakeLists.txt | 7 ++++++- vtkm/exec/CMakeLists.txt | 2 +- vtkm/internal/CMakeLists.txt | 7 ++++++- 10 files changed, 60 insertions(+), 12 deletions(-) diff --git a/CMake/testing/VTKmCheckSourceInInstall.cmake b/CMake/testing/VTKmCheckSourceInInstall.cmake index 8398b0f73..3a0b8a58f 100644 --- a/CMake/testing/VTKmCheckSourceInInstall.cmake +++ b/CMake/testing/VTKmCheckSourceInInstall.cmake @@ -124,8 +124,19 @@ function(do_verify root_dir prefix) cont/PointLocator.h cont/StorageVirtual.h cont/StorageVirtual.hxx + cont/VirtualObjectHandle.h + cont/cuda/internal/VirtualObjectTransferCuda.h + cont/internal/TransferInfo.h + cont/internal/VirtualObjectTransfer.h + cont/internal/VirtualObjectTransferInstantiate.h + cont/internal/VirtualObjectTransferShareWithControl.h + cont/kokkos/internal/VirtualObjectTransferKokkos.h + cont/openmp/internal/VirtualObjectTransferOpenMP.h + cont/serial/internal/VirtualObjectTransferSerial.h + cont/tbb/internal/VirtualObjectTransferTBB.h exec/CellLocator.h exec/PointLocator.h + internal/ArrayPortalVirtual.h ) #by default every header in a testing directory doesn't need to be installed diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt index 8efcc7c8d..bc77e3293 100644 --- a/vtkm/cont/CMakeLists.txt +++ b/vtkm/cont/CMakeLists.txt @@ -121,7 +121,6 @@ set(headers UncertainArrayHandle.h UnknownArrayHandle.h VariantArrayHandle.h - VirtualObjectHandle.h ) set(template_sources @@ -194,6 +193,7 @@ if (NOT VTKm_NO_DEPRECATED_VIRTUAL) CellLocator.h PointLocator.h StorageVirtual.h + VirtualObjectHandle.h ) set(template_sources ${template_sources} diff --git a/vtkm/cont/cuda/internal/CMakeLists.txt b/vtkm/cont/cuda/internal/CMakeLists.txt index 635e0c603..21459c44a 100644 --- a/vtkm/cont/cuda/internal/CMakeLists.txt +++ b/vtkm/cont/cuda/internal/CMakeLists.txt @@ -18,9 +18,14 @@ set(headers MakeThrustIterator.h ScopedCudaStackSize.h ThrustExceptionHandler.h - VirtualObjectTransferCuda.h ) +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + VirtualObjectTransferCuda.h + ) +endif() + vtkm_declare_headers(${headers}) diff --git a/vtkm/cont/internal/CMakeLists.txt b/vtkm/cont/internal/CMakeLists.txt index 30c5bdb1d..f0eee5bab 100644 --- a/vtkm/cont/internal/CMakeLists.txt +++ b/vtkm/cont/internal/CMakeLists.txt @@ -33,13 +33,18 @@ set(headers ReverseConnectivityBuilder.h StorageDeprecated.h StorageError.h - TransferInfo.h Variant.h - VirtualObjectTransfer.h - VirtualObjectTransferInstantiate.h - VirtualObjectTransferShareWithControl.h ) +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + TransferInfo.h + VirtualObjectTransfer.h + VirtualObjectTransferInstantiate.h + VirtualObjectTransferShareWithControl.h + ) +endif() + vtkm_declare_headers(${headers}) # These source files are actually compiled in the parent directory. diff --git a/vtkm/cont/kokkos/internal/CMakeLists.txt b/vtkm/cont/kokkos/internal/CMakeLists.txt index 8cc5382aa..0a48f0b6c 100644 --- a/vtkm/cont/kokkos/internal/CMakeLists.txt +++ b/vtkm/cont/kokkos/internal/CMakeLists.txt @@ -16,7 +16,13 @@ set(headers Initialize.h KokkosAlloc.h KokkosTypes.h - VirtualObjectTransferKokkos.h) + ) + +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + VirtualObjectTransferKokkos.h + ) +endif() vtkm_declare_headers(${headers}) diff --git a/vtkm/cont/openmp/internal/CMakeLists.txt b/vtkm/cont/openmp/internal/CMakeLists.txt index fc28bbfd6..46cc37664 100644 --- a/vtkm/cont/openmp/internal/CMakeLists.txt +++ b/vtkm/cont/openmp/internal/CMakeLists.txt @@ -18,9 +18,14 @@ set(headers ParallelRadixSortOpenMP.h ParallelScanOpenMP.h ParallelSortOpenMP.h - VirtualObjectTransferOpenMP.h ) +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + VirtualObjectTransferOpenMP.h + ) +endif() + vtkm_declare_headers(${headers}) #These sources need to always be built diff --git a/vtkm/cont/serial/internal/CMakeLists.txt b/vtkm/cont/serial/internal/CMakeLists.txt index 9ba2193c4..22c9b7f0e 100644 --- a/vtkm/cont/serial/internal/CMakeLists.txt +++ b/vtkm/cont/serial/internal/CMakeLists.txt @@ -13,8 +13,14 @@ set(headers DeviceAdapterMemoryManagerSerial.h DeviceAdapterRuntimeDetectorSerial.h DeviceAdapterTagSerial.h - VirtualObjectTransferSerial.h ) + +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + VirtualObjectTransferSerial.h + ) +endif() + vtkm_declare_headers(${headers}) target_sources(vtkm_cont PRIVATE diff --git a/vtkm/cont/tbb/internal/CMakeLists.txt b/vtkm/cont/tbb/internal/CMakeLists.txt index 2cf838d81..1283307be 100644 --- a/vtkm/cont/tbb/internal/CMakeLists.txt +++ b/vtkm/cont/tbb/internal/CMakeLists.txt @@ -15,9 +15,14 @@ set(headers DeviceAdapterTagTBB.h FunctorsTBB.h ParallelSortTBB.h - VirtualObjectTransferTBB.h ) +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + VirtualObjectTransferTBB.h + ) +endif() + vtkm_declare_headers(${headers} ParallelSortTBB.hxx parallel_sort.h diff --git a/vtkm/exec/CMakeLists.txt b/vtkm/exec/CMakeLists.txt index e56dec4fa..fb8503887 100644 --- a/vtkm/exec/CMakeLists.txt +++ b/vtkm/exec/CMakeLists.txt @@ -31,7 +31,6 @@ set(headers FieldNeighborhood.h FunctorBase.h ParametricCoordinates.h - PointLocator.h PointLocatorSparseGrid.h TaskBase.h ) @@ -43,6 +42,7 @@ set(header_impls if (NOT VTKm_NO_DEPRECATED_VIRTUAL) set(headers ${headers} CellLocator.h + PointLocator.h ) endif() diff --git a/vtkm/internal/CMakeLists.txt b/vtkm/internal/CMakeLists.txt index 00f2a6468..c752f7689 100755 --- a/vtkm/internal/CMakeLists.txt +++ b/vtkm/internal/CMakeLists.txt @@ -55,7 +55,6 @@ set(headers ArrayPortalHelpers.h ArrayPortalUniformPointCoordinates.h ArrayPortalValueReference.h - ArrayPortalVirtual.h Assume.h brigand.hpp ConfigureFor32.h @@ -76,6 +75,12 @@ set(headers Windows.h ) +if (NOT VTKm_NO_DEPRECATED_VIRTUAL) + set(headers ${headers} + ArrayPortalVirtual.h + ) +endif() + vtkm_declare_headers(${headers}) vtkm_pyexpander_generated_file(FunctionInterfaceDetailPre.h)