Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup. remove prints.

Browse Source
This commit is contained in:
Dave Pugmire 2021-08-05 11:50:34 -04:00
parent 50a42a1447
commit 179643107b
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vtkm/filter/Filter.hxx
View File

@ -216,27 +216,7 @@ vtkm::cont::PartitionedDataSet CallPrepareForExecutionInternal(
vtkm::filter::DataSetQueue outputQueue;
vtkm::Id numThreads = self->DetermineNumberOfThreads(input);
std::cout << "nThreads= " << numThreads << std::endl;
#if 0
std::vector<std::thread> threads;
for (vtkm::Id i = 0; i < numThreads; i++)
{
//auto clone = self->Clone();
//auto filterClone = static_cast<Derived*>(clone.get());
std::thread t(RunFilter<Derived, DerivedPolicy>,
self,
policy,
std::ref(inputQueue),
std::ref(outputQueue));
threads.push_back(std::move(t));
}
for (auto& t : threads)
t.join();
output = outputQueue.Get();
#endif
#if 1
//Run 'numThreads' filters.
std::vector<std::future<void>> futures(static_cast<std::size_t>(numThreads));
for (std::size_t i = 0; i < static_cast<std::size_t>(numThreads); i++)
@ -255,7 +235,6 @@ vtkm::cont::PartitionedDataSet CallPrepareForExecutionInternal(
//Get results from the outputQueue.
output = outputQueue.Get();
#endif
}
else
{
@ -379,9 +358,6 @@ inline VTKM_CONT vtkm::Id Filter<Derived>::DetermineNumberOfThreads(
const bool runOnKokkos = tracker.CanRunOn(vtkm::cont::DeviceAdapterTagKokkos{});
const bool runOnOpenMP = tracker.CanRunOn(vtkm::cont::DeviceAdapterTagOpenMP{});
std::cout << "****************Run: " << runOnSerial << " " << runOnCuda << " " << runOnKokkos
<< " " << runOnOpenMP << std::endl;
if (runOnSerial)
availThreads = 1;
else if (runOnCuda)

9
vtkm/filter/testing/UnitTestMultiBlockFilter.cxx
View File

@ -45,14 +45,8 @@ void ValidateField(const ArrayType& truthField, const ArrayType& resultField)
const auto truthPortal = truthField.ReadPortal();
const auto resultPortal = resultField.ReadPortal();
for (vtkm::Id j = 0; j < numPts; j++)
{
auto diff = ValueDifference(truthPortal.Get(j), resultPortal.Get(j));
if (diff > tol)
std::cout << "****** error at j= " << j << " diff= " << diff << " nPts= " << numPts
<< std::endl;
VTKM_TEST_ASSERT(ValueDifference(truthPortal.Get(j), resultPortal.Get(j)) < tol,
"Wrong value in field");
}
}
void ValidateResults(const vtkm::cont::PartitionedDataSet& truth,
@ -67,9 +61,6 @@ void ValidateResults(const vtkm::cont::PartitionedDataSet& truth,
auto truthDS = truth.GetPartition(i);
auto resultDS = result.GetPartition(i);
std::cout << "Validate: " << truthDS.GetNumberOfPoints()
<< " :: " << resultDS.GetNumberOfPoints() << std::endl;
VTKM_TEST_ASSERT(truthDS.GetNumberOfPoints() == resultDS.GetNumberOfPoints(),
"Wrong number of points");
VTKM_TEST_ASSERT(truthDS.GetNumberOfCells() == resultDS.GetNumberOfCells(),