Merge pull request #1797 from blowekamp/FixReproducibleNoiseTBB

blowekamp · web-flow · commit 62f3af122c36 · 2020-05-15T08:49:12.000-04:00
BUG: Disable dynamic threading in noise filter.
diff --git a/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.h
@@ -106,7 +106,7 @@ class ITK_TEMPLATE_EXPORT AdditiveGaussianNoiseImageFilter : public NoiseBaseIma
   PrintSelf(std::ostream & os, Indent indent) const override;
 
   void
-  DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) override;
+  ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) override;
 
 
 private:
diff --git a/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.hxx
@@ -30,14 +30,15 @@ template <class TInputImage, class TOutputImage>
 AdditiveGaussianNoiseImageFilter<TInputImage, TOutputImage>::AdditiveGaussianNoiseImageFilter()
 
 {
-  this->DynamicMultiThreadingOn();
+  this->DynamicMultiThreadingOff();
   this->ThreaderUpdateProgressOff();
 }
 
 template <class TInputImage, class TOutputImage>
 void
-AdditiveGaussianNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
-  const OutputImageRegionType & outputRegionForThread)
+AdditiveGaussianNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+  const OutputImageRegionType & outputRegionForThread,
+  ThreadIdType)
 {
   const InputImageType * inputPtr = this->GetInput();
   OutputImageType *      outputPtr = this->GetOutput(0);
diff --git a/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.h
@@ -126,7 +126,7 @@ class ITK_TEMPLATE_EXPORT SaltAndPepperNoiseImageFilter : public NoiseBaseImageF
   PrintSelf(std::ostream & os, Indent indent) const override;
 
   void
-  DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) override;
+  ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) override;
 
 private:
   double               m_Probability{ 0.01 };
diff --git a/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.hxx
@@ -31,14 +31,15 @@ SaltAndPepperNoiseImageFilter<TInputImage, TOutputImage>::SaltAndPepperNoiseImag
   : m_SaltValue(NumericTraits<OutputImagePixelType>::max())
   , m_PepperValue(NumericTraits<OutputImagePixelType>::NonpositiveMin())
 {
-  this->DynamicMultiThreadingOn();
+  this->DynamicMultiThreadingOff();
   this->ThreaderUpdateProgressOff();
 }
 
 template <class TInputImage, class TOutputImage>
 void
-SaltAndPepperNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
-  const OutputImageRegionType & outputRegionForThread)
+SaltAndPepperNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+  const OutputImageRegionType & outputRegionForThread,
+  ThreadIdType)
 {
   const InputImageType * inputPtr = this->GetInput();
   OutputImageType *      outputPtr = this->GetOutput(0);
diff --git a/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.h
@@ -143,7 +143,7 @@ class ITK_TEMPLATE_EXPORT ShotNoiseImageFilter : public NoiseBaseImageFilter<TIn
   PrintSelf(std::ostream & os, Indent indent) const override;
 
   void
-  DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) override;
+  ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) override;
 
 
 private:
diff --git a/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.hxx
@@ -31,14 +31,15 @@ template <class TInputImage, class TOutputImage>
 ShotNoiseImageFilter<TInputImage, TOutputImage>::ShotNoiseImageFilter()
 
 {
-  this->DynamicMultiThreadingOn();
+  this->DynamicMultiThreadingOff();
   this->ThreaderUpdateProgressOff();
 }
 
 template <class TInputImage, class TOutputImage>
 void
-ShotNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
-  const OutputImageRegionType & outputRegionForThread)
+ShotNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+  const OutputImageRegionType & outputRegionForThread,
+  ThreadIdType)
 {
   const InputImageType * inputPtr = this->GetInput();
   OutputImageType *      outputPtr = this->GetOutput(0);
diff --git a/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.h
@@ -102,7 +102,7 @@ class ITK_TEMPLATE_EXPORT SpeckleNoiseImageFilter : public NoiseBaseImageFilter<
   PrintSelf(std::ostream & os, Indent indent) const override;
 
   void
-  DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) override;
+  ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) override;
 
 private:
   double m_StandardDeviation{ 1.0 };
diff --git a/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.hxx
@@ -31,14 +31,15 @@ template <class TInputImage, class TOutputImage>
 SpeckleNoiseImageFilter<TInputImage, TOutputImage>::SpeckleNoiseImageFilter()
 
 {
-  this->DynamicMultiThreadingOn();
+  this->DynamicMultiThreadingOff();
   this->ThreaderUpdateProgressOff();
 }
 
 template <class TInputImage, class TOutputImage>
 void
-SpeckleNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
-  const OutputImageRegionType & outputRegionForThread)
+SpeckleNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+  const OutputImageRegionType & outputRegionForThread,
+  ThreadIdType)
 {
   const InputImageType * inputPtr = this->GetInput();
   OutputImageType *      outputPtr = this->GetOutput(0);

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,15 @@ template <class TInputImage, class TOutputImage>`
`30`	`30`	`AdditiveGaussianNoiseImageFilter<TInputImage, TOutputImage>::AdditiveGaussianNoiseImageFilter()`
`31`	`31`
`32`	`32`	`{`
`33`		`- this->DynamicMultiThreadingOn();`
	`33`	`+ this->DynamicMultiThreadingOff();`
`34`	`34`	`this->ThreaderUpdateProgressOff();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`template <class TInputImage, class TOutputImage>`
`38`	`38`	`void`
`39`		`-AdditiveGaussianNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(`
`40`		`- const OutputImageRegionType & outputRegionForThread)`
	`39`	`+AdditiveGaussianNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(`
	`40`	`+ const OutputImageRegionType & outputRegionForThread,`
	`41`	`+ ThreadIdType)`
`41`	`42`	`{`
`42`	`43`	`const InputImageType * inputPtr = this->GetInput();`
`43`	`44`	`OutputImageType * outputPtr = this->GetOutput(0);`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,15 @@ SaltAndPepperNoiseImageFilter<TInputImage, TOutputImage>::SaltAndPepperNoiseImag`
`31`	`31`	`: m_SaltValue(NumericTraits<OutputImagePixelType>::max())`
`32`	`32`	`, m_PepperValue(NumericTraits<OutputImagePixelType>::NonpositiveMin())`
`33`	`33`	`{`
`34`		`- this->DynamicMultiThreadingOn();`
	`34`	`+ this->DynamicMultiThreadingOff();`
`35`	`35`	`this->ThreaderUpdateProgressOff();`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`template <class TInputImage, class TOutputImage>`
`39`	`39`	`void`
`40`		`-SaltAndPepperNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(`
`41`		`- const OutputImageRegionType & outputRegionForThread)`
	`40`	`+SaltAndPepperNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(`
	`41`	`+ const OutputImageRegionType & outputRegionForThread,`
	`42`	`+ ThreadIdType)`
`42`	`43`	`{`
`43`	`44`	`const InputImageType * inputPtr = this->GetInput();`
`44`	`45`	`OutputImageType * outputPtr = this->GetOutput(0);`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,15 @@ template <class TInputImage, class TOutputImage>`
`31`	`31`	`ShotNoiseImageFilter<TInputImage, TOutputImage>::ShotNoiseImageFilter()`
`32`	`32`
`33`	`33`	`{`
`34`		`- this->DynamicMultiThreadingOn();`
	`34`	`+ this->DynamicMultiThreadingOff();`
`35`	`35`	`this->ThreaderUpdateProgressOff();`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`template <class TInputImage, class TOutputImage>`
`39`	`39`	`void`
`40`		`-ShotNoiseImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(`
`41`		`- const OutputImageRegionType & outputRegionForThread)`
	`40`	`+ShotNoiseImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(`
	`41`	`+ const OutputImageRegionType & outputRegionForThread,`
	`42`	`+ ThreadIdType)`
`42`	`43`	`{`
`43`	`44`	`const InputImageType * inputPtr = this->GetInput();`
`44`	`45`	`OutputImageType * outputPtr = this->GetOutput(0);`