-
-
Notifications
You must be signed in to change notification settings - Fork 675
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
ENH: Bump MetaIO to address style and const params #1823
Merged
Merged
Conversation
This file contains 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
Update to MetaIO tag f473b7b86a15dc2f3578f1e82b5544ef7776e2e7 from May 11, 2020. ENH: Parse() should handle char *argv[] as const (#91)
dzenanz
reviewed
May 13, 2020
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.
Did you use https://github.com/InsightSoftwareConsortium/ITK/blob/master/Modules/ThirdParty/MetaIO/UpdateFromUpstream.sh script? The script makes updates easier and more uniform.
That script did not work for me. It initiated many changes throughout itk
and produced conflicts in metaio dir.
It did work for me in the past.
If it works for you, I am happy to abandon this.
…---
Sent via phone.
On Wed, May 13, 2020, 5:13 PM Dženan Zukić ***@***.***> wrote:
***@***.**** commented on this pull request.
Did you use
https://github.com/InsightSoftwareConsortium/ITK/blob/master/Modules/ThirdParty/MetaIO/UpdateFromUpstream.sh
script? The script makes updates easier and more uniform.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1823 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AACEJL3Y2U2L5YFQTX6B3K3RRMEP3ANCNFSM4NADLTNQ>
.
|
I also run into numerous merge conflicts when trying to run the script now. |
dzenanz
approved these changes
May 14, 2020
phcerdan
pushed a commit
to phcerdan/ITK
that referenced
this pull request
Dec 8, 2020
Run the UpdateFromUpstream.sh script to extract upstream Eigen3 using the following shell commands. $ git archive --prefix=upstream-eigen3/ b51eab5c -- Eigen/Cholesky Eigen/CholmodSupport Eigen/CMakeLists.txt Eigen/Core Eigen/Dense Eigen/Eigen Eigen/Eigenvalues Eigen/Geometry Eigen/Householder Eigen/IterativeLinearSolvers Eigen/Jacobi Eigen/LU Eigen/MetisSupport Eigen/OrderingMethods Eigen/PardisoSupport Eigen/PaStiXSupport Eigen/QR Eigen/QtAlignedMalloc Eigen/Sparse Eigen/SparseCholesky Eigen/SparseCore Eigen/SparseLU Eigen/SparseQR Eigen/SPQRSupport Eigen/StdDeque Eigen/StdList Eigen/StdVector Eigen/SuperLUSupport Eigen/SVD Eigen/UmfPackSupport Eigen/src COPYING.BSD COPYING.MINPACK COPYING.MPL2 COPYING.README README.md README.kitware.md CMakeLists.txt cmake/FindStandardMathLibrary.cmake cmake/Eigen3Config.cmake.in .gitattributes | tar x $ git shortlog --perl-regexp --author='^((?!Kitware Robot).*)$' --no-merges --abbrev=8 --format='%h %s' 0a5604a9..b51eab5c Alexander Grund (1): 1b080fdc Make relative path variables of type STRING Ben Boeckel (1): 8c652058 git: remove executable permissions from header files Christoph Hertzberg (6): 84364ad1 Bug InsightSoftwareConsortium#1788: Fix rule-of-three violations inside the stable modules. This fixes deprecated-copy warnings when compiling with GCC>=9 Also protect some additional Base-constructors from getting called by user code code (InsightSoftwareConsortium#1587) 14db78c5 Fix some maybe-uninitialized warnings 3620371c Bug InsightSoftwareConsortium#2036 make sure find_standard_math_library_test_program actually compiles (and is guaranteed to call math functions) ac632f66 bug InsightSoftwareConsortium#1746: Removed implementation of standard copy-constructor and standard copy-assign-operator from PermutationMatrix and Transpositions to allow malloc-less std::move. Added unit-test to rvalue_types 54930b6b Remove unused variable 2a4fcb2c Fix doxygen class block that was wrongly named. David Tellenbach (9): abb5d04c Fix StlDeque for GCC 10 76f06505 Bump to 3.3.8-rc1 b933946d Fix failure in GEBP kernel when compiling with OpenMP and FMA 9f202c6f Fix undefined behaviour caused by uncaught exceptions in OMP section dc252fbf Bump to 3.3.8 7a0a2a50 Define coeff-wise binary array operators for base class 75f8b06e Mention problems when using potentially throwing scalars and OpenMP 5dda502f Rename test/array.cpp to test/array_cwise.cpp 0fd6b4f7 Bump to 3.3.9 Eugene Zhulenev (2): 160c0a34 Change typedefs from private to protected to fix MSVC compilation b51eab5c Fix shadow warnings in AlignedBox and SparseBlock Florian Maurin (1): 52207cf6 Fix typo in doc Gael Guennebaud (11): 1595ee40 Add missing footer declaration 86306a5c remove piwik tracker 16ed93cf add a banner to advertise the survey e5b35d64 Fix compilation with AVX512 def70b2e Fix compilation with AVX512 and AVX/SSE packet-math functions efd72cdd Backport AVX512 implementation from devel branch to 3.3 (the 3.3 version had many issues) 94f66fc3 Fix InsightSoftwareConsortium#1974: assertion when reserving an empty sparse matrix b343bace Relaxed fastmath unit test: if std::foo fails, then let's only trigger a warning is numext::foo fails too. A true error will triggered only if std::foo works but our numext::foo fails. 89a86ed4 fix InsightSoftwareConsortium#1901: warning in Mode==(Upper|Lower) a796be81 relax number of iterations checks to avoid false negatives 590aec8f check two ctors Janek Kozicki (1): 0dd9643a Fix Yade high precision Real compilation Jim Lersch (1): 0c26611d Workaround for doxygen class template titles in which the template part of the class signature is lost due to a problem with forward declarations. The problem is probably caused by doxygen bug #7689. It is confirmed to be fixed in doxygen >= 1.8.19. Karl Ljungkvist (1): e91e5d8c Fix typo in Tutorial_BlockOperations_block_assignment.cpp Luke Peterson (1): ef3cc72c Remove error counting in OpenMP parallelize_gemm Martin Vonheim Larsen (1): 4e5385c9 Enable MathJax in Doxygen.in Pablo Hernandez-Cerdan (2): 5d2d394d Add .gitattributes to ignore UpdateFromStream content checks 93d0c52c CMake: Overrides upstream Eigen3 CMakeLists.txt Rasmus Munk Larsen (1): 02ef3802 Fix incorrect use of std::abs reported in InsightSoftwareConsortium#1823. Simon Pfreundschuh (1): e22d0947 Replaced call to deprecated 'load' function with appropriate call to 'on'. Tobias Bosch (1): f55a6d05 Include <sstream> explicitly, and don't rely on the implicit include via <complex>. nluehr (1): 4707c3aa Fix incorrect integer cast in predux<half2>(). szczepaniak bartek (1): bfdd4a99 Fix Paradiso. Change-Id: Ib1f461c42dae13af5f65552ac1a192e96688f2d9
phcerdan
added a commit
to phcerdan/ITK
that referenced
this pull request
Dec 8, 2020
Changes from last update: ``` git shortlog --no-merges 89449a0821676c5af96cc51973de^..0fd6b4f71dd85b20 | cat ``` ``` Alexander Grund (1): Make relative path variables of type STRING Christoph Hertzberg (7): Remove .hgignore and copy .gitignore from master branch Bug InsightSoftwareConsortium#1788: Fix rule-of-three violations inside the stable modules. This fixes deprecated-copy warnings when compiling with GCC>=9 Also protect some additional Base-constructors from getting called by user code code (InsightSoftwareConsortium#1587) Fix some maybe-uninitialized warnings Bug InsightSoftwareConsortium#2036 make sure find_standard_math_library_test_program actually compiles (and is guaranteed to call math functions) bug InsightSoftwareConsortium#1746: Removed implementation of standard copy-constructor and standard copy-assign-operator from PermutationMatrix and Transpositions to allow malloc-less std::move. Added unit-test to rvalue_types Remove unused variable Fix doxygen class block that was wrongly named. David Tellenbach (9): Fix StlDeque for GCC 10 Bump to 3.3.8-rc1 Fix failure in GEBP kernel when compiling with OpenMP and FMA Fix undefined behaviour caused by uncaught exceptions in OMP section Bump to 3.3.8 Define coeff-wise binary array operators for base class Mention problems when using potentially throwing scalars and OpenMP Rename test/array.cpp to test/array_cwise.cpp Bump to 3.3.9 Eugene Zhulenev (1): Change typedefs from private to protected to fix MSVC compilation Florian Maurin (1): Fix typo in doc Gael Guennebaud (11): Add missing footer declaration remove piwik tracker add a banner to advertise the survey Fix compilation with AVX512 Fix compilation with AVX512 and AVX/SSE packet-math functions Backport AVX512 implementation from devel branch to 3.3 (the 3.3 version had many issues) Fix InsightSoftwareConsortium#1974: assertion when reserving an empty sparse matrix Relaxed fastmath unit test: if std::foo fails, then let's only trigger a warning is numext::foo fails too. A true error will triggered only if std::foo works but our numext::foo fails. fix InsightSoftwareConsortium#1901: warning in Mode==(Upper|Lower) relax number of iterations checks to avoid false negatives check two ctors Janek Kozicki (1): Fix Yade high precision Real compilation Jim Lersch (1): Workaround for doxygen class template titles in which the template part of the class signature is lost due to a problem with forward declarations. The problem is probably caused by doxygen bug #7689. It is confirmed to be fixed in doxygen >= 1.8.19. Karl Ljungkvist (1): Fix typo in Tutorial_BlockOperations_block_assignment.cpp Luke Peterson (1): Remove error counting in OpenMP parallelize_gemm Martin Vonheim Larsen (1): Enable MathJax in Doxygen.in Rasmus Munk Larsen (1): Fix incorrect use of std::abs reported in InsightSoftwareConsortium#1823. Simon Pfreundschuh (1): Replaced call to deprecated 'load' function with appropriate call to 'on'. Tobias Bosch (1): Include <sstream> explicitly, and don't rely on the implicit include via <complex>. nluehr (1): Fix incorrect integer cast in predux<half2>(). szczepaniak bartek (1): Fix Paradiso. ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Update to MetaIO tag f473b7b86a15dc2f3578f1e82b5544ef7776e2e7
from May 11, 2020.
ENH: Parse() should handle char *argv[] as const (#91)