From: Nabil Ghodbane Date: Thu, 16 Sep 2021 11:39:19 +0000 (+0200) Subject: spns #26344 Patch for VTK to fix delegateToVtk option of SMESH - add patch X-Git-Tag: V9_8_0~96 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8d2abb1d94c49135eefb92402aa1699623444e2d;p=tools%2Fsat_salome.git spns #26344 Patch for VTK to fix delegateToVtk option of SMESH - add patch --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 3dfeaa5..b37d515 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -199,6 +199,8 @@ __overwrite__ : 'paraview.0008-ParaView_coincident_rendering.patch', 'paraview.0017-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } { @@ -216,6 +218,8 @@ __overwrite__ : 'paraview.0008-ParaView_coincident_rendering.patch', 'paraview.0017-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } { diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 70f4d37..287f291 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -111,7 +111,8 @@ version_5_9_0 : 'paraview.0011-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch' 'paraview-5.9.0-gcc.11.0.patch', - 'paraview.0018-spns-26351-autoconvert.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } @@ -129,7 +130,8 @@ version_5_9_0_int32 : 'paraview.0008-ParaView_coincident_rendering.patch', 'paraview.0011-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch', - 'paraview.0018-spns-26351-autoconvert.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } @@ -160,7 +162,8 @@ version_5_9_0_win : 'paraview.1001-ParaView_windows_catalyst_cmake.patch', 'paraview.0008-ParaView_coincident_rendering.patch', 'paraview.0011-ParaView_protobuf_crash.patch', - 'paraview.0018-spns-26351-autoconvert.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } @@ -191,7 +194,8 @@ version_5_9_0_win_int32 : 'paraview.1001-ParaView_windows_catalyst_cmake.patch', 'paraview.0008-ParaView_coincident_rendering.patch', 'paraview.0011-ParaView_protobuf_crash.patch', - 'paraview.0018-spns-26351-autoconvert.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } @@ -210,7 +214,8 @@ version_5_9_0_MPI : 'paraview.0011-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch', 'paraview.0017-VTK-openMPI-if-devtoolset.patch', - 'paraview.0018-spns-26351-autoconvert.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } @@ -229,7 +234,8 @@ version_5_9_0_MPI_int32 : 'paraview.0011-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch', 'paraview.0017-VTK-openMPI-if-devtoolset.patch', - 'paraview.0018-spns-26351-autoconvert.patch' + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] } diff --git a/products/patches/paraview.0019-VTK-OpenMP.patch b/products/patches/paraview.0019-VTK-OpenMP.patch new file mode 100644 index 0000000..41f72a2 --- /dev/null +++ b/products/patches/paraview.0019-VTK-OpenMP.patch @@ -0,0 +1,75 @@ +diff -Naur ParaView-5.9.0_ref/VTK/Filters/Geometry/vtkGeometryFilter.cxx ParaView-5.9.0/VTK/Filters/Geometry/vtkGeometryFilter.cxx +--- ParaView-5.9.0_ref/VTK/Filters/Geometry/vtkGeometryFilter.cxx 2021-09-16 13:17:47.022010882 +0200 ++++ ParaView-5.9.0/VTK/Filters/Geometry/vtkGeometryFilter.cxx 2021-09-16 13:21:51.054384099 +0200 +@@ -448,6 +448,71 @@ + this->ICellIds.TakeReference(vtkIdList::New()); + this->Coords.TakeReference(vtkPoints::New()); + } ++ ++ LocalDataType(const LocalDataType& other) ++ { ++ this->ThreadId = other.ThreadId; ++ ++ this->Verts = other.Verts; ++ this->Lines = other.Lines; ++ this->Polys = other.Polys; ++ this->Strips = other.Strips; ++ ++ this->VertsConnOffset = other.VertsConnOffset; ++ this->VertsOffset = other.VertsOffset; ++ this->LinesConnOffset = other.LinesConnOffset; ++ this->LinesOffset = other.LinesOffset; ++ this->PolysConnOffset = other.PolysConnOffset; ++ this->PolysOffset = other.PolysOffset; ++ this->StripsConnOffset = other.StripsConnOffset; ++ this->StripsOffset = other.StripsOffset; ++ ++ this->PointMap = other.PointMap; ++ // These are here to have a different allocation for each threads ++ this->Cell.TakeReference(vtkGenericCell::New()); ++ this->CellIds.TakeReference(vtkIdList::New()); ++ this->IPts.TakeReference(vtkIdList::New()); ++ this->ICellIds.TakeReference(vtkIdList::New()); ++ this->Coords.TakeReference(vtkPoints::New()); ++ } ++ ++ LocalDataType& operator=(const LocalDataType& other) ++ { ++ if (this != &other) ++ { ++ LocalDataType tmp = LocalDataType(other); ++ this->Swap(tmp); ++ } ++ return *this; ++ } ++ ++ void Swap(LocalDataType& other) ++ { ++ using std::swap; // the compiler will use custom swap for members if it exists ++ ++ swap(this->Verts, other.Verts); ++ swap(this->Lines, other.Lines); ++ swap(this->Polys, other.Polys); ++ swap(this->Strips, other.Strips); ++ ++ swap(this->VertsConnOffset, other.VertsConnOffset); ++ swap(this->VertsOffset, other.VertsOffset); ++ swap(this->LinesConnOffset, other.LinesConnOffset); ++ swap(this->LinesOffset, other.LinesOffset); ++ swap(this->PolysConnOffset, other.PolysConnOffset); ++ swap(this->PolysOffset, other.PolysOffset); ++ swap(this->StripsConnOffset, other.StripsConnOffset); ++ swap(this->StripsOffset, other.StripsOffset); ++ ++ swap(this->PointMap, other.PointMap); ++ swap(this->Cell, other.Cell); ++ swap(this->CellIds, other.CellIds); ++ swap(this->IPts, other.IPts); ++ swap(this->ICellIds, other.ICellIds); ++ swap(this->Coords, other.Coords); ++ } ++ ++ + + void SetPointMap(vtkIdType* ptMap) + {