-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[vtk] Add option ENABLE_HDF5_PARALLEL to fit hdf5 feature parallel #24740
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
d9628c0
[vtk] Add option ENABLE_HDF5_PARALLEL to fit hdf5 feature parallel
d502c75
version
ba76ee4
[vtk] add error message instead of patching the source
cb94286
Add test port vcpkg-ci-vtk
29a0b6a
version
3bea547
fix json
7131c41
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
4a35b81
Add license
72de147
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
f4a6a95
Fix mpi4py, pdal and hdf5, add features, disable more components
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/IO/PDAL/CMakeLists.txt b/IO/PDAL/CMakeLists.txt | ||
| index d6cd57c..1270dfb 100644 | ||
| --- a/IO/PDAL/CMakeLists.txt | ||
| +++ b/IO/PDAL/CMakeLists.txt | ||
| @@ -1,4 +1,4 @@ | ||
| -vtk_module_find_package(PACKAGE PDAL) | ||
| +vtk_module_find_package(PACKAGE PDAL CONFIG_MODE) | ||
|
|
||
| set(classes | ||
| vtkPDALReader) | ||
| @@ -7,7 +7,7 @@ vtk_module_add_module(VTK::IOPDAL | ||
| CLASSES ${classes}) | ||
| vtk_module_link(VTK::IOPDAL | ||
| PRIVATE | ||
| - pdal_base) | ||
| + ${PDAL_LIBRARIES}) | ||
| # XXX(pdal): PDAL should add include interfaces to its exported targets. See | ||
| # https://github.com/PDAL/PDAL/issues/2262. | ||
| vtk_module_include(VTK::IOPDAL |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/mpi4py.MPI.c b/ThirdParty/mpi4py/vtkmpi4py/src/mpi4py.MPI.c | ||
| index d01c266..0220249 100644 | ||
| --- a/ThirdParty/mpi4py/vtkmpi4py/src/mpi4py.MPI.c | ||
| +++ b/ThirdParty/mpi4py/vtkmpi4py/src/mpi4py.MPI.c | ||
| @@ -154207,9 +154207,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Datatype(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_8Datatype_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -154497,9 +154497,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Request(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_7Request_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| Py_CLEAR(p->ob_buf); | ||
| @@ -154877,9 +154877,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Message(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_7Message_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| Py_CLEAR(p->ob_buf); | ||
| @@ -155073,9 +155073,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Op(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_2Op_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -155260,9 +155260,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Group(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_5Group_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -155456,9 +155456,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Info(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_4Info_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -155675,9 +155675,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Errhandler(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_10Errhandler_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -155845,9 +155845,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Comm(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_4Comm_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -156860,9 +156860,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_Win(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_3Win_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| Py_CLEAR(p->ob_mem); | ||
| @@ -157166,9 +157166,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_File(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_4File_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -157436,9 +157436,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI_memory(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_6memory_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); | ||
| @@ -157609,9 +157609,9 @@ static void __pyx_tp_dealloc_6mpi4py_3MPI__p_mem(PyObject *o) { | ||
| { | ||
| PyObject *etype, *eval, *etb; | ||
| PyErr_Fetch(&etype, &eval, &etb); | ||
| - ++Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) + 1); | ||
| __pyx_pw_6mpi4py_3MPI_6_p_mem_3__dealloc__(o); | ||
| - --Py_REFCNT(o); | ||
| + Py_SET_REFCNT(o, Py_REFCNT(o) - 1); | ||
| PyErr_Restore(etype, eval, etb); | ||
| } | ||
| (*Py_TYPE(o)->tp_free)(o); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| set(VCPKG_POLICY_EMPTY_PACKAGE enabled) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "name": "vcpkg-ci-vtk", | ||
| "version-date": "2022-05-30", | ||
| "description": "Port to force features of certain ports within CI", | ||
| "homepage": "https://github.com/microsoft/vcpkg", | ||
| "license": "MIT", | ||
| "dependencies": [ | ||
| { | ||
| "name": "vtk", | ||
| "default-features": false, | ||
| "features": [ | ||
| "cuda", | ||
| "gdal", | ||
| "geojson", | ||
| "mpi", | ||
| "opengl", | ||
| "openvr", | ||
| "paraview", | ||
| "python", | ||
| "qt", | ||
| "utf8", | ||
| "vtkm" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "vtk", | ||
| "default-features": false, | ||
| "features": [ | ||
| "atlmfc" | ||
| ], | ||
| "platform": "windows" | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Requires by internal dependency
xdmf3, which requires by componentVTK::xdmf3,VTK::IOXdmf3andVTK::IOParallelXdmf3.