Merge topic 'texturemap2sphere-mpi-pvrelease' into paraview/release

d9b3f5354d Adding of a test for TextureMap2Sphere + seamlessU
db8657afaa Unblocking pipeline of vtkPTextureMapToSphere

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6431

Filters/Parallel/Testing/CMakeLists.txt

@@ -3,7 +3,8 @@ vtk_module_test_data(
   Data/SampleStructGrid.vtk
   Data/ironProt.vtk
   Data/periodicPiece.vtu
-  Data/tetraMesh.vtk)
+  Data/tetraMesh.vtk
+  Data/two_vtk_logos_stacked.png)
 
 add_subdirectory(Cxx)
 

Filters/Parallel/Testing/Cxx/CMakeLists.txt

@@ -9,6 +9,7 @@ if (TARGET VTK::ParallelMPI)
     TESTING_DATA
     DistributedData.cxx
     DistributedDataRenderPass.cxx
+    PTextureMapToSphere.cxx
     TestPExtractDataArraysOverTime.cxx,NO_VALID
     TransmitImageData.cxx
     TransmitImageDataRenderPass.cxx

Filters/Parallel/Testing/Cxx/PTextureMapToSphere.cxx

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    PTextureMapToSphere.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+
+// Tests PTextureMapToSphere.
+
+/*
+** This test only builds if MPI is in use
+*/
+#include "vtkActor.h"
+#include "vtkCompositeRenderManager.h"
+#include "vtkMPICommunicator.h"
+#include "vtkMPIController.h"
+#include "vtkNew.h"
+#include "vtkObjectFactory.h"
+#include "vtkPNGReader.h"
+#include "vtkPTextureMapToSphere.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkProcess.h"
+#include "vtkRegressionTestImage.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderer.h"
+#include "vtkSphereSource.h"
+#include "vtkSuperquadricSource.h"
+#include "vtkTestUtilities.h"
+#include "vtkTesting.h"
+#include "vtkTexture.h"
+#include <vtk_mpi.h>
+
+namespace
+{
+
+class MyProcess : public vtkProcess
+{
+public:
+  static MyProcess* New();
+
+  virtual void Execute();
+
+  void SetArgs(int anArgc, char* anArgv[]);
+
+protected:
+  MyProcess();
+
+  int Argc;
+  char** Argv;
+};
+
+vtkStandardNewMacro(MyProcess);
+
+MyProcess::MyProcess()
+{
+  this->Argc = 0;
+  this->Argv = nullptr;
+}
+
+void MyProcess::SetArgs(int anArgc, char* anArgv[])
+{
+  this->Argc = anArgc;
+  this->Argv = anArgv;
+}
+
+void MyProcess::Execute()
+{
+  this->ReturnValue = 1;
+  int numProcs = this->Controller->GetNumberOfProcesses();
+  int me = this->Controller->GetLocalProcessId();
+  cout << "Nb process found: " << numProcs << endl;
+
+  vtkNew<vtkCompositeRenderManager> prm;
+  vtkNew<vtkSuperquadricSource> superquadric;
+  vtkNew<vtkSphereSource> sphere;
+  vtkNew<vtkPTextureMapToSphere> textureMap;
+  vtkNew<vtkPolyDataMapper> mapper;
+
+  superquadric->ToroidalOff();
+  sphere->SetThetaResolution(16);
+  sphere->SetPhiResolution(16);
+
+  // Testing with superquadric which produces processes with no input data
+  textureMap->SetInputConnection(superquadric->GetOutputPort());
+
+  mapper->SetInputConnection(textureMap->GetOutputPort());
+  mapper->SetScalarRange(0, numProcs);
+  mapper->SetPiece(me);
+  mapper->SetSeamlessU(true);
+  mapper->SetNumberOfPieces(numProcs);
+  mapper->Update();
+
+  // Actually testing in parallel
+  textureMap->SetInputConnection(sphere->GetOutputPort());
+  mapper->Update();
+
+  char* fname =
+    vtkTestUtilities::ExpandDataFileName(this->Argc, this->Argv, "Data/two_vtk_logos_stacked.png");
+
+  vtkNew<vtkPNGReader> PNGReader;
+  PNGReader->SetFileName(fname);
+  PNGReader->Update();
+
+  vtkNew<vtkTexture> texture;
+  texture->SetInputConnection(PNGReader->GetOutputPort());
+  texture->InterpolateOn();
+
+  vtkNew<vtkActor> actor;
+  actor->SetTexture(texture);
+  actor->SetMapper(mapper);
+
+  vtkRenderer* renderer = prm->MakeRenderer();
+  renderer->AddActor(actor);
+  renderer->SetBackground(0.5, 0.7, 0.7);
+
+  vtkRenderWindow* renWin = prm->MakeRenderWindow();
+  renWin->AddRenderer(renderer);
+  renWin->SetSize(400, 400);
+
+  prm->SetRenderWindow(renWin);
+  prm->SetController(this->Controller);
+
+  prm->InitializeOffScreen(); // Mesa GL only
+
+  constexpr int MY_RETURN_VALUE_MESSAGE = 21545;
+
+  if (me == 0)
+  {
+    renWin->Render();
+    this->ReturnValue = vtkRegressionTester::Test(this->Argc, this->Argv, renWin, 10);
+
+    for (int i = 1; i < numProcs; ++i)
+    {
+      this->Controller->Send(&this->ReturnValue, 1, i, MY_RETURN_VALUE_MESSAGE);
+    }
+    prm->StopServices();
+  }
+  else
+  {
+    prm->StartServices();
+    this->Controller->Receive(&this->ReturnValue, 1, 0, MY_RETURN_VALUE_MESSAGE);
+  }
+  renderer->Delete();
+  renWin->Delete();
+}
+
+}
+
+int PTextureMapToSphere(int argc, char* argv[])
+{
+  // This is here to avoid false leak messages from vtkDebugLeaks when
+  // using mpich. It appears that the root process which spawns all the
+  // main processes waits in MPI_Init() and calls exit() when
+  // the others are done, causing apparent memory leaks for any objects
+  // created before MPI_Init().
+  MPI_Init(&argc, &argv);
+
+  // Note that this will create a vtkMPIController if MPI
+  // is configured, vtkThreadedController otherwise.
+  vtkNew<vtkMPIController> contr;
+  contr->Initialize(&argc, &argv, 1);
+
+  int retVal = 1;
+
+  vtkMultiProcessController::SetGlobalController(contr);
+
+  int me = contr->GetLocalProcessId();
+
+  if (!contr->IsA("vtkMPIController"))
+  {
+    if (me == 0)
+    {
+      cout << "DistributedData test requires MPI" << endl;
+    }
+    return retVal; // is this the right error val?   TODO
+  }
+
+  vtkNew<MyProcess> p;
+  p->SetArgs(argc, argv);
+  contr->SetSingleProcessObject(p);
+  contr->SingleMethodExecute();
+
+  retVal = p->GetReturnValue();
+
+  contr->Finalize();
+
+  return !retVal;
+}

Filters/Parallel/Testing/Data/Baseline/PTextureMapToSphere.png.sha512

+e91299cb1f859e915f4c97f93a87c85dba2b0e51b3c88804726b266383532eecd4aa450508a398ddf3a4f062be03234e500a129c55930dcf5dd5a42b1a593622

Filters/Parallel/vtk.module

@@ -26,6 +26,7 @@ PRIVATE_DEPENDS
 TEST_DEPENDS
   VTK::FiltersFlowPaths
   VTK::FiltersParallelImaging
+  VTK::IOImage
   VTK::IOLegacy
   VTK::IOParallelExodus
   VTK::IOXML

Filters/Texture/vtkTextureMapToSphere.cxx

@@ -46,6 +46,12 @@ int vtkTextureMapToSphere::RequestData(vtkInformation* vtkNotUsed(request),
   vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT()));
   vtkDataSet* output = vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()));
 
+  if (!input || !output)
+  {
+    vtkErrorMacro(<< "Invalid input or output");
+    return 1;
+  }
+
   vtkFloatArray* newTCoords;
   vtkIdType numPts = input->GetNumberOfPoints();
   vtkIdType ptId;
@@ -59,7 +65,8 @@ int vtkTextureMapToSphere::RequestData(vtkInformation* vtkNotUsed(request),
 
   if (numPts < 1)
   {
-    vtkErrorMacro(<< "Can't generate texture coordinates without points");
+    // Needs to be called in case MPI is in use
+    this->ComputeCenter(input);
     return 1;
   }