Skip to content
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

VNL 2021-02-15 (7edc7cd8) #2324

Merged
merged 5 commits into from
Feb 17, 2021
Merged

Conversation

thewtex
Copy link
Member

@thewtex thewtex commented Feb 16, 2021

Run the UpdateFromUpstream.sh script to extract upstream VNL
using the following shell commands.

$ git archive --prefix=upstream-vnl/ 7edc7cd8 --
CMakeLists.txt
config/cmake
core/CMakeLists.txt
core/testlib
core/vnl
core/vxl_config.h.in
core/vxl_copyright.h
core/vxl_version.h
v3p/CMakeLists.txt
v3p/netlib
vcl
| tar x
$ git shortlog --perl-regexp --author='^((?!Kitware Robot).*)$' --no-merges --abbrev=8 --format='%h %s' 85ae25b7..7edc7cd8

Drew Gilliam (1):
40ccc0b8 vpgl_rational_camera additional ordering schema

Joseph Mundy (2):
faa3fcf4 remove bad cams from match tree
7edc7cd8 upgrade from WGS80 to WGS84

Matt McCormick (1):
d1cd3d14 COMP: Instantiate vnl_fft_base for 5D data

Change-Id: Ia06010461c76d8388e6fbcd9ff25cda79fc1bff1

Copy link
Member

@dzenanz dzenanz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit a4dc6cc adds bad whitespace including CR/LF line endings:

v3p/netlib/libf2c/comptry.bat:1: trailing whitespace.
+%1 %2 %3 %4 %5 %6 %7 %8 %9⏎
v3p/netlib/libf2c/comptry.bat:2: trailing whitespace.
+if errorlevel 1 goto nolonglong⏎
v3p/netlib/libf2c/comptry.bat:3: trailing whitespace.
+exit 0⏎
v3p/netlib/libf2c/comptry.bat:4: trailing whitespace.
+:nolonglong⏎
v3p/netlib/libf2c/comptry.bat:5: trailing whitespace.
+%1 -DNO_LONG_LONG %2 %3 %4 %5 %6 %7 %8 %9⏎
v3p/netlib/libf2c/scomptry.bat:1: trailing whitespace.
+%1 -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9⏎
v3p/netlib/libf2c/scomptry.bat:2: trailing whitespace.
+if errorlevel 1 goto nolonglong⏎
v3p/netlib/libf2c/scomptry.bat:3: trailing whitespace.
+exit 0⏎
v3p/netlib/libf2c/scomptry.bat:4: trailing whitespace.
+:nolonglong⏎
v3p/netlib/libf2c/scomptry.bat:5: trailing whitespace.
+%1 -DNO_LONG_LONG -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9⏎

@thewtex
Copy link
Member Author

thewtex commented Feb 16, 2021

v3p/netlib/libf2c/comptry.bat
commit a4dc6cc adds bad whitespace including CR/LF line endings:

Odd because we have *.bat -crlf in our *.gitattributes. @bradking @mathstuf

Copy link
Member

@hjmjohnson hjmjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM adding the FFT recent changes.

@bradking
Copy link
Member

Odd because we have *.bat -crlf in our *.gitattributes.

The bot is complaining about the import commit, whose tree object does not include the rest of ITK. The import script may need to write the .gitattributes content itself to get it in the import commit.

@phcerdan
Copy link
Contributor

I am curious why this VNL update seems fine, not touching unrelated files as past VNL and MetaIO updates did.

@bradking Could you please share your thoughts on this related issue : #2314 ?

@bradking
Copy link
Member

I'll look at converting Modules/ThirdParty/VNL/UpdateFromUpstream.sh to use Utilities/Maintenance/update-third-party.bash, which provides a hook to handle .gitattributes.

bradking and others added 5 commits February 16, 2021 16:15
Code extracted from:

    https://github.com/vxl/vxl.git

at commit a05ed91694ee90c685d425ed42615a474761840b (a05ed916).
* upstream-VXL:
  VXL 2020-12-16 (a05ed916)
Code extracted from:

    https://github.com/vxl/vxl.git

at commit 7edc7cd869ac08a2d236e55ec173ae3c09096fa5 (master).
# By VXL Maintainers
* upstream-VXL:
  VXL 2021-02-15 (7edc7cd8)
@bradking
Copy link
Member

@thewtex I updated your branch to convert to the newer import script, add the .gitattributes file to the import to suppress whitespace checks, and then perform the actual update you did before.

@thewtex
Copy link
Member Author

thewtex commented Feb 17, 2021

@bradking thank you!!

@thewtex thewtex merged commit 44b484b into InsightSoftwareConsortium:master Feb 17, 2021
@thewtex thewtex deleted the vxl-update branch February 17, 2021 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants