[arch-commits] Commit in paraview/trunk (PKGBUILD revert-smp-info.patch)
Bruno Pagani
archange at gemini.archlinux.org
Fri Jul 1 13:00:32 UTC 2022
Date: Friday, July 1, 2022 @ 13:00:31
Author: archange
Revision: 1243181
proj 9/gdal 3.5 rebuild
Also backport python 3.10 fixes (FS#74455, might also help for FS#73277)
And bytecompile python libs
Modified:
paraview/trunk/PKGBUILD
Deleted:
paraview/trunk/revert-smp-info.patch
-----------------------+
PKGBUILD | 24 +++++-
revert-smp-info.patch | 172 ------------------------------------------------
2 files changed, 20 insertions(+), 176 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-01 12:52:28 UTC (rev 1243180)
+++ PKGBUILD 2022-07-01 13:00:31 UTC (rev 1243181)
@@ -8,7 +8,7 @@
pkgname=${_pkg}
#-${_mpi}
pkgver=5.10.1
-pkgrel=8
+pkgrel=9
pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
arch=(x86_64)
url="https://www.paraview.org"
@@ -31,13 +31,19 @@
template.sh
vtkm-tbb-2021.patch::https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2509.patch
vtk-ffmpeg5.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8863.patch
- revert-smp-info.patch) # Derived from https://gitlab.kitware.com/paraview/paraview/-/merge_requests/5131
+ paraview-revert-smp-info.patch::https://gitlab.kitware.com/paraview/paraview/-/merge_requests/5131.patch
+ vtk-python3.10.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8738.patch
+ paraview-python3.10.patch::https://gitlab.kitware.com/paraview/paraview/-/merge_requests/5429.patch
+ vtk-exodus-netcdf4.9-compat.patch::https://github.com/sandialabs/seacas/commit/5e1b19181110c52b76d13e3f60da2c8cf678c941.patch)
sha256sums=('520e3cdfba4f8592be477314c2f6c37ec73fb1d5b25ac30bdbd1c5214758b9c2'
'd1cdb4a81db280d6b21bee3d9e5f8fc3a87f00a909d33850a1964c72091ec138'
'844d44a14817c656ba8d6998298785125a98f03f7b5ece58d966c226db1e0d83'
'37cff664c4eaacf44ecb995e62e9e54e54880bae0857d598c74660a2159ccb2e'
'955ef22d2541beb9935557ef09a802b6504855a350f27ff056734679da8f0281'
- 'fb7496032d3e9fc8575b533127b5d93c7a2d0a1a2c2abad859f4f40ea06e55c7')
+ '360cb70b9b9ba255caf8513467df54f2ad02fa006b399ed7524d7867247acc32'
+ 'dbc9a67caf548cf5afd571018d91aadcfcf78ddf8c66ac75b0772935e26ad29f'
+ 'fcc0d8c27276615d024767ec283baff70ab911028c4ee9ef4479ab45f8c950c8'
+ '1272fafccd3d9677f3fd9cc0a70e47a21f6ec86379765e25c6bccd9053875259')
prepare() {
# Specify python version in wrapper
@@ -54,7 +60,13 @@
# Fix build with FFmpeg 5
patch -p1 -d VTK < ../vtk-ffmpeg5.patch
# https://gitlab.kitware.com/paraview/paraview/-/issues/21323
- patch -p1 -R < ../revert-smp-info.patch
+ patch -p1 -R < ../paraview-revert-smp-info.patch || true
+ # Fix Python 3.10 compatibility https://gitlab.kitware.com/vtk/vtk/-/issues/18518
+ patch -p1 -d VTK < ../vtk-python3.10.patch || true
+ patch -p1 < ../paraview-python3.10.patch
+ # Fix build with netCDF 4.9
+ sed -i 's|1999-2020|1999-2021|' VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
+ patch -p5 -d VTK/ThirdParty/exodusII/vtkexodusII/ < ../vtk-exodus-netcdf4.9-compat.patch
}
build() {
@@ -109,4 +121,8 @@
mv "${pkgdir}"/{opt/paraview,usr}/share/icons
mv "${pkgdir}"/{opt/paraview,usr}/share/licenses
mv "${pkgdir}"/{opt/paraview,usr}/share/metainfo
+
+ # byte-compile python modules since the CMake build does not do it.
+ local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+ python -m compileall -o 0 -o 1 -o 2 --hardlink-dupes -s "${pkgdir}" "${pkgdir}"${site_packages/usr/opt/paraview}
}
Deleted: revert-smp-info.patch
===================================================================
--- revert-smp-info.patch 2022-07-01 12:52:28 UTC (rev 1243180)
+++ revert-smp-info.patch 2022-07-01 13:00:31 UTC (rev 1243181)
@@ -1,172 +0,0 @@
-From 2f378aea29c406a41d9cb4f8cda5c165efd969ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble at kitware.com>
-Date: Mon, 23 Aug 2021 10:41:48 +0200
-Subject: [PATCH] Add SMP backend information in about dialog
-
-Add in about dialog:
-- SMP Tools backend in use
-- SMP max number of thread
-
-Fix #20894
----
- .../release/dev/AddSMPInfoAboutDialog.md | 5 ++++
- Qt/Components/pqAboutDialog.cxx | 7 ++++++
- Remoting/Core/vtkPVServerInformation.cxx | 23 +++++++++++++++++++
- Remoting/Core/vtkPVServerInformation.h | 18 +++++++++++++++
- 4 files changed, 53 insertions(+)
- create mode 100644 Documentation/release/dev/AddSMPInfoAboutDialog.md
-
-diff --git a/Qt/Components/pqAboutDialog.cxx b/Qt/Components/pqAboutDialog.cxx
-index 623d1ceee8..2d0003da15 100644
---- a/Qt/Components/pqAboutDialog.cxx
-+++ b/Qt/Components/pqAboutDialog.cxx
-@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkPVServerInformation.h"
- #include "vtkProcessModule.h"
- #include "vtkRemotingCoreConfiguration.h"
-+#include "vtkSMPTools.h"
- #include "vtkSMProxyManager.h"
- #include "vtkSMSession.h"
- #include "vtkSMViewProxy.h"
-@@ -164,6 +165,9 @@ void pqAboutDialog::AddClientInformation()
- ::addItem(tree, "Test Directory", QString::fromStdString(pqConfig->testDirectory()));
- ::addItem(tree, "Data Directory", QString::fromStdString(pqConfig->dataDirectory()));
-
-+ ::addItem(tree, "SMP Backend", vtkSMPTools::GetBackend());
-+ ::addItem(tree, "SMP Max Number of Threads", vtkSMPTools::GetEstimatedNumberOfThreads());
-+
- // For local OpenGL info, we ask Qt, as that's more truthful anyways.
- QOpenGLContext* ctx = QOpenGLContext::currentContext();
- if (QOpenGLFunctions* f = ctx ? ctx->functions() : nullptr)
-@@ -226,6 +230,9 @@ void pqAboutDialog::AddServerInformation(pqServer* server, QTreeWidget* tree)
-
- ::addItem(tree, "vtkIdType size", QString("%1bits").arg(serverInfo->GetIdTypeSize()));
-
-+ ::addItem(tree, "SMP Backend", serverInfo->GetSMPBackendName().c_str());
-+ ::addItem(tree, "SMP Max Number of Threads", serverInfo->GetSMPMaxNumberOfThreads());
-+
- vtkSMSession* session = server->session();
- vtkNew<vtkPVPythonInformation> pythonInfo;
- session->GatherInformation(vtkPVSession::SERVERS, pythonInfo.GetPointer(), 0);
-diff --git a/Remoting/Core/vtkPVServerInformation.cxx b/Remoting/Core/vtkPVServerInformation.cxx
-index e7f4071a16..aa6c14d488 100644
---- a/Remoting/Core/vtkPVServerInformation.cxx
-+++ b/Remoting/Core/vtkPVServerInformation.cxx
-@@ -24,6 +24,7 @@
- #include "vtkPVSession.h"
- #include "vtkProcessModule.h"
- #include "vtkRemotingCoreConfiguration.h"
-+#include "vtkSMPTools.h"
- #if VTK_MODULE_ENABLE_ParaView_nvpipe
- #include <nvpipe.h>
- #endif
-@@ -97,6 +98,9 @@ vtkPVServerInformation::vtkPVServerInformation()
- this->IsInTileDisplay = false;
- this->IsInCave = false;
- this->TileDimensions[0] = this->TileDimensions[1] = 0;
-+
-+ this->SMPBackendName = vtkSMPTools::GetBackend() ? vtkSMPTools::GetBackend() : "";
-+ this->SMPMaxNumberOfThreads = vtkSMPTools::GetEstimatedNumberOfThreads();
- }
-
- //----------------------------------------------------------------------------
-@@ -121,6 +125,8 @@ void vtkPVServerInformation::PrintSelf(ostream& os, vtkIndent indent)
- os << indent << "IsInCave: " << this->IsInCave << endl;
- os << indent << "TileDimensions: " << this->TileDimensions[0] << ", " << this->TileDimensions[1]
- << endl;
-+ os << indent << "SMPBackendName: " << this->SMPBackendName << endl;
-+ os << indent << "SMPMaxNumberOfThreads: " << this->SMPMaxNumberOfThreads << endl;
- }
-
- //----------------------------------------------------------------------------
-@@ -138,6 +144,8 @@ void vtkPVServerInformation::DeepCopy(vtkPVServerInformation* info)
- this->IsInTileDisplay = info->GetIsInTileDisplay();
- this->IsInCave = info->GetIsInCave();
- info->GetTileDimensions(this->TileDimensions);
-+ this->SMPBackendName = info->GetSMPBackendName();
-+ this->SMPMaxNumberOfThreads = info->GetSMPMaxNumberOfThreads();
- }
-
- //----------------------------------------------------------------------------
-@@ -219,6 +227,8 @@ void vtkPVServerInformation::AddInformation(vtkPVInformation* info)
- {
- this->ClientId = serverInfo->ClientId;
- }
-+ this->SMPBackendName = serverInfo->GetSMPBackendName();
-+ this->SMPMaxNumberOfThreads = serverInfo->GetSMPMaxNumberOfThreads();
- this->SetIdTypeSize(serverInfo->GetIdTypeSize());
- }
- }
-@@ -242,6 +252,8 @@ void vtkPVServerInformation::CopyToStream(vtkClientServerStream* css)
- *css << this->IsInTileDisplay;
- *css << this->IsInCave;
- *css << this->TileDimensions[0] << this->TileDimensions[1];
-+ *css << this->SMPBackendName;
-+ *css << this->SMPMaxNumberOfThreads;
- *css << vtkClientServerStream::End;
- }
-
-@@ -329,6 +341,17 @@ void vtkPVServerInformation::CopyFromStream(const vtkClientServerStream* css)
- vtkErrorMacro("Error parsing TileDimensions from message.");
- return;
- }
-+
-+ if (!css->GetArgument(0, idx++, &this->SMPBackendName))
-+ {
-+ vtkErrorMacro("Error parsing SMPBackendName from message.");
-+ return;
-+ }
-+ if (!css->GetArgument(0, idx++, &this->SMPMaxNumberOfThreads))
-+ {
-+ vtkErrorMacro("Error parsing SMPMaxNumberOfThreads from message.");
-+ return;
-+ }
- }
-
- //----------------------------------------------------------------------------
-diff --git a/Remoting/Core/vtkPVServerInformation.h b/Remoting/Core/vtkPVServerInformation.h
-index fd12529cfe..7f2f1fe085 100644
---- a/Remoting/Core/vtkPVServerInformation.h
-+++ b/Remoting/Core/vtkPVServerInformation.h
-@@ -24,6 +24,8 @@
- #ifndef vtkPVServerInformation_h
- #define vtkPVServerInformation_h
-
-+#include <string>
-+
- #include "vtkPVInformation.h"
- #include "vtkRemotingCoreModule.h" //needed for exports
-
-@@ -140,6 +142,20 @@ public:
- vtkGetMacro(IdTypeSize, int);
- //@}
-
-+ //@{
-+ /**
-+ * Get the SMP Tools backend name of the server.
-+ */
-+ vtkGetMacro(SMPBackendName, std::string);
-+ //@}
-+
-+ //@{
-+ /**
-+ * Get the max number of threads of the server.
-+ */
-+ vtkGetMacro(SMPMaxNumberOfThreads, int);
-+ //@}
-+
- protected:
- vtkPVServerInformation();
- ~vtkPVServerInformation() override;
-@@ -158,6 +174,8 @@ protected:
- bool IsInTileDisplay;
- bool IsInCave;
- int TileDimensions[2];
-+ std::string SMPBackendName;
-+ int SMPMaxNumberOfThreads;
-
- private:
- vtkPVServerInformation(const vtkPVServerInformation&) = delete;
---
-GitLab
-
More information about the arch-commits
mailing list