diff --git a/BRAINSCommonLib/BRAINSFitHelper.cxx b/BRAINSCommonLib/BRAINSFitHelper.cxx index 15306170f..ba77c5e87 100644 --- a/BRAINSCommonLib/BRAINSFitHelper.cxx +++ b/BRAINSCommonLib/BRAINSFitHelper.cxx @@ -306,7 +306,9 @@ BRAINSFitHelper::Update(void) { typedef itk::MattesMutualInformationImageToImageMetricv4 MIMetricType; MIMetricType::Pointer mutualInformationMetric = MIMetricType::New(); - mutualInformationMetric->SetMaximumNumberOfThreads(std::min( 3U,itk::MultiThreader::GetGlobalDefaultNumberOfThreads() ) ); + //The next line was a hack for early ITKv4 mattes mutual informaiton + //that was using a lot of memory + //mutualInformationMetric->SetMaximumNumberOfThreads(std::min( 3U,itk::MultiThreader::GetGlobalDefaultNumberOfThreads() ) ); mutualInformationMetric = mutualInformationMetric; mutualInformationMetric->SetNumberOfHistogramBins( this->m_NumberOfHistogramBins ); mutualInformationMetric->SetUseMovingImageGradientFilter( gradientfilter ); diff --git a/BRAINSFit/Testing/Temporary/CTestCostData.txt b/BRAINSFit/Testing/Temporary/CTestCostData.txt new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/BRAINSFit/Testing/Temporary/CTestCostData.txt @@ -0,0 +1 @@ +--- diff --git a/BRAINSFit/Testing/Temporary/LastTest.log b/BRAINSFit/Testing/Temporary/LastTest.log new file mode 100644 index 000000000..ba7e30ff9 --- /dev/null +++ b/BRAINSFit/Testing/Temporary/LastTest.log @@ -0,0 +1,3 @@ +Start testing: Jul 18 16:21 CDT +---------------------------------------------------------- +End testing: Jul 18 16:21 CDT diff --git a/SuperBuild/External_ITKv4.cmake b/SuperBuild/External_ITKv4.cmake index 1095c7fa2..e1d0c230c 100644 --- a/SuperBuild/External_ITKv4.cmake +++ b/SuperBuild/External_ITKv4.cmake @@ -37,8 +37,9 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj}) set(git_protocol "git") endif() - set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git) - set(${proj}_GIT_TAG 06d5bfec67805bfadb5dc344b08ab554381592c6 ) + #set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git) + set(${proj}_REPOSITORY ${git_protocol}://github.com/BRAINSia/ITK.git + set(${proj}_GIT_TAG c123bf502918db7acb7b9afe5ba3fc5cd362b47e ) # message("COMMON_EXTERNAL_PROJECT_ARGS: #${COMMON_EXTERNAL_PROJECT_ARGS}") ExternalProject_Add(${proj} diff --git a/SuperBuild/External_SlicerExecutionModel.cmake b/SuperBuild/External_SlicerExecutionModel.cmake index bfee00d16..1d811b297 100644 --- a/SuperBuild/External_SlicerExecutionModel.cmake +++ b/SuperBuild/External_SlicerExecutionModel.cmake @@ -33,7 +33,7 @@ if(NOT DEFINED SlicerExecutionModel_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM ExternalProject_Add(${proj} ${${proj}_EP_ARGS} GIT_REPOSITORY "${git_protocol}://github.com/Slicer/SlicerExecutionModel.git" - GIT_TAG "ecb58ad73c5dcdebf8c4d46257c7e44a07a7cdd4" + GIT_TAG "feef59eae446e4881d7992b6a229b03731ccb8d1" SOURCE_DIR ${SOURCE_DOWNLOAD_CACHE}/${proj} BINARY_DIR ${proj}-build CMAKE_ARGS -Wno-dev --no-warn-unused-cli diff --git a/Testing/Temporary/LastTest.log b/Testing/Temporary/LastTest.log new file mode 100644 index 000000000..ba7e30ff9 --- /dev/null +++ b/Testing/Temporary/LastTest.log @@ -0,0 +1,3 @@ +Start testing: Jul 18 16:21 CDT +---------------------------------------------------------- +End testing: Jul 18 16:21 CDT