Merge topic 'roll-back-duplicate-output-stats'

ba3ff977

 Rollback removing of duplicate outputs in Statistics filters
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen <cory.quammen@kitware.com>
Merge-request: !9177

Filters/ParallelStatistics/Testing/Cxx/TestPCorrelativeStatistics.cxx

@@ -142,29 +142,13 @@ int TestPCorrelativeStatistics(int argc, char* argv[])
   auto outRefModel = vtkMultiBlockDataSet::SafeDownCast(refStats->GetOutputDataObject(1));
   auto outRefTests = vtkTable::SafeDownCast(refStats->GetOutputDataObject(2));
 
-  // Testing measured statistics. Rank other than 0 should not have any data.
-  if (myrank == 0)
-  {
-    auto outPrimaryTable = vtkTable::SafeDownCast(outModel->GetBlock(0));
-    auto outRefPrimaryTable = vtkTable::SafeDownCast(outRefModel->GetBlock(0));
+  auto outPrimaryTable = vtkTable::SafeDownCast(outModel->GetBlock(0));
+  auto outRefPrimaryTable = vtkTable::SafeDownCast(outRefModel->GetBlock(0));
 
-    if (!TablesAreSame(outPrimaryTable, outRefPrimaryTable))
-    {
-      vtkLog(ERROR, "Measured statistics mismatch between single-process and multi-process.");
-      retVal = EXIT_FAILURE;
-    }
-  }
-  else
+  if (!TablesAreSame(outPrimaryTable, outRefPrimaryTable))
   {
-    std::vector<vtkTable*> outputs = vtkCompositeDataSet::GetDataSets<vtkTable>(outModel);
-    for (vtkTable* output : outputs)
-    {
-      if (output->GetNumberOfColumns())
-      {
-        vtkLog(ERROR, "Output other than rank 0 has a non-empty output model.");
-        retVal = EXIT_FAILURE;
-      }
-    }
+    vtkLog(ERROR, "Measured statistics mismatch between single-process and multi-process.");
+    retVal = EXIT_FAILURE;
   }
 
   // Testing outData.

Filters/ParallelStatistics/Testing/Cxx/TestPDescriptiveStatistics.cxx

@@ -148,29 +148,13 @@ int TestPDescriptiveStatistics(int argc, char* argv[])
 
   vtkLog(INFO, "Testing Model");
 
-  // Testing measured statistics. Rank other than 0 should not have any data.
-  if (myrank == 0)
-  {
-    auto outPrimaryTable = vtkTable::SafeDownCast(outModel->GetBlock(0));
-    auto outRefPrimaryTable = vtkTable::SafeDownCast(outRefModel->GetBlock(0));
+  auto outPrimaryTable = vtkTable::SafeDownCast(outModel->GetBlock(0));
+  auto outRefPrimaryTable = vtkTable::SafeDownCast(outRefModel->GetBlock(0));
 
-    if (!TablesAreSame(outPrimaryTable, outRefPrimaryTable))
-    {
-      vtkLog(ERROR, "Measured statistics mismatch between single-process and multi-process.");
-      retVal = EXIT_FAILURE;
-    }
-  }
-  else
+  if (!TablesAreSame(outPrimaryTable, outRefPrimaryTable))
   {
-    std::vector<vtkTable*> outputs = vtkCompositeDataSet::GetDataSets<vtkTable>(outModel);
-    for (vtkTable* output : outputs)
-    {
-      if (output->GetNumberOfColumns())
-      {
-        vtkLog(ERROR, "Output other than rank 0 has a non-empty output model.");
-        retVal = EXIT_FAILURE;
-      }
-    }
+    vtkLog(ERROR, "Measured statistics mismatch between single-process and multi-process.");
+    retVal = EXIT_FAILURE;
   }
 
   vtkLog(INFO, "Testing Assess");

Filters/ParallelStatistics/vtkPCorrelativeStatistics.cxx

@@ -179,22 +179,3 @@ void vtkPCorrelativeStatistics::Test(
 
   this->Superclass::Test(inData, inMeta, outMeta);
 }
-
-//------------------------------------------------------------------------------
-int vtkPCorrelativeStatistics::RequestData(
-  vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector)
-{
-  int retVal = this->Superclass::RequestData(request, inputVector, outputVector);
-
-  if (this->Controller && this->Controller->GetLocalProcessId() != 0)
-  {
-    vtkMultiBlockDataSet* outModel = vtkMultiBlockDataSet::GetData(outputVector, OUTPUT_MODEL);
-    std::vector<vtkDataObject*> outputs = vtkCompositeDataSet::GetDataSets<vtkDataObject>(outModel);
-    for (vtkDataObject* output : outputs)
-    {
-      output->Initialize();
-    }
-  }
-
-  return retVal;
-}

Filters/ParallelStatistics/vtkPCorrelativeStatistics.h

@@ -70,8 +70,6 @@ protected:
   vtkPCorrelativeStatistics();
   ~vtkPCorrelativeStatistics() override;
 
-  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
-
   vtkMultiProcessController* Controller;
 
 private:

Filters/ParallelStatistics/vtkPDescriptiveStatistics.cxx

@@ -187,22 +187,3 @@ void vtkPDescriptiveStatistics::Learn(
   }
   delete[] n_g;
 }
-
-//------------------------------------------------------------------------------
-int vtkPDescriptiveStatistics::RequestData(
-  vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector)
-{
-  int retVal = this->Superclass::RequestData(request, inputVector, outputVector);
-
-  if (this->Controller && this->Controller->GetLocalProcessId() != 0)
-  {
-    vtkMultiBlockDataSet* outModel = vtkMultiBlockDataSet::GetData(outputVector, OUTPUT_MODEL);
-    std::vector<vtkDataObject*> outputs = vtkCompositeDataSet::GetDataSets<vtkDataObject>(outModel);
-    for (vtkDataObject* output : outputs)
-    {
-      output->Initialize();
-    }
-  }
-
-  return retVal;
-}

Filters/ParallelStatistics/vtkPDescriptiveStatistics.h

@@ -73,8 +73,6 @@ protected:
 
   vtkMultiProcessController* Controller;
 
-  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
-
 private:
   vtkPDescriptiveStatistics(const vtkPDescriptiveStatistics&) = delete;
   void operator=(const vtkPDescriptiveStatistics&) = delete;