BUG: test compiled with rtk_add_cuda_test should use USE_CUDA

USE_CUDA is a compile flag defined by rtk_add_cuda_test. If RTK_USE_CUDA is used instead, rtk_add_test and rtk_add_cuda_test will compile the same tests
SimonRit · Jan 20, 2022 · f7dac1f · f7dac1f
1 parent 40e40d7
commit f7dac1f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/test/rtkadjointoperatorstest.cxx b/test/rtkadjointoperatorstest.cxx
@@ -8,7 +8,7 @@
 #include "rtkJosephForwardAttenuatedProjectionImageFilter.h"
 #include "rtkZengBackProjectionImageFilter.h"
 #include "rtkZengForwardProjectionImageFilter.h"
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 #  include "rtkCudaForwardProjectionImageFilter.h"
 #  include "rtkCudaRayCastBackProjectionImageFilter.h"
 #endif

diff --git a/test/rtkcyclicdeformationtest.cxx b/test/rtkcyclicdeformationtest.cxx
@@ -5,7 +5,7 @@
 #include "rtkTest.h"
 #include "rtkConstantImageSource.h"
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 #  include "rtkCudaCyclicDeformationImageFilter.h"
 #else
 #  include "rtkCyclicDeformationImageFilter.h"
@@ -30,7 +30,7 @@ main(int, char **)
 {
   using OutputPixelType = itk::CovariantVector<float, 3>;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using DVFSequenceImageType = itk::CudaImage<OutputPixelType, 4>;
   using DVFImageType = itk::CudaImage<OutputPixelType, 3>;
 #else

diff --git a/test/rtkcylindricaldetectorreconstructiontest.cxx b/test/rtkcylindricaldetectorreconstructiontest.cxx
@@ -27,7 +27,7 @@ main(int, char **)
   constexpr unsigned int Dimension = 3;
   using OutputPixelType = float;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using OutputImageType = itk::CudaImage<OutputPixelType, Dimension>;
 #else
   using OutputImageType = itk::Image<OutputPixelType, Dimension>;

diff --git a/test/rtkfourdconjugategradienttest.cxx b/test/rtkfourdconjugategradienttest.cxx
@@ -30,7 +30,7 @@ main(int, char **)
 {
   using OutputPixelType = float;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using VolumeSeriesType = itk::CudaImage<OutputPixelType, 4>;
   using ProjectionStackType = itk::CudaImage<OutputPixelType, 3>;
   using VolumeType = itk::CudaImage<OutputPixelType, 3>;

diff --git a/test/rtkfourdroostertest.cxx b/test/rtkfourdroostertest.cxx
@@ -32,7 +32,7 @@ main(int, char **)
 
   using DVFVectorType = itk::CovariantVector<OutputPixelType, 3>;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using VolumeSeriesType = itk::CudaImage<OutputPixelType, 4>;
   using ProjectionStackType = itk::CudaImage<OutputPixelType, 3>;
   using VolumeType = itk::CudaImage<OutputPixelType, 3>;

diff --git a/test/rtkfourdsarttest.cxx b/test/rtkfourdsarttest.cxx
@@ -31,7 +31,7 @@ main(int, char **)
 {
   using OutputPixelType = float;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using VolumeSeriesType = itk::CudaImage<OutputPixelType, 4>;
   using ProjectionStackType = itk::CudaImage<OutputPixelType, 3>;
   using VolumeType = itk::CudaImage<OutputPixelType, 3>;

diff --git a/test/rtkgaincorrectiontest.cxx b/test/rtkgaincorrectiontest.cxx
@@ -24,7 +24,7 @@
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIteratorWithIndex.h>
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 #  include "rtkCudaPolynomialGainCorrectionImageFilter.h"
 #else
 #  include "rtkPolynomialGainCorrectionImageFilter.h"
@@ -41,7 +41,7 @@
  */
 
 constexpr unsigned int Dimension = 3;
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 using InputImageType = itk::CudaImage<unsigned short, Dimension>;
 using OutputImageType = itk::CudaImage<float, Dimension>;
 #else
@@ -243,7 +243,7 @@ int
 main(int, char **)
 {
   const float K = 0.5f;
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using GainCorrectionType = rtk::CudaPolynomialGainCorrectionImageFilter;
 #else
   using GainCorrectionType = rtk::PolynomialGainCorrectionImageFilter<InputImageType, OutputImageType>;

diff --git a/test/rtklaplaciantest.cxx b/test/rtklaplaciantest.cxx
@@ -6,7 +6,7 @@
 #include "itkImageFileReader.h"
 #include "rtkConstantImageSource.h"
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 #  include "rtkCudaLaplacianImageFilter.h"
 #endif
 

diff --git a/test/rtkosemtest.cxx b/test/rtkosemtest.cxx
@@ -6,7 +6,7 @@
 #include "rtkConstantImageSource.h"
 #include "itkMaskImageFilter.h"
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 #  include "itkCudaImage.h"
 #endif
 #include "rtkOSEMConeBeamReconstructionFilter.h"
@@ -30,7 +30,7 @@ main(int, char **)
   constexpr unsigned int Dimension = 3;
   using OutputPixelType = float;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using OutputImageType = itk::CudaImage<OutputPixelType, Dimension>;
 #else
   using OutputImageType = itk::Image<OutputPixelType, Dimension>;

diff --git a/test/rtksarttest.cxx b/test/rtksarttest.cxx
@@ -5,7 +5,7 @@
 #include "rtkRayEllipsoidIntersectionImageFilter.h"
 #include "rtkConstantImageSource.h"
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
 #  include "itkCudaImage.h"
 #endif
 #include "rtkSARTConeBeamReconstructionFilter.h"
@@ -29,7 +29,7 @@ main(int, char **)
   constexpr unsigned int Dimension = 3;
   using OutputPixelType = float;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using OutputImageType = itk::CudaImage<OutputPixelType, Dimension>;
 #else
   using OutputImageType = itk::Image<OutputPixelType, Dimension>;

diff --git a/test/rtkwarpfourdtoprojectionstacktest.cxx b/test/rtkwarpfourdtoprojectionstacktest.cxx
@@ -32,7 +32,7 @@ main(int, char **)
 
   using DVFVectorType = itk::CovariantVector<OutputPixelType, 3>;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using VolumeSeriesType = itk::CudaImage<OutputPixelType, 4>;
   using ProjectionStackType = itk::CudaImage<OutputPixelType, 3>;
   using VolumeType = itk::CudaImage<OutputPixelType, 3>;
@@ -163,7 +163,7 @@ main(int, char **)
   PasteImageFilterType::Pointer pasteFilterStaticProjections = PasteImageFilterType::New();
   pasteFilterStaticProjections->SetDestinationImage(projectionsSource->GetOutput());
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   std::string signalFileName = "signal_bw_cuda.txt";
 #else
   std::string signalFileName = "signal_bw.txt";
@@ -380,7 +380,7 @@ main(int, char **)
   warpforwardproject->SetWeights(phaseReader->GetOutput());
   warpforwardproject->SetSignal(rtk::ReadSignalFile(signalFileName));
 
-#ifndef RTK_USE_CUDA
+#ifndef USE_CUDA
   std::cout
     << "\n\n****** Case 1: Non-warped joseph forward projection (warped forward projection exists only in CUDA) ******"
     << std::endl;

diff --git a/test/rtkwarpprojectionstacktofourdtest.cxx b/test/rtkwarpprojectionstacktofourdtest.cxx
@@ -33,7 +33,7 @@ main(int, char **)
 
   using DVFVectorType = itk::CovariantVector<OutputPixelType, 3>;
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
   using VolumeSeriesType = itk::CudaImage<OutputPixelType, 4>;
   using ProjectionStackType = itk::CudaImage<OutputPixelType, 3>;
   using VolumeType = itk::CudaImage<OutputPixelType, 3>;
@@ -166,7 +166,7 @@ main(int, char **)
     PasteImageFilterType::Pointer pasteFilterStaticProjections = PasteImageFilterType::New();
     pasteFilterStaticProjections->SetDestinationImage(projectionsSource->GetOutput());
 
-#ifdef RTK_USE_CUDA
+#ifdef USE_CUDA
     std::string signalFileName = "signal_fw_cuda.txt";
 #else
     std::string signalFileName = "signal_fw.txt";
@@ -366,7 +366,7 @@ main(int, char **)
     warpbackproject->SetWeights(phaseReader->GetOutput());
     warpbackproject->SetSignal(rtk::ReadSignalFile(signalFileName));
 
-#ifndef RTK_USE_CUDA
+#ifndef USE_CUDA
     std::cout << "\n\n****** Case " << 1 + 2 * radius
               << ": Non-warped voxel based back projection (warped back projection exists only in CUDA) ******"
               << std::endl;