Skip to content

Update external packages #391

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

Merged
hjmjohnson merged 4 commits into from
Oct 31, 2018
Merged

Update external packages #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
defe64d
COMP: HD5 changed API for printing Errors.
hjmjohnson Oct 23, 2018
2e49e43
COMP: Remove unused variables.
hjmjohnson Oct 23, 2018
0934f13
COMP: ITKv5 updates for JPEG2000.
hjmjohnson Oct 23, 2018
787f265
ENH: Updated packages for improved C++11.
hjmjohnson Oct 23, 2018
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
16 changes: 8 additions & 8 deletions BRAINSConstellationDetector/src/LLSModel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,25 +191,25 @@ ::Write()
// catch failure caused by the H5File operations
catch( H5::FileIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
// catch failure caused by the DataSet operations
catch( H5::DataSetIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
// catch failure caused by the DataSpace operations
catch( H5::DataSpaceIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
// catch failure caused by the DataType operations
catch( H5::DataTypeIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
return 0;
Expand Down Expand Up @@ -385,25 +385,25 @@ ::Read()
// catch failure caused by the H5File operations
catch( H5::FileIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
// catch failure caused by the DataSet operations
catch( H5::DataSetIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
// catch failure caused by the DataSpace operations
catch( H5::DataSpaceIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
// catch failure caused by the DataType operations
catch( H5::DataTypeIException & error )
{
error.printError();
error.printErrorStack();
return -1;
}
return 0;
Expand Down
8 changes: 4 additions & 4 deletions BRAINSConstellationDetector/src/fcsv_to_hdf5.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,28 +470,28 @@ int main(int argc, char* argv[])
// catch failure caused by the H5File operations
catch( H5::FileIException& error )
{
error.printError();
error.printErrorStack();
return -1;
}

// catch failure caused by the DataSet operations
catch( H5::DataSetIException& error )
{
error.printError();
error.printErrorStack();
return -1;
}

// catch failure caused by the DataSpace operations
catch( H5::DataSpaceIException& error )
{
error.printError();
error.printErrorStack();
return -1;
}

// catch failure caused by the DataSpace operations
catch( H5::DataTypeIException& error )
{
error.printError();
error.printErrorStack();
return -1;
}
}
Expand Down
6 changes: 3 additions & 3 deletions BRAINSConstellationDetector/src/landmarksConstellationDetector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ class landmarksConstellationDetector

RigidTransformType::Pointer m_TmspBasedOnReflectionCrossCorrelation;
SImageType::PointType m_CenterOfHeadMassEMSP;
SImageType::PointType m_BestCenter;
//SImageType::PointType m_BestCenter;
SImageType::Pointer m_VolumeRoughAlignedWithHoughEye;
SImageType::Pointer m_OriginalInputImage;
SImageType::Pointer m_VolumeMSP;
Expand Down Expand Up @@ -316,8 +316,8 @@ class landmarksConstellationDetector
SImageType::PointType m_LEPoint; // in input space
SImageType::PointType m_REPoint;

SImageType::PointType m_ReferencePointAC;
SImageType::PointType m_ReferencePointPC;
//SImageType::PointType m_ReferencePointAC;
//SImageType::PointType m_ReferencePointPC;
SImageType::PointType m_CenterOfHeadMass;

// Store linear model parameters
Expand Down
1 change: 1 addition & 0 deletions CMake/FindITKUtil.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ macro(FindITKUtil ITK_VAR_PREFIX )
ITKIOGDCM
ITKIOGIPL
ITKIOJPEG
ITKIOJPEG2000
ITKIOLSM
ITKIOMeta
ITKIONIFTI
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_ANTs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if(${SUPERBUILD_TOPLEVEL_PROJECT}_USE_QT)
endif()
### --- End Project specific additions
set(${proj}_REPOSITORY "https://github.com/stnava/ANTs.git")
set(${proj}_GIT_TAG c3a2857a0805b9b1e3abde1f7bae446453f0e713) # 20180422
set(${proj}_GIT_TAG 23003843bd0e0a9a83c7df0d688359dcf3c67460) # 20181017
ExternalProject_Add(${proj}
${${proj}_EP_ARGS}
GIT_REPOSITORY ${${proj}_REPOSITORY}
Expand Down
10 changes: 5 additions & 5 deletions SuperBuild/External_DCMTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
)

ExternalProject_SetIfNotDefined(
${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG
# Include patches for:
# * DCMTK_ENABLE_CXX11 support on Linux
# Official DCMTK master as of 20180621
# http://git.dcmtk.org/?p=dcmtk.git;a=commit;h=29f9de10c2e8576147f16475b156bba98d14ba7d
# plus the following patch:
# * Set CMP0067 to ensure try_compile work as expected
# * Fix template parameter in dcmiod/iodimage
"54004ba20077c626ff4e3042b1d4a5b36eda5e0e" # v3.6.3_20180205
${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG
"e79118cd2f40b77654630a56bbb17fe0bccc354c" # v3.6.3_20180621
QUIET
)

Expand Down
3 changes: 2 additions & 1 deletion SuperBuild/External_ITKv5.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
endif()

set(${CMAKE_PROJECT_NAME}_${proj}_GIT_REPOSITORY ${git_protocol}://itk.org/ITK.git)
set(${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG f5e254b6680e6e52f6caf8d6eb2321c8829eedf3 ) # 20180905 ITKv5b01
set(${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG 465a69bc633aed484bcd46f323d93e32d4feed8d ) # 20181022

set(EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS)

if(NOT ${CMAKE_PROJECT_NAME}ITKV3_COMPATIBILITY AND CMAKE_CL_64)
Expand Down
6 changes: 4 additions & 2 deletions SuperBuild/External_OpenCV.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}"
-DWITH_JPEG:BOOL=OFF
-DWITH_TIFF:BOOL=OFF
-DWITH_PNG:BOOL=OFF

-DENABLE_CXX11:BOOL=ON #Will be required for OpenCV4
## The following might cause build issues, here for testing
#-- OUTDATED -DENABLE_SSE:BOOL=ON
#-- OUTDATED -DENABLE_SSE2:BOOL=ON
Expand Down Expand Up @@ -106,8 +108,8 @@ if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}"
### --- End Project specific additions
#set(${proj}_REPOSITORY "${git_protocol}://github.com/Itseez/opencv")
#set(${proj}_GIT_TAG "2.4.9") # USE THIS FOR UPDATED VERSION
set(${proj}_REPOSITORY "${git_protocol}://github.com/BRAINSia/opencv.git") # USE THIS FOR UPDATED VERSION
set(${proj}_GIT_TAG 71f42810808b78c1b85682058694db6e9bccaea5) # "20160127
set(${proj}_REPOSITORY "${git_protocol}://github.com/opencv/opencv.git")
set(${proj}_GIT_TAG 3.4.2) # 20181017
#set(${proj}_GIT_TAG "20140630_Upstream") # USE THIS FOR UPDATED VERSION for GCC 4.4.7 on RHEL6
ExternalProject_Add(${proj}
${${proj}_EP_ARGS}
Expand Down
3 changes: 2 additions & 1 deletion SuperBuild/External_RTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ set(${proj}_CMAKE_OPTIONS
)
### --- End Project specific additions
set(${proj}_REPOSITORY "https://github.com/SimonRit/RTK.git")
set(${proj}_GIT_TAG 125063515aa50208816e62d3e25042c0535859ee) # 20180421
#set(${proj}_REPOSITORY "https://github.com/hjmjohnson/RTK.git")
set(${proj}_GIT_TAG 219f1cf25ec624a3beb0cc2ee5bd72e95013a120) #2018-10-20
ExternalProject_Add(${proj}
${${proj}_EP_ARGS}
GIT_REPOSITORY ${${proj}_REPOSITORY}
Expand Down
6 changes: 3 additions & 3 deletions SuperBuild/External_TBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ set(${proj}_CMAKE_OPTIONS
)

set(${proj}_REPOSITORY ${git_protocol}://github.com/01org/tbb.git)
set(${proj}_GIT_TAG 2018_U2) #
set(${proj}_GIT_TAG 2018_U6) # 20181017
ExternalProject_Add(${proj}
${${proj}_EP_ARGS}
GIT_REPOSITORY ${${proj}_REPOSITORY}
GIT_TAG ${${proj}_GIT_TAG}
SOURCE_DIR ${SOURCE_DOWNLOAD_CACHE}/${proj}
BINARY_DIR tbb_downloaded/2018_U2
BINARY_DIR tbb_downloaded/${${proj}_GIT_TAG}
DOWNLOAD_COMMAND "" #, no download
CONFIGURE_COMMAND "" #, no config
BUILD_COMMAND "" #, no build
Expand Down Expand Up @@ -56,7 +56,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/tbb_cmake/TBBGet.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/tbb_cmake/TBBBuild.cmake)
tbb_get(TBB_ROOT TBB_LOCAL_SRC_DIR
SAVE_TO ${SOURCE_DOWNLOAD_CACHE}/${proj}
RELEASE_TAG 2018_U2
RELEASE_TAG ${${proj}_GIT_TAG}
SYSTEM_NAME ${CMAKE_SYSTEM_NAME}
CONFIG_DIR TBB_DIR
SOURCE_CODE)
Expand Down