Merge topic 'deprecate-arrayhandlevirtual'

e706880d Fix unnecessary deprecation warnings in visual studio
f7cc0310 Fix deprecated warnings
b27e4c7e Ignore files for deprecated virtual classes for SourceInInstall test
284774cf Turn on "no virtual" option on some CI builds
cd08fd49 Add changelog for removing virtual methods
63ef84ed Optionally remove all use of ArrayHandleVirtual
e11f612a Deprecate ArrayHandleVirtual
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2256

.gitlab/ci/config/initial_config.cmake

@@ -49,6 +49,9 @@ foreach(option IN LISTS options)
   elseif(no_rendering STREQUAL option)
     set(VTKm_ENABLE_RENDERING "OFF" CACHE STRING "")
 
+  elseif(no_virtual STREQUAL option)
+    set(VTKm_NO_DEPRECATED_VIRTUAL "ON" CACHE STRING "")
+
   elseif(examples STREQUAL option)
     set(VTKm_ENABLE_EXAMPLES "ON" CACHE STRING "")
 

.gitlab/ci/ubuntu1604.yml

@@ -17,7 +17,7 @@ build:ubuntu1604_gcc5:
     CC: "gcc-5"
     CXX: "g++-5"
     CMAKE_BUILD_TYPE: RelWithDebInfo
-    VTKM_SETTINGS: "cuda+pascal"
+    VTKM_SETTINGS: "cuda+pascal+no_virtual"
 
 test:ubuntu1604_gcc5:
   tags:

.gitlab/ci/ubuntu1804.yml

@@ -55,7 +55,7 @@ build:ubuntu1804_gcc7:
   variables:
     CC: "gcc-7"
     CXX: "g++-7"
-    VTKM_SETTINGS: "cuda+turing+mpi+64bit_floats"
+    VTKM_SETTINGS: "cuda+turing+mpi+64bit_floats+no_virtual"
 
 test:ubuntu1804_gcc7:
   tags:

CMake/testing/VTKmCheckSourceInInstall.cmake

@@ -112,6 +112,14 @@ function(do_verify root_dir prefix)
   set(file_exceptions
     cont/ColorTablePrivate.hxx
     thirdparty/diy/vtkmdiy/cmake/mpi_types.h
+
+    # Ignore deprecated virtual classes (which are not installed if VTKm_NO_DEPRECATED_VIRTUAL
+    # is on). These exceptions can be removed when these files are completely removed.
+    cont/ArrayHandleVirtual.h
+    cont/ArrayHandleVirtual.hxx
+    cont/ArrayHandleVirtualCoordinates.h
+    cont/StorageVirtual.h
+    cont/StorageVirtual.hxx
     )
 
   #by default every header in a testing directory doesn't need to be installed

CMakeLists.txt

@@ -132,6 +132,13 @@ vtkm_option(VTKm_ENABLE_DEVELOPER_FLAGS "Enable compiler flags that are useful w
 # Some application might need not to install those, hence this option.
 vtkm_option(VTKm_NO_INSTALL_README_LICENSE "disable the installation of README and LICENSE files" OFF)
 
+# We are in the process of deprecating the use of virtual methods because they
+# are not well supported on many accelerators. Turn this option on to remove
+# the code entirely. Note that the deprecation of virtual methods is work in
+# progress, so not all use of virtual methods may be done. In VTK-m 2.0
+# virtual methods should be removed entirely and this option will be removed.
+vtkm_option(VTKm_NO_DEPRECATED_VIRTUAL "Do not compile support of deprecated virtual methods" OFF)
+
 mark_as_advanced(
   VTKm_ENABLE_LOGGING
   VTKm_NO_ASSERT
@@ -140,6 +147,7 @@ mark_as_advanced(
   VTKm_HIDE_PRIVATE_SYMBOLS
   VTKm_ENABLE_DEVELOPER_FLAGS
   VTKm_NO_INSTALL_README_LICENSE
+  VTKm_NO_DEPRECATED_VIRTUAL
   )
 
 #-----------------------------------------------------------------------------

benchmarking/BenchmarkFieldAlgorithms.cxx

@@ -13,13 +13,16 @@
 
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleMultiplexer.h>
-#include <vtkm/cont/ArrayHandleVirtual.h>
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/ImplicitFunctionHandle.h>
 #include <vtkm/cont/Initialize.h>
 #include <vtkm/cont/Invoker.h>
 #include <vtkm/cont/Timer.h>
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
+#include <vtkm/cont/ArrayHandleVirtual.h>
+#endif
+
 #include <vtkm/worklet/WorkletMapField.h>
 #include <vtkm/worklet/WorkletMapTopology.h>
 
@@ -433,15 +436,19 @@ void BenchBlackScholesStatic(::benchmark::State& state)
 };
 VTKM_BENCHMARK_TEMPLATES(BenchBlackScholesStatic, ValueTypes);
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 template <typename ValueType>
 void BenchBlackScholesDynamic(::benchmark::State& state)
 {
+  VTKM_DEPRECATED_SUPPRESS_BEGIN
   BenchBlackScholesImpl<ValueType> impl{ state };
   impl.Run(vtkm::cont::make_ArrayHandleVirtual(impl.StockPrice),
            vtkm::cont::make_ArrayHandleVirtual(impl.OptionStrike),
            vtkm::cont::make_ArrayHandleVirtual(impl.OptionYears));
+  VTKM_DEPRECATED_SUPPRESS_END
 };
 VTKM_BENCHMARK_TEMPLATES(BenchBlackScholesDynamic, ValueTypes);
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 template <typename ValueType>
 void BenchBlackScholesMultiplexer0(::benchmark::State& state)
@@ -537,15 +544,19 @@ void BenchMathStatic(::benchmark::State& state)
 };
 VTKM_BENCHMARK_TEMPLATES(BenchMathStatic, ValueTypes);
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 template <typename ValueType>
 void BenchMathDynamic(::benchmark::State& state)
 {
+  VTKM_DEPRECATED_SUPPRESS_BEGIN
   BenchMathImpl<ValueType> impl{ state };
   impl.Run(vtkm::cont::make_ArrayHandleVirtual(impl.InputHandle),
            vtkm::cont::make_ArrayHandleVirtual(impl.TempHandle1),
            vtkm::cont::make_ArrayHandleVirtual(impl.TempHandle2));
+  VTKM_DEPRECATED_SUPPRESS_END
 };
 VTKM_BENCHMARK_TEMPLATES(BenchMathDynamic, ValueTypes);
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 template <typename ValueType>
 void BenchMathMultiplexer0(::benchmark::State& state)
@@ -636,13 +647,17 @@ void BenchFusedMathStatic(::benchmark::State& state)
 };
 VTKM_BENCHMARK_TEMPLATES(BenchFusedMathStatic, ValueTypes);
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 template <typename ValueType>
 void BenchFusedMathDynamic(::benchmark::State& state)
 {
+  VTKM_DEPRECATED_SUPPRESS_BEGIN
   BenchFusedMathImpl<ValueType> impl{ state };
   impl.Run(vtkm::cont::make_ArrayHandleVirtual(impl.InputHandle));
+  VTKM_DEPRECATED_SUPPRESS_END
 };
 VTKM_BENCHMARK_TEMPLATES(BenchFusedMathDynamic, ValueTypes);
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 template <typename ValueType>
 void BenchFusedMathMultiplexer0(::benchmark::State& state)
@@ -756,15 +771,19 @@ void BenchEdgeInterpStatic(::benchmark::State& state)
 };
 VTKM_BENCHMARK_TEMPLATES(BenchEdgeInterpStatic, InterpValueTypes);
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 template <typename ValueType>
 void BenchEdgeInterpDynamic(::benchmark::State& state)
 {
+  VTKM_DEPRECATED_SUPPRESS_BEGIN
   BenchEdgeInterpImpl<ValueType> impl{ state };
   impl.Run(vtkm::cont::make_ArrayHandleVirtual(impl.EdgePairHandle),
            vtkm::cont::make_ArrayHandleVirtual(impl.WeightHandle),
            vtkm::cont::make_ArrayHandleVirtual(impl.FieldHandle));
+  VTKM_DEPRECATED_SUPPRESS_END
 };
 VTKM_BENCHMARK_TEMPLATES(BenchEdgeInterpDynamic, InterpValueTypes);
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 struct ImplicitFunctionBenchData
 {

docs/changelog/deprecate-virtual-methods.md

+# Virtual methods in execution environment deprecated
+
+The use of classes with any virtual methods in the execution environment is
+deprecated. Although we had code to correctly build virtual methods on some
+devices such as CUDA, this feature was not universally supported on all
+programming models we wish to support. Plus, the implementation of virtual
+methods is not hugely convenient on CUDA because the virtual methods could
+not be embedded in a library. To get around virtual methods declared in
+different libraries, all builds had to be static, and a special linking
+step to pull in possible virtual method implementations was required.
+
+For these reasons, VTK-m is no longer relying on virtual methods. (Other
+approaches like multiplexers are used instead.) The code will be officially
+removed in version 2.0. It is still supported in a deprecated sense (you
+should get a warning). However, if you want to build without virtual
+methods, you can set the `VTKm_NO_DEPRECATED_VIRTUAL` CMake flag, and they
+will not be compiled.

vtkm/cont/ArrayHandleCompositeVector.h

@@ -67,13 +67,12 @@ struct AllAreArrayHandles
 // `vtkm::Vec<Float32, 3>`. This also validates that all members have the same `ValueType`.
 
 template <typename ExpectedValueType, typename ArrayType>
-constexpr bool CheckValueType()
+struct CheckValueType
 {
   VTKM_STATIC_ASSERT_MSG((std::is_same<ExpectedValueType, typename ArrayType::ValueType>::value),
                          "ArrayHandleCompositeVector must be built from "
                          "ArrayHandles with the same ValueTypes.");
-  return std::is_same<ExpectedValueType, typename ArrayType::ValueType>::value;
-}
+};
 
 template <typename ArrayType0, typename... ArrayTypes>
 struct GetValueType
@@ -81,9 +80,7 @@ struct GetValueType
   static constexpr vtkm::IdComponent COUNT =
     static_cast<vtkm::IdComponent>(sizeof...(ArrayTypes)) + 1;
   using ComponentType = typename ArrayType0::ValueType;
-  static constexpr std::array<bool, sizeof...(ArrayTypes) + 1> ValueCheck{
-    { true, CheckValueType<ComponentType, ArrayTypes>()... }
-  };
+  using ValueCheck = vtkm::List<CheckValueType<ComponentType, ArrayTypes>...>;
   using ValueType = vtkm::Vec<ComponentType, COUNT>;
 };
 

vtkm/cont/ArrayHandleVirtual.cxx

@@ -15,6 +15,8 @@ namespace vtkm
 namespace cont
 {
 
+VTKM_DEPRECATED_SUPPRESS_BEGIN
+
 #define VTK_M_ARRAY_HANDLE_VIRTUAL_INSTANTIATE(T)                                  \
   template class VTKM_CONT_EXPORT ArrayHandle<T, StorageTagVirtual>;               \
   template class VTKM_CONT_EXPORT ArrayHandleVirtual<T>;                           \
@@ -38,5 +40,8 @@ VTK_M_ARRAY_HANDLE_VIRTUAL_INSTANTIATE(vtkm::Float32);
 VTK_M_ARRAY_HANDLE_VIRTUAL_INSTANTIATE(vtkm::Float64);
 
 #undef VTK_M_ARRAY_HANDLE_VIRTUAL_INSTANTIATE
+
+VTKM_DEPRECATED_SUPPRESS_END
+
 }
 } //namespace vtkm::cont

vtkm/cont/ArrayHandleVirtual.h

@@ -20,14 +20,19 @@
 
 #include <memory>
 
+#ifdef VTKM_NO_DEPRECATED_VIRTUAL
+#error "ArrayHandleVirtual is removed. Do not include ArrayHandleVirtual.h"
+#endif
+
 namespace vtkm
 {
 namespace cont
 {
 
 
+VTKM_DEPRECATED_SUPPRESS_BEGIN
 template <typename T>
-class VTKM_ALWAYS_EXPORT ArrayHandleVirtual
+class VTKM_ALWAYS_EXPORT VTKM_DEPRECATED(1.6) ArrayHandleVirtual
   : public vtkm::cont::ArrayHandle<T, vtkm::cont::StorageTagVirtual>
 {
   using StorageType = vtkm::cont::internal::Storage<T, vtkm::cont::StorageTagVirtual>;
@@ -267,6 +272,7 @@ VTK_M_ARRAY_HANDLE_VIRTUAL_EXPORT(vtkm::Float64);
 #undef VTK_M_ARRAY_HANDLE_VIRTUAL_EXPORT
 
 #endif //vtk_m_cont_ArrayHandleVirtual_cxx
+VTKM_DEPRECATED_SUPPRESS_END
 }
 } //namespace vtkm::cont
 

vtkm/cont/ArrayHandleVirtual.hxx

@@ -13,6 +13,7 @@
 #include <vtkm/cont/ArrayHandleVirtual.h>
 #include <vtkm/cont/TryExecute.h>
 
+VTKM_DEPRECATED_SUPPRESS_BEGIN
 namespace vtkm
 {
 namespace cont
@@ -37,6 +38,7 @@ ArrayHandleType inline ArrayHandleVirtual<T>::CastToType(
 }
 }
 } // namespace vtkm::cont
+VTKM_DEPRECATED_SUPPRESS_END
 
 
 #include <vtkm/cont/ArrayHandleConstant.h>
@@ -45,6 +47,7 @@ ArrayHandleType inline ArrayHandleVirtual<T>::CastToType(
 //=============================================================================
 // Specializations of serialization related classes
 /// @cond SERIALIZATION
+VTKM_DEPRECATED_SUPPRESS_BEGIN
 namespace mangled_diy_namespace
 {
 
@@ -178,5 +181,6 @@ struct Serialization<vtkm::cont::ArrayHandle<T, vtkm::cont::StorageTagVirtual>>
 };
 
 } // mangled_diy_namespace
+VTKM_DEPRECATED_SUPPRESS_END
 
 #endif

vtkm/cont/ArrayHandleVirtualCoordinates.h

@@ -22,11 +22,17 @@
 #include <memory>
 #include <type_traits>
 
+#ifdef VTKM_NO_DEPRECATED_VIRTUAL
+#error "ArrayHandleVirtualCoordiantes is removed. Do not include ArrayHandleVirtualCoordinates.h"
+#endif
+
 namespace vtkm
 {
 namespace cont
 {
 
+VTKM_DEPRECATED_SUPPRESS_BEGIN
+
 /// ArrayHandleVirtualCoordinates is a specialization of ArrayHandle.
 class VTKM_ALWAYS_EXPORT VTKM_DEPRECATED(1.6, "Virtual ArrayHandles are being phased out.")
   ArrayHandleVirtualCoordinates final : public vtkm::cont::ArrayHandleVirtual<vtkm::Vec3f>
@@ -35,17 +41,13 @@ public:
   VTKM_ARRAY_HANDLE_SUBCLASS_NT(ArrayHandleVirtualCoordinates,
                                 (vtkm::cont::ArrayHandleVirtual<vtkm::Vec3f>));
 
-  VTKM_DEPRECATED_SUPPRESS_BEGIN
   template <typename T, typename S>
   explicit ArrayHandleVirtualCoordinates(const vtkm::cont::ArrayHandle<T, S>& ah)
     : vtkm::cont::ArrayHandleVirtual<vtkm::Vec3f>(vtkm::cont::make_ArrayHandleCast<ValueType>(ah))
   {
   }
-  VTKM_DEPRECATED_SUPPRESS_END
 };
 
-VTKM_DEPRECATED_SUPPRESS_BEGIN
-
 template <typename Functor, typename... Args>
 void CastAndCall(const vtkm::cont::ArrayHandleVirtualCoordinates& coords,
                  Functor&& f,

vtkm/cont/ArrayRangeCompute.h

@@ -16,9 +16,12 @@
 #include <vtkm/cont/ArrayHandleCartesianProduct.h>
 #include <vtkm/cont/ArrayHandleCompositeVector.h>
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
-#include <vtkm/cont/ArrayHandleVirtual.h>
 #include <vtkm/cont/DeviceAdapterTag.h>
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
+#include <vtkm/cont/ArrayHandleVirtual.h>
+#endif
+
 namespace vtkm
 {
 namespace cont
@@ -87,10 +90,14 @@ VTK_M_ARRAY_RANGE_COMPUTE_EXPORT_VEC(vtkm::Float64, 4, vtkm::cont::StorageTagBas
 #undef VTK_M_ARRAY_RANGE_COMPUTE_EXPORT_T
 #undef VTK_M_ARRAY_RANGE_COMPUTE_EXPORT_VEC
 
-VTKM_CONT
-vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
-  const vtkm::cont::ArrayHandleVirtual<vtkm::Vec3f>& input,
-  vtkm::cont::DeviceAdapterId device = vtkm::cont::DeviceAdapterTagAny());
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
+VTKM_DEPRECATED_SUPPRESS_BEGIN
+VTKM_CONT VTKM_DEPRECATED(1.6, "ArrayHandleVirtual no longer supported.")
+  vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
+    const vtkm::cont::ArrayHandleVirtual<vtkm::Vec3f>& input,
+    vtkm::cont::DeviceAdapterId device = vtkm::cont::DeviceAdapterTagAny());
+VTKM_DEPRECATED_SUPPRESS_END
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 VTKM_CONT_EXPORT VTKM_CONT vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const vtkm::cont::ArrayHandle<vtkm::Vec3f,

vtkm/cont/ArrayRangeCompute.hxx

@@ -94,6 +94,8 @@ inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeComputeImpl(
 } // namespace detail
 
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
+VTKM_DEPRECATED_SUPPRESS_BEGIN
 VTKM_CONT
 inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const vtkm::cont::ArrayHandleVirtual<vtkm::Vec3f>& input,
@@ -132,6 +134,8 @@ inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
     return detail::ArrayRangeComputeImpl(input, device);
   }
 }
+VTKM_DEPRECATED_SUPPRESS_END
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 template <typename ArrayHandleType>
 inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(const ArrayHandleType& input,

vtkm/cont/CMakeLists.txt

@@ -41,8 +41,6 @@ set(headers
   ArrayHandleTransform.h
   ArrayHandleUniformPointCoordinates.h
   ArrayHandleView.h
-  ArrayHandleVirtual.h
-  ArrayHandleVirtualCoordinates.h
   ArrayHandleZip.h
   ArrayPortal.h
   ArrayPortalToIterators.h
@@ -111,7 +109,6 @@ set(headers
   StorageImplicit.h
   StorageList.h
   StorageListTag.h
-  StorageVirtual.h
   Timer.h
   Token.h
   TryExecute.h
@@ -124,7 +121,6 @@ set(headers
 
 set(template_sources
   ArrayHandle.hxx
-  ArrayHandleVirtual.hxx
   ArrayRangeCompute.hxx
   CellSetExplicit.hxx
   CellSetExtrude.hxx
@@ -133,7 +129,6 @@ set(template_sources
   FieldRangeCompute.hxx
   FieldRangeGlobalCompute.hxx
   ParticleArrayCopy.hxx
-  StorageVirtual.hxx
   VirtualObjectHandle.hxx
   )
 
@@ -162,7 +157,6 @@ set(sources
   # This list of sources has code that uses devices and so might need to be
   # compiled with a device-specific compiler (like CUDA).
   set(device_sources
-  ArrayHandleVirtual.cxx
   ArrayRangeCompute.cxx
   AssignerPartitionedDataSet.cxx
   BoundsCompute.cxx
@@ -190,11 +184,28 @@ set(sources
   PointLocator.cxx
   PointLocatorUniformGrid.cxx
   RuntimeDeviceInformation.cxx
-  StorageVirtual.cxx
   Timer.cxx
   UnknownArrayHandle.cxx
   )
 
+if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
+  set(headers ${headers}
+    ArrayHandleVirtual.h
+    ArrayHandleVirtualCoordinates.h
+    StorageVirtual.h
+    )
+
+  set(template_sources ${template_sources}
+    ArrayHandleVirtual.hxx
+    StorageVirtual.hxx
+    )
+
+  set(device_sources ${device_sources}
+    ArrayHandleVirtual.cxx
+    StorageVirtual.cxx
+    )
+endif()
+
 #-----------------------------------------------------------------------------
 # Set up default types, which can be custom configured by other build systems.
 vtkm_get_kit_name(kit_name kit_dir)

vtkm/cont/CoordinateSystem.cxx

@@ -16,6 +16,7 @@ namespace vtkm
 namespace cont
 {
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 namespace detail
 {
 
@@ -27,6 +28,7 @@ vtkm::cont::ArrayHandleVirtualCoordinates CoordDataDepWrapper::ToArray() const
 VTKM_DEPRECATED_SUPPRESS_END
 
 } // namespace detail
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 VTKM_CONT CoordinateSystem::CoordinateSystem()
   : Superclass()
@@ -52,10 +54,19 @@ CoordinateSystem::CoordinateSystem(std::string name,
 {
 }
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 VTKM_CONT vtkm::cont::detail::CoordDataDepWrapper CoordinateSystem::GetData() const
 {
   return vtkm::cont::detail::CoordDataDepWrapper(this->Superclass::GetData());
 }
+#else  //!VTKM_NO_DEPRECATED_VIRTUAL
+VTKM_CONT vtkm::cont::VariantArrayHandleBase<vtkm::TypeListFieldVec3> CoordinateSystem::GetData()
+  const
+{
+  return vtkm::cont::VariantArrayHandleBase<vtkm::TypeListFieldVec3>(this->Superclass::GetData());
+}
+#endif //!VTKM_NO_DEPRECATED_VIRTUAL
+
 
 VTKM_CONT vtkm::cont::CoordinateSystem::MultiplexerArrayType
 CoordinateSystem::GetDataAsMultiplexer() const

vtkm/cont/CoordinateSystem.h

@@ -14,15 +14,19 @@
 #include <vtkm/Deprecated.h>
 
 #include <vtkm/cont/ArrayHandleCast.h>
-#include <vtkm/cont/ArrayHandleVirtualCoordinates.h>
 #include <vtkm/cont/CastAndCall.h>
 #include <vtkm/cont/Field.h>
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
+#include <vtkm/cont/ArrayHandleVirtualCoordinates.h>
+#endif
+
 namespace vtkm
 {
 namespace cont
 {
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 namespace detail
 {
 
@@ -117,6 +121,7 @@ VTKM_CONT VTKM_DEPRECATED(
   vtkm::cont::printSummary_ArrayHandle(coordArray, out, full);
 }
 VTKM_DEPRECATED_SUPPRESS_END
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 class VTKM_CONT_EXPORT CoordinateSystem : public vtkm::cont::Field
 {
@@ -146,7 +151,11 @@ public:
   VTKM_CONT
   vtkm::Id GetNumberOfPoints() const { return this->GetNumberOfValues(); }
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
   VTKM_CONT detail::CoordDataDepWrapper GetData() const;
+#else
+  VTKM_CONT vtkm::cont::VariantArrayHandleBase<vtkm::TypeListFieldVec3> GetData() const;
+#endif
 
 private:
 #ifdef VTKM_USE_DOUBLE_PRECISION
@@ -267,11 +276,14 @@ struct DynamicTransformTraits<vtkm::cont::CoordinateSystem>
   using DynamicTag = vtkm::cont::internal::DynamicTransformTagCastAndCall;
 };
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 template <>
 struct DynamicTransformTraits<vtkm::cont::detail::CoordDataDepWrapper>
 {
   using DynamicTag = vtkm::cont::internal::DynamicTransformTagCastAndCall;
 };
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
+
 
 } // namespace internal
 } // namespace cont
@@ -283,12 +295,14 @@ struct DynamicTransformTraits<vtkm::cont::detail::CoordDataDepWrapper>
 namespace mangled_diy_namespace
 {
 
+#ifndef VTKM_NO_DEPRECATED_VIRTUAL
 template <>
 struct Serialization<vtkm::cont::detail::CoordDataDepWrapper>
   : public Serialization<
       vtkm::cont::VariantArrayHandleBase<vtkm::List<vtkm::Vec3f_32, vtkm::Vec3f_64>>>
 {
 };
+#endif //VTKM_NO_DEPRECATED_VIRTUAL
 
 template <>
 struct Serialization<vtkm::cont::CoordinateSystem>

vtkm/cont/StorageVirtual.h

@@ -20,6 +20,10 @@
 
 #include <typeinfo>
 
+#ifdef VTKM_NO_DEPRECATED_VIRTUAL
+#error "ArrayHandleVirtual is removed. Do not include StorageVirtual.h"
+#endif
+
 namespace vtkm
 {
 namespace cont
@@ -58,7 +62,7 @@ namespace vtkm
 namespace cont
 {
 
-struct VTKM_ALWAYS_EXPORT StorageTagVirtual
+struct VTKM_ALWAYS_EXPORT VTKM_DEPRECATED(1.6) StorageTagVirtual
 {
 };
 
@@ -256,6 +260,7 @@ private:
 
 } // namespace detail
 
+VTKM_DEPRECATED_SUPPRESS_BEGIN
 template <typename T>
 class VTKM_ALWAYS_EXPORT Storage<T, vtkm::cont::StorageTagVirtual>
 {
@@ -315,6 +320,7 @@ private:
   {
   }
 };
+VTKM_DEPRECATED_SUPPRESS_END
 
 } // namespace internal
 }

vtkm/cont/StorageVirtual.hxx

@@ -235,6 +235,7 @@ void StorageVirtualImpl<T, S>::TransferPortalForOutput(
 }
 } // namespace detail
 
+VTKM_DEPRECATED_SUPPRESS_BEGIN
 template <typename T>
 void Storage<T, vtkm::cont::StorageTagVirtual>::Allocate(vtkm::Id numberOfValues)
 {
@@ -433,6 +434,7 @@ struct ArrayTransfer<T, vtkm::cont::StorageTagVirtual, Device> : detail::ArrayTr
     return this->Superclass::PrepareForInPlace(Device());
   }
 };
+VTKM_DEPRECATED_SUPPRESS_END
 }
 }
 } // namespace vtkm::cont::internal

vtkm/cont/VariantArrayHandle.h

@@ -17,7 +17,6 @@
 
 #include <vtkm/cont/ArrayHandleMultiplexer.h>
 #include <vtkm/cont/ArrayHandleTransform.h>
-#include <vtkm/cont/ArrayHandleVirtual.h>
 #include <vtkm/cont/CastAndCall.h>
 #include <vtkm/cont/DefaultTypes.h>
 #include <vtkm/cont/ErrorBadType.h>
@@ -26,16 +25,22 @@
 #include <vtkm/cont/UncertainArrayHandle.h>
 #include <vtkm/cont/UnknownArrayHandle.h>