diff --git a/CMake/VTKmWrappers.cmake b/CMake/VTKmWrappers.cmake index c0001aa9f..b8a28bdfd 100644 --- a/CMake/VTKmWrappers.cmake +++ b/CMake/VTKmWrappers.cmake @@ -270,6 +270,7 @@ endfunction(vtkm_library) # SOURCES # BACKEND # LIBRARIES +# DEFINES # TEST_ARGS # MPI # ALL_BACKENDS @@ -285,6 +286,8 @@ endfunction(vtkm_library) # # [LIBRARIES] : extra libraries that this set of tests need to link too # +# [DEFINES] : extra defines that need to be set for all unit test sources +# # [TEST_ARGS] : arguments that should be passed on the command line to the # test executable # @@ -301,7 +304,7 @@ function(vtkm_unit_tests) set(options) set(global_options ${options} MPI ALL_BACKENDS) set(oneValueArgs BACKEND NAME) - set(multiValueArgs SOURCES LIBRARIES TEST_ARGS) + set(multiValueArgs SOURCES LIBRARIES DEFINES TEST_ARGS) cmake_parse_arguments(VTKm_UT "${global_options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} @@ -370,6 +373,8 @@ function(vtkm_unit_tests) target_link_libraries(${test_prog} PRIVATE vtkm_cont ${VTKm_UT_LIBRARIES}) endif() + target_compile_definitions(${test_prog} PRIVATE ${VTKm_UT_DEFINES}) + foreach(current_backend ${all_backends}) set (device_command_line_argument --device=${current_backend}) if (current_backend STREQUAL "NO_BACKEND") diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt index b0c39b3b3..c02091c5a 100644 --- a/vtkm/cont/CMakeLists.txt +++ b/vtkm/cont/CMakeLists.txt @@ -121,15 +121,13 @@ set(template_sources set(sources ArrayHandle.cxx - ArrayHandleVirtual.cxx - CellLocator.cxx ColorTablePresets.cxx + DeviceAdapterTag.cxx EnvironmentTracker.cxx ErrorBadDevice.cxx ErrorBadType.cxx internal/ArrayHandleBasicImpl.cxx internal/ArrayManagerExecutionShareWithControl.cxx - internal/DeviceAdapterTag.cxx internal/TransferInfo.cxx internal/VirtualObjectTransfer.cxx Initialize.cxx @@ -137,16 +135,17 @@ set(sources RuntimeDeviceTracker.cxx StorageBasic.cxx TryExecute.cxx - VariantArrayHandle.cxx ) -# This list of sources has code that uses devices and so might need to be -# compiled with a device-specific compiler (like CUDA). -set(device_sources + # This list of sources has code that uses devices and so might need to be + # compiled with a device-specific compiler (like CUDA). + set(device_sources + ArrayHandleVirtual.cxx ArrayRangeCompute.cxx AssignerMultiBlock.cxx BoundsCompute.cxx BoundsGlobalCompute.cxx + CellLocator.cxx CellLocatorBoundingIntervalHierarchy.cxx CellLocatorGeneral.cxx CellLocatorRectilinearGrid.cxx @@ -161,6 +160,7 @@ set(device_sources DataSetBuilderExplicit.cxx DataSetBuilderRectilinear.cxx DataSetBuilderUniform.cxx + internal/VariantArrayHandleContainer.cxx Field.cxx FieldRangeCompute.cxx FieldRangeGlobalCompute.cxx diff --git a/vtkm/cont/internal/DeviceAdapterTag.cxx b/vtkm/cont/DeviceAdapterTag.cxx similarity index 100% rename from vtkm/cont/internal/DeviceAdapterTag.cxx rename to vtkm/cont/DeviceAdapterTag.cxx diff --git a/vtkm/cont/ExecutionObjectBase.h b/vtkm/cont/ExecutionObjectBase.h index fcf758e2e..ccfce8035 100644 --- a/vtkm/cont/ExecutionObjectBase.h +++ b/vtkm/cont/ExecutionObjectBase.h @@ -12,7 +12,7 @@ #include -#include +#include namespace vtkm { diff --git a/vtkm/cont/arg/testing/CMakeLists.txt b/vtkm/cont/arg/testing/CMakeLists.txt index ce7bfbc14..ecaac866a 100644 --- a/vtkm/cont/arg/testing/CMakeLists.txt +++ b/vtkm/cont/arg/testing/CMakeLists.txt @@ -22,4 +22,4 @@ set(unit_tests UnitTestTypeCheckKeys.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) diff --git a/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h index efd74e261..60dbda1b1 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h @@ -15,8 +15,10 @@ //We always create the cuda tag when included, but we only mark it as //a valid tag when VTKM_CUDA is true. This is for easier development //of multi-backend systems -#ifdef VTKM_CUDA +#if defined(VTKM_CUDA) && defined(VTKM_ENABLE_CUDA) VTKM_VALID_DEVICE_ADAPTER(Cuda, VTKM_DEVICE_ADAPTER_CUDA); +#elif defined(VTKM_ENABLE_CUDA) && !defined(VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) +#error When VTK-m is build with CUDA enabled all compilation units that include DeviceAdapterTagCuda must use the cuda compiler #else VTKM_INVALID_DEVICE_ADAPTER(Cuda, VTKM_DEVICE_ADAPTER_CUDA); #endif diff --git a/vtkm/cont/cuda/testing/UnitTestCudaMath.cu b/vtkm/cont/cuda/testing/UnitTestCudaMath.cu index 3ef8ce618..c6adf164f 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaMath.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaMath.cu @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/vtkm/cont/VariantArrayHandle.cxx b/vtkm/cont/internal/VariantArrayHandleContainer.cxx similarity index 83% rename from vtkm/cont/VariantArrayHandle.cxx rename to vtkm/cont/internal/VariantArrayHandleContainer.cxx index b8c700b26..5fd77ae4a 100644 --- a/vtkm/cont/VariantArrayHandle.cxx +++ b/vtkm/cont/internal/VariantArrayHandleContainer.cxx @@ -11,10 +11,8 @@ #include #include -#include - #include -#include +#include namespace vtkm { @@ -40,8 +38,9 @@ VariantArrayHandleContainerBase::~VariantArrayHandleContainerBase() namespace detail { -void ThrowCastAndCallException(const vtkm::cont::internal::VariantArrayHandleContainerBase& ref, - const std::type_info& type) +VTKM_CONT_EXPORT void ThrowCastAndCallException( + const vtkm::cont::internal::VariantArrayHandleContainerBase& ref, + const std::type_info& type) { std::ostringstream out; out << "Could not find appropriate cast for array in CastAndCall1.\n" diff --git a/vtkm/cont/internal/testing/CMakeLists.txt b/vtkm/cont/internal/testing/CMakeLists.txt index adc68bcc4..9a7ce997f 100644 --- a/vtkm/cont/internal/testing/CMakeLists.txt +++ b/vtkm/cont/internal/testing/CMakeLists.txt @@ -15,4 +15,4 @@ set(unit_tests UnitTestDynamicTransform.cxx UnitTestIteratorFromArrayPortal.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) diff --git a/vtkm/cont/openmp/testing/CMakeLists.txt b/vtkm/cont/openmp/testing/CMakeLists.txt index 8f9657c45..d21140d96 100644 --- a/vtkm/cont/openmp/testing/CMakeLists.txt +++ b/vtkm/cont/openmp/testing/CMakeLists.txt @@ -25,7 +25,7 @@ set(unit_tests UnitTestOpenMPPointLocatorUniformGrid.cxx UnitTestOpenMPVirtualObjectHandle.cxx ) -vtkm_unit_tests(OpenMP SOURCES ${unit_tests}) +vtkm_unit_tests(OpenMP SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) if (VTKm_ENABLE_TESTING) #We need to have all OpenMP tests run serially as they diff --git a/vtkm/cont/serial/testing/CMakeLists.txt b/vtkm/cont/serial/testing/CMakeLists.txt index dba44940f..6f24b75bb 100644 --- a/vtkm/cont/serial/testing/CMakeLists.txt +++ b/vtkm/cont/serial/testing/CMakeLists.txt @@ -26,4 +26,4 @@ set(unit_tests UnitTestSerialPointLocatorUniformGrid.cxx UnitTestSerialVirtualObjectHandle.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) diff --git a/vtkm/cont/tbb/testing/CMakeLists.txt b/vtkm/cont/tbb/testing/CMakeLists.txt index eb2c8f6dc..066fc4607 100644 --- a/vtkm/cont/tbb/testing/CMakeLists.txt +++ b/vtkm/cont/tbb/testing/CMakeLists.txt @@ -26,4 +26,4 @@ set(unit_tests UnitTestTBBVirtualObjectHandle.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) diff --git a/vtkm/cont/testing/CMakeLists.txt b/vtkm/cont/testing/CMakeLists.txt index dd29436de..09310d329 100644 --- a/vtkm/cont/testing/CMakeLists.txt +++ b/vtkm/cont/testing/CMakeLists.txt @@ -78,8 +78,7 @@ set(unit_tests UnitTestTryExecute.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) - +vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) # add distributed tests i.e. test to run with MPI # if MPI is enabled. @@ -88,4 +87,4 @@ set(mpi_unit_tests UnitTestSerializationArrayHandle.cxx UnitTestSerializationDataSet.cxx ) -vtkm_unit_tests(MPI SOURCES ${mpi_unit_tests}) +vtkm_unit_tests(MPI SOURCES ${mpi_unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) diff --git a/vtkm/exec/cuda/internal/testing/UnitTestTaskStrided.cu b/vtkm/exec/cuda/internal/testing/UnitTestTaskStrided.cu index 50ce753c4..4df6bdb92 100644 --- a/vtkm/exec/cuda/internal/testing/UnitTestTaskStrided.cu +++ b/vtkm/exec/cuda/internal/testing/UnitTestTaskStrided.cu @@ -7,8 +7,8 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. //============================================================================ - #include +#include #include #include @@ -20,8 +20,6 @@ #include #include -#include - #if defined(VTKM_MSVC) #pragma warning(push) #pragma warning(disable : 4068) //unknown pragma @@ -372,8 +370,7 @@ void TestTaskStrided() int UnitTestTaskStrided(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run( - TestTaskStrided, argc, argv); + return vtkm::testing::Testing::Run(TestTaskStrided, argc, argv); } #if defined(__NVCC__) && defined(__CUDACC_VER_MAJOR__) diff --git a/vtkm/exec/internal/testing/TestingTaskTiling.h b/vtkm/exec/internal/testing/TestingTaskTiling.h index 97a5ad3c4..53f9ca6ea 100644 --- a/vtkm/exec/internal/testing/TestingTaskTiling.h +++ b/vtkm/exec/internal/testing/TestingTaskTiling.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx b/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx index 7a13ce583..fca516547 100644 --- a/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx +++ b/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx @@ -20,7 +20,6 @@ #include #include - namespace { diff --git a/vtkm/exec/openmp/internal/testing/UnitTestTaskTilingOpenMP.cxx b/vtkm/exec/openmp/internal/testing/UnitTestTaskTilingOpenMP.cxx index ad768f222..9134529dd 100644 --- a/vtkm/exec/openmp/internal/testing/UnitTestTaskTilingOpenMP.cxx +++ b/vtkm/exec/openmp/internal/testing/UnitTestTaskTilingOpenMP.cxx @@ -9,9 +9,10 @@ //============================================================================ #include #include +#include int UnitTestTaskTilingOpenMP(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run( + return vtkm::testing::Testing::Run( vtkm::exec::internal::testing::TestTaskTiling, argc, argv); } diff --git a/vtkm/exec/serial/internal/testing/UnitTestTaskTilingSerial.cxx b/vtkm/exec/serial/internal/testing/UnitTestTaskTilingSerial.cxx index 931929ed5..280d8a800 100644 --- a/vtkm/exec/serial/internal/testing/UnitTestTaskTilingSerial.cxx +++ b/vtkm/exec/serial/internal/testing/UnitTestTaskTilingSerial.cxx @@ -7,13 +7,13 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. //============================================================================ - #include #include +#include int UnitTestTaskTilingSerial(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run( + return vtkm::testing::Testing::Run( vtkm::exec::internal::testing::TestTaskTiling, argc, argv); } diff --git a/vtkm/exec/tbb/internal/testing/UnitTestTaskTilingTBB.cxx b/vtkm/exec/tbb/internal/testing/UnitTestTaskTilingTBB.cxx index b519acbc9..7c764e14d 100644 --- a/vtkm/exec/tbb/internal/testing/UnitTestTaskTilingTBB.cxx +++ b/vtkm/exec/tbb/internal/testing/UnitTestTaskTilingTBB.cxx @@ -7,12 +7,12 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. //============================================================================ - #include #include +#include int UnitTestTaskTilingTBB(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run( + return vtkm::testing::Testing::Run( vtkm::exec::internal::testing::TestTaskTiling, argc, argv); } diff --git a/vtkm/internal/testing/UnitTestArrayPortalValueReference.cxx b/vtkm/internal/testing/UnitTestArrayPortalValueReference.cxx index 4d7ffe042..a1ea891b9 100644 --- a/vtkm/internal/testing/UnitTestArrayPortalValueReference.cxx +++ b/vtkm/internal/testing/UnitTestArrayPortalValueReference.cxx @@ -8,13 +8,11 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#include - -#include +#include #include - -#include +#include +#include namespace { @@ -304,5 +302,5 @@ void DoTest() int UnitTestArrayPortalValueReference(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run(DoTest, argc, argv); + return vtkm::testing::Testing::Run(DoTest, argc, argv); } diff --git a/vtkm/internal/testing/UnitTestFunctionInterface.cxx b/vtkm/internal/testing/UnitTestFunctionInterface.cxx index ad9d41819..4c42e0a8b 100644 --- a/vtkm/internal/testing/UnitTestFunctionInterface.cxx +++ b/vtkm/internal/testing/UnitTestFunctionInterface.cxx @@ -7,12 +7,8 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. //============================================================================ - #include - -#include - -#include +#include #include #include @@ -21,6 +17,9 @@ // the most critical invoke (for the instance of a worklet) does not directly // use the Invoke method. //#define TEST_INVOKE_TIME +#ifdef TEST_INVOKE_TIME +#include +#endif namespace { @@ -532,5 +531,5 @@ void TestFunctionInterface() int UnitTestFunctionInterface(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run(TestFunctionInterface, argc, argv); + return vtkm::testing::Testing::Run(TestFunctionInterface, argc, argv); } diff --git a/vtkm/interop/testing/CMakeLists.txt b/vtkm/interop/testing/CMakeLists.txt index e718a39d4..afa50e42d 100644 --- a/vtkm/interop/testing/CMakeLists.txt +++ b/vtkm/interop/testing/CMakeLists.txt @@ -42,5 +42,8 @@ elseif(VTKm_ENABLE_GL_CONTEXT AND TARGET vtkm_rendering) endif() if(unit_tests) - vtkm_unit_tests(SOURCES ${unit_tests} LIBRARIES vtkm_rendering GLUT::GLUT) + vtkm_unit_tests(SOURCES ${unit_tests} + LIBRARIES vtkm_rendering GLUT::GLUT + DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG) + endif() diff --git a/vtkm/io/reader/testing/CMakeLists.txt b/vtkm/io/reader/testing/CMakeLists.txt index ee0aa9291..d2f86da39 100644 --- a/vtkm/io/reader/testing/CMakeLists.txt +++ b/vtkm/io/reader/testing/CMakeLists.txt @@ -12,4 +12,4 @@ set(unit_tests UnitTestVTKDataSetReader.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} ALL_BACKENDS) diff --git a/vtkm/io/writer/testing/CMakeLists.txt b/vtkm/io/writer/testing/CMakeLists.txt index e00f709fd..589c0738b 100644 --- a/vtkm/io/writer/testing/CMakeLists.txt +++ b/vtkm/io/writer/testing/CMakeLists.txt @@ -12,4 +12,4 @@ set(unit_tests UnitTestVTKDataSetWriter.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} ALL_BACKENDS) diff --git a/vtkm/rendering/AxisAnnotation.h b/vtkm/rendering/AxisAnnotation.h index 7d5075f67..2fac7e79b 100644 --- a/vtkm/rendering/AxisAnnotation.h +++ b/vtkm/rendering/AxisAnnotation.h @@ -12,7 +12,6 @@ #include -#include #include #include #include diff --git a/vtkm/rendering/CMakeLists.txt b/vtkm/rendering/CMakeLists.txt index ae493463a..d82c708cc 100644 --- a/vtkm/rendering/CMakeLists.txt +++ b/vtkm/rendering/CMakeLists.txt @@ -78,34 +78,67 @@ set(headers ) set(sources + BitmapFont.cxx + BitmapFontFactory.cxx + + Camera.cxx + Color.cxx + DecodePNG.cxx + raytracing/Logger.cxx + ) + +# This list of sources has code that uses devices and so might need to be +# compiled with a device-specific compiler (like CUDA). +set(device_sources + Actor.cxx AxisAnnotation.cxx AxisAnnotation2D.cxx AxisAnnotation3D.cxx - BitmapFont.cxx - BitmapFontFactory.cxx BoundingBoxAnnotation.cxx - Camera.cxx - Color.cxx + Canvas.cxx + CanvasRayTracer.cxx ColorBarAnnotation.cxx ColorLegendAnnotation.cxx - DecodePNG.cxx + ConnectivityProxy.cxx LineRenderer.cxx + Mapper.cxx MapperConnectivity.cxx MapperCylinder.cxx MapperPoint.cxx MapperQuad.cxx MapperRayTracer.cxx MapperVolume.cxx + MapperWireframer.cxx Scene.cxx TextAnnotation.cxx TextAnnotationBillboard.cxx TextAnnotationScreen.cxx + TextRenderer.cxx View.cxx View1D.cxx View2D.cxx View3D.cxx WorldAnnotator.cxx - raytracing/Logger.cxx + + internal/RunTriangulator.cxx + raytracing/BoundingVolumeHierarchy.cxx + raytracing/Camera.cxx + raytracing/ChannelBuffer.cxx + raytracing/ConnectivityTracer.cxx + raytracing/CylinderExtractor.cxx + raytracing/CylinderIntersector.cxx + raytracing/MeshConnectivityBuilder.cxx + raytracing/MeshConnectivityContainers.cxx + raytracing/QuadExtractor.cxx + raytracing/QuadIntersector.cxx + raytracing/RayTracer.cxx + raytracing/RayOperations.cxx + raytracing/ShapeIntersector.cxx + raytracing/SphereExtractor.cxx + raytracing/SphereIntersector.cxx + raytracing/TriangleExtractor.cxx + raytracing/TriangleIntersector.cxx + raytracing/VolumeRendererStructured.cxx ) # Note that EGL and OSMesa Canvas depend on the GL version being built. Only @@ -140,38 +173,6 @@ set(osmesa_sources CanvasOSMesa.cxx ) -# This list of sources has code that uses devices and so might need to be -# compiled with a device-specific compiler (like CUDA). -set(device_sources - Actor.cxx - Canvas.cxx - CanvasRayTracer.cxx - ConnectivityProxy.cxx - Mapper.cxx - MapperWireframer.cxx - TextRenderer.cxx - - internal/RunTriangulator.cxx - raytracing/BoundingVolumeHierarchy.cxx - raytracing/Camera.cxx - raytracing/ChannelBuffer.cxx - raytracing/ConnectivityTracer.cxx - raytracing/CylinderExtractor.cxx - raytracing/CylinderIntersector.cxx - raytracing/MeshConnectivityBuilder.cxx - raytracing/MeshConnectivityContainers.cxx - raytracing/QuadExtractor.cxx - raytracing/QuadIntersector.cxx - raytracing/RayTracer.cxx - raytracing/RayOperations.cxx - raytracing/ShapeIntersector.cxx - raytracing/SphereExtractor.cxx - raytracing/SphereIntersector.cxx - raytracing/TriangleExtractor.cxx - raytracing/TriangleIntersector.cxx - raytracing/VolumeRendererStructured.cxx - ) - #----------------------------------------------------------------------------- vtkm_library( NAME vtkm_rendering @@ -196,9 +197,8 @@ endif() #----------------------------------------------------------------------------- target_link_libraries(vtkm_rendering PUBLIC vtkm_filter) - if(UNIX AND NOT APPLE) - target_link_libraries(vtkm_rendering PRIVATE rt ) + target_link_libraries(vtkm_rendering PRIVATE rt) endif() #----------------------------------------------------------------------------- diff --git a/vtkm/rendering/Texture2D.h b/vtkm/rendering/Texture2D.h index cd77ea897..9c563fe5a 100644 --- a/vtkm/rendering/Texture2D.h +++ b/vtkm/rendering/Texture2D.h @@ -13,8 +13,6 @@ #include #include -#include -#include #include namespace vtkm diff --git a/vtkm/testing/TestingMath.h b/vtkm/testing/TestingMath.h index 1910dc9c6..acde0be2f 100644 --- a/vtkm/testing/TestingMath.h +++ b/vtkm/testing/TestingMath.h @@ -19,8 +19,6 @@ #include -#include - #include #define VTKM_MATH_ASSERT(condition, message) \ diff --git a/vtkm/testing/UnitTestMath.cxx b/vtkm/testing/UnitTestMath.cxx index 9fe4f4bc6..79f7ad2b6 100644 --- a/vtkm/testing/UnitTestMath.cxx +++ b/vtkm/testing/UnitTestMath.cxx @@ -8,13 +8,13 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ +#include #include #include -#include int UnitTestMath(int argc, char* argv[]) { - return vtkm::cont::testing::Testing::Run( + return vtkm::testing::Testing::Run( UnitTestMathNamespace::RunMathTests, argc, argv); } diff --git a/vtkm/worklet/internal/testing/CMakeLists.txt b/vtkm/worklet/internal/testing/CMakeLists.txt index 859b5e415..30fec2e66 100644 --- a/vtkm/worklet/internal/testing/CMakeLists.txt +++ b/vtkm/worklet/internal/testing/CMakeLists.txt @@ -12,4 +12,4 @@ set(unit_tests UnitTestDispatcherBase.cxx ) -vtkm_unit_tests(SOURCES ${unit_tests}) +vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG)