mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
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.
This commit is contained in:
parent
06f5119c29
commit
544a078cdb
@ -189,7 +189,7 @@ VTKM_CONT MultiDeviceGradient::~MultiDeviceGradient()
|
|||||||
template <typename DerivedPolicy>
|
template <typename DerivedPolicy>
|
||||||
inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForExecution(
|
inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForExecution(
|
||||||
const vtkm::cont::PartitionedDataSet& pds,
|
const vtkm::cont::PartitionedDataSet& pds,
|
||||||
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
|
const vtkm::filter::PolicyBase<DerivedPolicy>&)
|
||||||
{
|
{
|
||||||
//Step 1. Say that we have no more to submit for this PartitionedDataSet
|
//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
|
//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::filter::Gradient perThreadGrad = gradient;
|
||||||
|
|
||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
vtkm::cont::DataSet result = perThreadGrad.Execute(input);
|
||||||
vtkm::cont::DataSet result = perThreadGrad.Execute(input, policy);
|
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
|
||||||
outPtr->ReplacePartition(0, result);
|
outPtr->ReplacePartition(0, result);
|
||||||
});
|
});
|
||||||
this->Queue.waitForAllTasksToComplete();
|
this->Queue.waitForAllTasksToComplete();
|
||||||
@ -240,9 +238,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForE
|
|||||||
[=]() {
|
[=]() {
|
||||||
vtkm::filter::Gradient perThreadGrad = gradient;
|
vtkm::filter::Gradient perThreadGrad = gradient;
|
||||||
|
|
||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
vtkm::cont::DataSet result = perThreadGrad.Execute(input);
|
||||||
vtkm::cont::DataSet result = perThreadGrad.Execute(input, policy);
|
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
|
||||||
outPtr->ReplacePartition(index, result);
|
outPtr->ReplacePartition(index, result);
|
||||||
});
|
});
|
||||||
index++;
|
index++;
|
||||||
|
@ -38,11 +38,10 @@ static vtkmdiy::ContinuousBounds convert(const vtkm::Bounds& bds)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
template <typename DerivedPolicy, typename FilterType>
|
template <typename FilterType>
|
||||||
class Redistributor
|
class Redistributor
|
||||||
{
|
{
|
||||||
const vtkmdiy::RegularDecomposer<vtkmdiy::ContinuousBounds>& Decomposer;
|
const vtkmdiy::RegularDecomposer<vtkmdiy::ContinuousBounds>& Decomposer;
|
||||||
const vtkm::filter::PolicyBase<DerivedPolicy>& Policy;
|
|
||||||
const FilterType& Filter;
|
const FilterType& Filter;
|
||||||
|
|
||||||
vtkm::cont::DataSet Extract(const vtkm::cont::DataSet& input,
|
vtkm::cont::DataSet Extract(const vtkm::cont::DataSet& input,
|
||||||
@ -54,9 +53,7 @@ class Redistributor
|
|||||||
vtkm::filter::ExtractPoints extractor;
|
vtkm::filter::ExtractPoints extractor;
|
||||||
extractor.SetCompactPoints(true);
|
extractor.SetCompactPoints(true);
|
||||||
extractor.SetImplicitFunction(vtkm::cont::make_ImplicitFunctionHandle(box));
|
extractor.SetImplicitFunction(vtkm::cont::make_ImplicitFunctionHandle(box));
|
||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
return extractor.Execute(input);
|
||||||
return extractor.Execute(input, this->Policy);
|
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class ConcatenateFields
|
class ConcatenateFields
|
||||||
@ -123,10 +120,8 @@ class Redistributor
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
Redistributor(const vtkmdiy::RegularDecomposer<vtkmdiy::ContinuousBounds>& decomposer,
|
Redistributor(const vtkmdiy::RegularDecomposer<vtkmdiy::ContinuousBounds>& decomposer,
|
||||||
const vtkm::filter::PolicyBase<DerivedPolicy>& policy,
|
|
||||||
const FilterType& filter)
|
const FilterType& filter)
|
||||||
: Decomposer(decomposer)
|
: Decomposer(decomposer)
|
||||||
, Policy(policy)
|
|
||||||
, Filter(filter)
|
, Filter(filter)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@ -145,9 +140,7 @@ public:
|
|||||||
this->Decomposer.fill_bounds(bds, target.gid);
|
this->Decomposer.fill_bounds(bds, target.gid);
|
||||||
|
|
||||||
auto extractedDS = this->Extract(*block, bds);
|
auto extractedDS = this->Extract(*block, bds);
|
||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
rp.enqueue(target, vtkm::filter::MakeSerializableDataSet(extractedDS, this->Filter));
|
||||||
rp.enqueue(target, vtkm::filter::MakeSerializableDataSet(extractedDS, DerivedPolicy{}));
|
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
|
||||||
}
|
}
|
||||||
// clear our dataset.
|
// clear our dataset.
|
||||||
*block = vtkm::cont::DataSet();
|
*block = vtkm::cont::DataSet();
|
||||||
@ -162,7 +155,7 @@ public:
|
|||||||
auto target = rp.in_link().target(cc);
|
auto target = rp.in_link().target(cc);
|
||||||
if (rp.incoming(target.gid).size() > 0)
|
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);
|
rp.dequeue(target.gid, sds);
|
||||||
receives.push_back(sds.DataSet);
|
receives.push_back(sds.DataSet);
|
||||||
numValues += receives.back().GetCoordinateSystem(0).GetNumberOfPoints();
|
numValues += receives.back().GetCoordinateSystem(0).GetNumberOfPoints();
|
||||||
@ -219,7 +212,7 @@ public:
|
|||||||
template <typename DerivedPolicy>
|
template <typename DerivedPolicy>
|
||||||
inline VTKM_CONT vtkm::cont::PartitionedDataSet RedistributePoints::PrepareForExecution(
|
inline VTKM_CONT vtkm::cont::PartitionedDataSet RedistributePoints::PrepareForExecution(
|
||||||
const vtkm::cont::PartitionedDataSet& input,
|
const vtkm::cont::PartitionedDataSet& input,
|
||||||
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
|
const vtkm::filter::PolicyBase<DerivedPolicy>&)
|
||||||
{
|
{
|
||||||
auto comm = vtkm::cont::EnvironmentTracker::GetCommunicator();
|
auto comm = vtkm::cont::EnvironmentTracker::GetCommunicator();
|
||||||
|
|
||||||
@ -244,8 +237,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet RedistributePoints::PrepareForEx
|
|||||||
*ds = input.GetPartition(lid);
|
*ds = input.GetPartition(lid);
|
||||||
});
|
});
|
||||||
|
|
||||||
internal::Redistributor<DerivedPolicy, RedistributePoints> redistributor(
|
internal::Redistributor<RedistributePoints> redistributor(decomposer, *this);
|
||||||
decomposer, policy, *this);
|
|
||||||
vtkmdiy::all_to_all(master, assigner, redistributor, /*k=*/2);
|
vtkmdiy::all_to_all(master, assigner, redistributor, /*k=*/2);
|
||||||
|
|
||||||
vtkm::cont::PartitionedDataSet result;
|
vtkm::cont::PartitionedDataSet result;
|
||||||
|
@ -396,6 +396,14 @@ VTKM_CONT
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename DerivedFilter>
|
||||||
|
VTKM_CONT
|
||||||
|
vtkm::cont::SerializableDataSet<VTKM_DEFAULT_TYPE_LIST, typename DerivedFilter::SupportedCellSets>
|
||||||
|
MakeSerializableDataSet(const vtkm::filter::Filter<DerivedFilter>&)
|
||||||
|
{
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
template <typename DerivedPolicy>
|
template <typename DerivedPolicy>
|
||||||
VTKM_DEPRECATED(1.6, "MakeSerializableDataSet now takes the filter as an argument.")
|
VTKM_DEPRECATED(1.6, "MakeSerializableDataSet now takes the filter as an argument.")
|
||||||
VTKM_CONT vtkm::cont::SerializableDataSet<
|
VTKM_CONT vtkm::cont::SerializableDataSet<
|
||||||
@ -424,6 +432,16 @@ VTKM_CONT
|
|||||||
dataset
|
dataset
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename DerivedFilter>
|
||||||
|
VTKM_CONT
|
||||||
|
vtkm::cont::SerializableDataSet<VTKM_DEFAULT_TYPE_LIST, typename DerivedFilter::SupportedCellSets>
|
||||||
|
MakeSerializableDataSet(const vtkm::cont::DataSet& dataset,
|
||||||
|
const vtkm::filter::Filter<DerivedFilter>&)
|
||||||
|
{
|
||||||
|
return vtkm::cont::SerializableDataSet<VTKM_DEFAULT_TYPE_LIST,
|
||||||
|
typename DerivedFilter::SupportedCellSets>{ dataset };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} // vtkm::filter
|
} // vtkm::filter
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user