Merge pull request #63 from dzenanz/master

COMP: update to new threading infrastructure and other minor fixes

Author: thewtex

src/Core/Common/ApplyAFilterOnlyToASpecifiedRegionOfAnImage/Code.cxx

@@ -40,7 +40,7 @@ int main(int, char *[])
 
   using RandomSourceType = itk::RandomImageSource<ImageType>;
   RandomSourceType::Pointer randomImageSource = RandomSourceType::New();
-  randomImageSource->SetNumberOfThreads(1); // to produce non-random results
+  randomImageSource->SetNumberOfWorkUnits(1); // to produce non-random results
   randomImageSource->SetSize(bigSize);
   randomImageSource->GetOutput()->SetRequestedRegion(smallSize);
 

src/Core/Common/DoDataParallelThreading/Code.cxx

@@ -101,7 +101,7 @@ class ComputeCellCountThreader :
     // on the current system.  It will also be truncated if, for example, the
     // number of cells in the CellContainer is smaller than the number of cores
     // available.
-    const itk::ThreadIdType numberOfThreads = this->GetNumberOfThreadsUsed();
+    const itk::ThreadIdType numberOfThreads = this->GetNumberOfWorkUnitsUsed();
     this->m_CellCountPerThread.resize( numberOfThreads );
     for( itk::ThreadIdType ii = 0; ii < numberOfThreads; ++ii )
       {
@@ -137,7 +137,7 @@ class ComputeCellCountThreader :
     {
     // Accumulate the cell counts per thread in the associate's total cell
     // count.
-    const itk::ThreadIdType numberOfThreads = this->GetNumberOfThreadsUsed();
+    const itk::ThreadIdType numberOfThreads = this->GetNumberOfWorkUnitsUsed();
     for( itk::ThreadIdType ii = 0; ii < numberOfThreads; ++ii )
       {
       this->m_Associate->m_CellCount[NEURON] +=

src/Core/Common/DuplicateAnImage/Code.cxx

@@ -30,7 +30,7 @@ int main(int, char *[])
   using RandomSourceType = itk::RandomImageSource< ImageType >;
 
   RandomSourceType::Pointer randomImageSource = RandomSourceType::New();
-  randomImageSource->SetNumberOfThreads(1); // to produce non-random results
+  randomImageSource->SetNumberOfWorkUnits(1); // to produce non-random results
 
   ImageType::Pointer image = randomImageSource->GetOutput();
 

src/Core/Common/FilterAndParallelizeImageRegion/Code.cxx

@@ -79,7 +79,7 @@ int main(int, char *[])
   randomImageSource->SetSize(region.GetSize());
   // we don't want overflow on 1+x operation, so set max pixel value
   randomImageSource->SetMax(itk::NumericTraits< PixelType >::max() - 1);
-  randomImageSource->SetNumberOfThreads(1); // to produce deterministic results
+  randomImageSource->SetNumberOfWorkUnits(1); // to produce deterministic results
   randomImageSource->Update();
 
   ImageType::Pointer image = randomImageSource->GetOutput();

src/Core/TestKernel/GenerateRandomImage/Code.cxx

@@ -42,7 +42,7 @@ int main(int argc, char* argv[])
 
   RandomImageSourceType::Pointer randomImageSource =
     RandomImageSourceType::New();
-  randomImageSource->SetNumberOfThreads(1); // to produce reproducible results
+  randomImageSource->SetNumberOfWorkUnits(1); // to produce reproducible results
   randomImageSource->SetSize( size );
 
   using WriterType = itk::ImageFileWriter< ImageType >;

src/Filtering/ImageIntensity/ApplyAtanImageFilter/Code.cxx

@@ -44,7 +44,7 @@ int main( int argc, char* argv[] )
 
   RandomImageSourceType::Pointer randomImageSource =
     RandomImageSourceType::New();
-  randomImageSource->SetNumberOfThreads(1); // to produce non-random results
+  randomImageSource->SetNumberOfWorkUnits(1); // to produce non-random results
   randomImageSource->SetSize(size);
 
   using OutputPixelType = float;

src/Registration/Metricsv4/PerformRegistrationOnVectorImages/Code.cxx

@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
       ++count;
     }
   metric->SetFixedSampledPointSet( pointSet );
-  metric->SetUseFixedSampledPointSet( true );
+  metric->SetUseSampledPointSet( true );
 
 
   // Assign images and transforms.
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
   // previously computed affine transformation.
   compositeTransform->SetOnlyMostRecentTransformToOptimizeOn();
   metric->SetMovingTransform( compositeTransform );
-  metric->SetUseFixedSampledPointSet( false );
+  metric->SetUseSampledPointSet( false );
   metric->Initialize();
 
   // Optimizer