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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 5 commits into from
Feb 17, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e5d7c1
ENH: Convert VNL import script to use update-third-party.bash
bradking Feb 16, 2021
9139c57
VXL 2020-12-16 (a05ed916)
Dec 17, 2020
6341c4f
Merge branch 'upstream-VXL' into vxl-update
bradking Feb 16, 2021
19c6f33
VXL 2021-02-15 (7edc7cd8)
Feb 15, 2021
39e32d8
Merge branch 'upstream-VXL' into vxl-update
bradking Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions Modules/ThirdParty/VNL/UpdateFromUpstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
#!/usr/bin/env bash

thirdparty_module_name='VNL'
set -e
set -x
shopt -s dotglob

upstream_git_url='https://github.com/vxl/vxl.git'
upstream_git_branch='master'
readonly name='VXL'
readonly ownership='VXL Maintainers <vxl-maintainers@lists.sourceforge.net>'
readonly subtree="Modules/ThirdParty/VNL/src/vxl"
readonly repo="https://github.com/vxl/vxl.git"
readonly tag="master"
readonly shortlog=false
readonly paths="
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
"

snapshot_author_name='VXL Maintainers'
snapshot_author_email='vxl-maintainers@lists.sourceforge.net'
extract_source () {
git_archive
pushd "${extractdir}/${name}-reduced"
rm v3p/netlib/triangle*
rm v3p/netlib/examples/showme.c
echo "* -whitespace" > .gitattributes
popd
}

snapshot_redact_cmd='
rm v3p/netlib/triangle*
rm v3p/netlib/examples/showme.c
'
snapshot_relative_path='src/vxl'
snapshot_paths='
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
'

source "${BASH_SOURCE%/*}/../../../Utilities/Maintenance/UpdateThirdPartyFromUpstream.sh"
update_from_upstream
. "${BASH_SOURCE%/*}/../../../Utilities/Maintenance/update-third-party.bash"
1 change: 1 addition & 0 deletions Modules/ThirdParty/VNL/src/vxl/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* -whitespace
2 changes: 2 additions & 0 deletions Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/Templates/vnl_fft_base+double.allsizes-.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ VNL_FFT_BASE_INSTANTIATE(2, double);
VNL_FFT_BASE_INSTANTIATE(3, double);
#include <vnl/algo/vnl_fft_base.hxx>
VNL_FFT_BASE_INSTANTIATE(4, double);
#include <vnl/algo/vnl_fft_base.hxx>
VNL_FFT_BASE_INSTANTIATE(5, double);
2 changes: 2 additions & 0 deletions Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/Templates/vnl_fft_base+float.allsizes-.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ VNL_FFT_BASE_INSTANTIATE(2, float);
VNL_FFT_BASE_INSTANTIATE(3, float);
#include <vnl/algo/vnl_fft_base.hxx>
VNL_FFT_BASE_INSTANTIATE(4, float);
#include <vnl/algo/vnl_fft_base.hxx>
VNL_FFT_BASE_INSTANTIATE(5, float);
10 changes: 5 additions & 5 deletions Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/comptry.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%1 %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel 1 goto nolonglong
exit 0
:nolonglong
%1 -DNO_LONG_LONG %2 %3 %4 %5 %6 %7 %8 %9
%1 %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel 1 goto nolonglong
exit 0
:nolonglong
%1 -DNO_LONG_LONG %2 %3 %4 %5 %6 %7 %8 %9
10 changes: 5 additions & 5 deletions Modules/ThirdParty/VNL/src/vxl/v3p/netlib/libf2c/scomptry.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%1 -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel 1 goto nolonglong
exit 0
:nolonglong
%1 -DNO_LONG_LONG -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9
%1 -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel 1 goto nolonglong
exit 0
:nolonglong
%1 -DNO_LONG_LONG -DWRITE_ARITH_H -DNO_FPINIT %2 %3 %4 %5 %6 %7 %8 %9