ENH: adding compatibility with ITK 5.0

dzenanz · dzenanz · commit 25e3e2acb9f2 · 2018-09-18T18:38:24.000-04:00
diff --git a/examples/Core/ThreadOverhead.cxx b/examples/Core/ThreadOverhead.cxx
@@ -95,7 +95,7 @@ ProbeType time_it(unsigned int threads, unsigned int iterations, bool realtime =
 
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput(image);
-  filter->SetNumberOfThreads( threads );
+  filter->SET_PARALLEL_UNITS( threads );
 
   // execute one time out of the loop to allocate memory
   filter->UpdateLargestPossibleRegion();
@@ -105,7 +105,7 @@ ProbeType time_it(unsigned int threads, unsigned int iterations, bool realtime =
 
   const std::string name = ss.str();
 
-  for( int ii = 0; ii < iterations; ++ii )
+  for( unsigned ii = 0; ii < iterations; ++ii )
     {
     image->Modified();
     collector.Start(name.c_str());
@@ -128,7 +128,7 @@ int main( int argc, char * argv[] )
 
   const std::string timingsFileName = ReplaceOccurrence( argv[1], "__DATESTAMP__", PerfDateStamp());
   const int iterations = (argc>2) ? atoi( argv[2] ): 500;
-  const int threads = (argc>3) ? atoi( argv[3] ) : itk::MultiThreader::GetGlobalDefaultNumberOfThreads();
+  const int threads = (argc>3) ? atoi( argv[3] ) : MultiThreaderName::GetGlobalDefaultNumberOfThreads();
 
   if (threads == 1)
     {
diff --git a/examples/Filtering/BinaryAddBenchmark.cxx b/examples/Filtering/BinaryAddBenchmark.cxx
@@ -67,7 +67,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Filtering/GradientMagnitudeBenchmark.cxx b/examples/Filtering/GradientMagnitudeBenchmark.cxx
@@ -40,7 +40,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Filtering/MedianBenchmark.cxx b/examples/Filtering/MedianBenchmark.cxx
@@ -40,7 +40,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Filtering/MinMaxCurvatureFlowBenchmark.cxx b/examples/Filtering/MinMaxCurvatureFlowBenchmark.cxx
@@ -40,7 +40,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Filtering/ResampleBenchmark.cxx b/examples/Filtering/ResampleBenchmark.cxx
@@ -190,7 +190,7 @@ GetImageProperties( const std::string& filename, std::string& pixeltype, std::st
     }
 
   // Extract the ImageIO from the reader
-  ImageIOBaseType::Pointer imageIOBase = reader->GetImageIO();
+  const ImageIOBaseType* imageIOBase = reader->GetImageIO();
 
   // Get the component type, number of components, dimension and pixel type
   dimension = imageIOBase->GetNumberOfDimensions();
@@ -869,7 +869,7 @@ ProcessImage( const Parameters& _parameters )
   // Setting the threads
   if ( _parameters.threads > 0 )
     {
-      itk::MultiThreader::SetGlobalDefaultNumberOfThreads( _parameters.threads );
+      MultiThreaderName::SetGlobalDefaultNumberOfThreads( _parameters.threads );
     }
 
   // Input image dimension
@@ -978,7 +978,7 @@ ProcessImage( const Parameters& _parameters )
   DefineExtrapolator< ExtrapolatorType >( extrapolator, _parameters.extrapolator );
 
   // Print resample execution info
-  std::cout << "Benchmarking Resample filter with " << itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads()
+  std::cout << "Benchmarking Resample filter with " << MultiThreaderName::GetGlobalDefaultNumberOfThreads()
             << " threads" << std::endl;
   std::cout << "Image size: " << imageSize << std::endl;
   std::cout << "Interpolator type: " << interpolator->GetNameOfClass() << std::endl;
diff --git a/examples/Filtering/UnaryAddBenchmark.cxx b/examples/Filtering/UnaryAddBenchmark.cxx
@@ -66,7 +66,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Registration/DemonsRegistrationBenchmark.cxx b/examples/Registration/DemonsRegistrationBenchmark.cxx
@@ -81,7 +81,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Registration/NormalizedCorrelationBenchmark.cxx b/examples/Registration/NormalizedCorrelationBenchmark.cxx
@@ -40,7 +40,7 @@ int main(int argc, char * argv[])
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Registration/RegistrationFrameworkBenchmark.cxx b/examples/Registration/RegistrationFrameworkBenchmark.cxx
@@ -80,7 +80,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Segmentation/LevelSetBenchmark.cxx b/examples/Segmentation/LevelSetBenchmark.cxx
@@ -47,7 +47,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Segmentation/RegionGrowingBenchmark.cxx b/examples/Segmentation/RegionGrowingBenchmark.cxx
@@ -44,7 +44,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/examples/Segmentation/WatershedBenchmark.cxx b/examples/Segmentation/WatershedBenchmark.cxx
@@ -45,7 +45,7 @@ int main( int argc, char * argv[] )
 
   if( threads > 0 )
     {
-    itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );
+    MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );
     }
 
   constexpr unsigned int Dimension = 3;
diff --git a/include/LOCAL_itkResourceProbe.h b/include/LOCAL_itkResourceProbe.h
@@ -83,7 +83,7 @@ class ITK_TEMPLATE_EXPORT LOCAL_ResourceProbe
 
   /** Returns the instant value of the probed system.
    */
-  virtual ValueType   GetInstantValue(void) const = 0;
+  virtual ValueType   GetInstantValue() const = 0;
 
   /** Returns the accumulated value changes between the starts and stops
    *  of the probe */
diff --git a/include/LOCAL_itkResourceProbe.hxx b/include/LOCAL_itkResourceProbe.hxx
@@ -37,7 +37,6 @@
 
 #include "LOCAL_itkResourceProbe.h"
 #include "itkNumericTraits.h"
-#include "itkMultiThreader.h"
 #include "itksys/SystemInformation.hxx"
 #include "itkMath.h"
 #include "itkIsNumber.h"
@@ -64,7 +63,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 void
 LOCAL_ResourceProbe< ValueType, MeanType >
-::Reset(void)
+::Reset()
 {
   this->m_TotalValue        = NumericTraits< ValueType >::ZeroValue();
   this->m_StartValue        = NumericTraits< ValueType >::ZeroValue();
@@ -84,7 +83,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 std::string
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetType(void) const
+::GetType() const
 {
   return this->m_TypeString;
 }
@@ -93,7 +92,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 std::string
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetUnit(void) const
+::GetUnit() const
 {
   return this->m_UnitString;
 }
@@ -102,7 +101,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 void
 LOCAL_ResourceProbe< ValueType, MeanType >
-::Start(void)
+::Start()
 {
   this->m_NumberOfStarts++;
   this->m_StartValue = this->GetInstantValue();
@@ -112,7 +111,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 void
 LOCAL_ResourceProbe< ValueType, MeanType >
-::Stop(void)
+::Stop()
 {
   ValueType probevalue = this->GetInstantValue() - this->m_StartValue;
   if ( this->m_NumberOfStops == this->m_NumberOfStarts )
@@ -131,7 +130,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 typename LOCAL_ResourceProbe< ValueType, MeanType >::CountType
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetNumberOfStarts(void) const
+::GetNumberOfStarts() const
 {
   return this->m_NumberOfStarts;
 }
@@ -140,7 +139,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 typename LOCAL_ResourceProbe< ValueType, MeanType >::CountType
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetNumberOfStops(void) const
+::GetNumberOfStops() const
 {
   return this->m_NumberOfStops;
 }
@@ -149,7 +148,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 typename LOCAL_ResourceProbe< ValueType, MeanType >::CountType
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetNumberOfIteration(void) const
+::GetNumberOfIteration() const
 {
   return this->m_NumberOfIteration;
 }
@@ -158,7 +157,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 ValueType
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetTotal(void) const
+::GetTotal() const
 {
   return this->m_TotalValue;
 }
@@ -167,7 +166,7 @@ LOCAL_ResourceProbe< ValueType, MeanType >
 template< typename ValueType, typename MeanType >
 MeanType
 LOCAL_ResourceProbe< ValueType, MeanType >
-::GetMean(void) const
+::GetMean() const
 {
   MeanType meanValue = NumericTraits< MeanType >::ZeroValue();
 
diff --git a/include/LOCAL_itkResourceProbesCollectorBase.hxx b/include/LOCAL_itkResourceProbesCollectorBase.hxx
@@ -236,7 +236,7 @@ LOCAL_ResourceProbesCollectorBase< TProbe >
 template< typename TProbe >
 void
 LOCAL_ResourceProbesCollectorBase< TProbe >
-::Clear(void)
+::Clear()
 {
   this->m_Probes.clear();
 }
diff --git a/include/PerformanceBenchmarkingUtilities.h b/include/PerformanceBenchmarkingUtilities.h
@@ -11,6 +11,16 @@
 #include <ctime> //TODO:  Move to utiliites
 #include "itkHighPriorityRealTimeProbesCollector.h"
 
+#if ITK_VERSION_MAJOR >= 5
+#include "itkMultiThreaderBase.h"
+using MultiThreaderName = itk::MultiThreaderBase;
+#define SET_PARALLEL_UNITS( x ) SetNumberOfWorkUnits( x )
+#else
+#include "itkMultiThreader.h"
+using MultiThreaderName = itk::MultiThreader;
+#define SET_PARALLEL_UNITS( x ) SetNumberOfThreads( x )
+#endif
+
 PerformanceBenchmarking_EXPORT
 std::string
 PerfDateStamp();
diff --git a/src/PerformanceBenchmarkingUtilities.cxx b/src/PerformanceBenchmarkingUtilities.cxx
@@ -156,7 +156,7 @@ std::string DecorateWithBuildInformation( std::string  inputJson)
   }
   {
     jsonxx::Object runTimeEnvJsonObject;
-    const unsigned int defaultNumberOfThreads = itk::MultiThreader::GetGlobalDefaultNumberOfThreads();
+    const unsigned int defaultNumberOfThreads = MultiThreaderName::GetGlobalDefaultNumberOfThreads();
     runTimeEnvJsonObject << "GetGlobalDefaultNumberOfThreads" << defaultNumberOfThreads;
     //NOTE: This is the load average, that includes this test, and many other test, and what the
     //      OS was doing around the time of the test.  It is not terribly reliable, but if it is
diff --git a/src/itkHighPriorityRealTimeProbe.cxx b/src/itkHighPriorityRealTimeProbe.cxx
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include "itkMultiThreader.h"
 
 namespace itk
 {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ int main( int argc, char * argv[] )`
`67`	`67`
`68`	`68`	`if( threads > 0 )`
`69`	`69`	`{`
`70`		`- itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );`
	`70`	`+ MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`constexpr unsigned int Dimension = 3;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ int main( int argc, char * argv[] )`
`40`	`40`
`41`	`41`	`if( threads > 0 )`
`42`	`42`	`{`
`43`		`- itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );`
	`43`	`+ MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`constexpr unsigned int Dimension = 3;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ int main( int argc, char * argv[] )`
`66`	`66`
`67`	`67`	`if( threads > 0 )`
`68`	`68`	`{`
`69`		`- itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );`
	`69`	`+ MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`constexpr unsigned int Dimension = 3;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ int main( int argc, char * argv[] )`
`81`	`81`
`82`	`82`	`if( threads > 0 )`
`83`	`83`	`{`
`84`		`- itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );`
	`84`	`+ MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`constexpr unsigned int Dimension = 3;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ int main(int argc, char * argv[])`
`40`	`40`
`41`	`41`	`if( threads > 0 )`
`42`	`42`	`{`
`43`		`- itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );`
	`43`	`+ MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`constexpr unsigned int Dimension = 3;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ int main( int argc, char * argv[] )`
`80`	`80`
`81`	`81`	`if( threads > 0 )`
`82`	`82`	`{`
`83`		`- itk::MultiThreader::SetGlobalDefaultNumberOfThreads( threads );`
	`83`	`+ MultiThreaderName::SetGlobalDefaultNumberOfThreads( threads );`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`constexpr unsigned int Dimension = 3;`