From 544a078cdb0312959dc8b2af37307b2add67375a Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Wed, 20 May 2020 12:58:24 -0600 Subject: [PATCH] Remove use of deprecated policies in examples This means that the filters in the examples will no longer properly support the policies handed to them, but that is the direction we are headed as the policies are now deprecated. --- .../multi_backend/MultiDeviceGradient.hxx | 10 +++------- .../redistribute_points/RedistributePoints.h | 20 ++++++------------- vtkm/filter/PolicyBase.h | 18 +++++++++++++++++ 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/examples/multi_backend/MultiDeviceGradient.hxx b/examples/multi_backend/MultiDeviceGradient.hxx index b15369fbc..f4010da4e 100644 --- a/examples/multi_backend/MultiDeviceGradient.hxx +++ b/examples/multi_backend/MultiDeviceGradient.hxx @@ -189,7 +189,7 @@ VTKM_CONT MultiDeviceGradient::~MultiDeviceGradient() template inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForExecution( const vtkm::cont::PartitionedDataSet& pds, - const vtkm::filter::PolicyBase& policy) + const vtkm::filter::PolicyBase&) { //Step 1. Say that we have no more to submit for this PartitionedDataSet //This is needed to happen for each execute as we want to support @@ -219,9 +219,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForE [=]() { vtkm::filter::Gradient perThreadGrad = gradient; - VTKM_DEPRECATED_SUPPRESS_BEGIN - vtkm::cont::DataSet result = perThreadGrad.Execute(input, policy); - VTKM_DEPRECATED_SUPPRESS_END + vtkm::cont::DataSet result = perThreadGrad.Execute(input); outPtr->ReplacePartition(0, result); }); this->Queue.waitForAllTasksToComplete(); @@ -240,9 +238,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForE [=]() { vtkm::filter::Gradient perThreadGrad = gradient; - VTKM_DEPRECATED_SUPPRESS_BEGIN - vtkm::cont::DataSet result = perThreadGrad.Execute(input, policy); - VTKM_DEPRECATED_SUPPRESS_END + vtkm::cont::DataSet result = perThreadGrad.Execute(input); outPtr->ReplacePartition(index, result); }); index++; diff --git a/examples/redistribute_points/RedistributePoints.h b/examples/redistribute_points/RedistributePoints.h index c8175582c..447c4a1b2 100644 --- a/examples/redistribute_points/RedistributePoints.h +++ b/examples/redistribute_points/RedistributePoints.h @@ -38,11 +38,10 @@ static vtkmdiy::ContinuousBounds convert(const vtkm::Bounds& bds) } -template +template class Redistributor { const vtkmdiy::RegularDecomposer& Decomposer; - const vtkm::filter::PolicyBase& Policy; const FilterType& Filter; vtkm::cont::DataSet Extract(const vtkm::cont::DataSet& input, @@ -54,9 +53,7 @@ class Redistributor vtkm::filter::ExtractPoints extractor; extractor.SetCompactPoints(true); extractor.SetImplicitFunction(vtkm::cont::make_ImplicitFunctionHandle(box)); - VTKM_DEPRECATED_SUPPRESS_BEGIN - return extractor.Execute(input, this->Policy); - VTKM_DEPRECATED_SUPPRESS_END + return extractor.Execute(input); } class ConcatenateFields @@ -123,10 +120,8 @@ class Redistributor public: Redistributor(const vtkmdiy::RegularDecomposer& decomposer, - const vtkm::filter::PolicyBase& policy, const FilterType& filter) : Decomposer(decomposer) - , Policy(policy) , Filter(filter) { } @@ -145,9 +140,7 @@ public: this->Decomposer.fill_bounds(bds, target.gid); auto extractedDS = this->Extract(*block, bds); - VTKM_DEPRECATED_SUPPRESS_BEGIN - rp.enqueue(target, vtkm::filter::MakeSerializableDataSet(extractedDS, DerivedPolicy{})); - VTKM_DEPRECATED_SUPPRESS_END + rp.enqueue(target, vtkm::filter::MakeSerializableDataSet(extractedDS, this->Filter)); } // clear our dataset. *block = vtkm::cont::DataSet(); @@ -162,7 +155,7 @@ public: auto target = rp.in_link().target(cc); if (rp.incoming(target.gid).size() > 0) { - auto sds = vtkm::filter::MakeSerializableDataSet(DerivedPolicy{}, this->Filter); + auto sds = vtkm::filter::MakeSerializableDataSet(this->Filter); rp.dequeue(target.gid, sds); receives.push_back(sds.DataSet); numValues += receives.back().GetCoordinateSystem(0).GetNumberOfPoints(); @@ -219,7 +212,7 @@ public: template inline VTKM_CONT vtkm::cont::PartitionedDataSet RedistributePoints::PrepareForExecution( const vtkm::cont::PartitionedDataSet& input, - const vtkm::filter::PolicyBase& policy) + const vtkm::filter::PolicyBase&) { auto comm = vtkm::cont::EnvironmentTracker::GetCommunicator(); @@ -244,8 +237,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet RedistributePoints::PrepareForEx *ds = input.GetPartition(lid); }); - internal::Redistributor redistributor( - decomposer, policy, *this); + internal::Redistributor redistributor(decomposer, *this); vtkmdiy::all_to_all(master, assigner, redistributor, /*k=*/2); vtkm::cont::PartitionedDataSet result; diff --git a/vtkm/filter/PolicyBase.h b/vtkm/filter/PolicyBase.h index 6c703f7e3..641a98a82 100644 --- a/vtkm/filter/PolicyBase.h +++ b/vtkm/filter/PolicyBase.h @@ -396,6 +396,14 @@ VTKM_CONT return {}; } +template +VTKM_CONT + vtkm::cont::SerializableDataSet + MakeSerializableDataSet(const vtkm::filter::Filter&) +{ + return {}; +} + template VTKM_DEPRECATED(1.6, "MakeSerializableDataSet now takes the filter as an argument.") VTKM_CONT vtkm::cont::SerializableDataSet< @@ -424,6 +432,16 @@ VTKM_CONT dataset }; } + +template +VTKM_CONT + vtkm::cont::SerializableDataSet + MakeSerializableDataSet(const vtkm::cont::DataSet& dataset, + const vtkm::filter::Filter&) +{ + return vtkm::cont::SerializableDataSet{ dataset }; +} } } // vtkm::filter