From d41e1e40f0ef5f39cc3bad143c7a8599db0987e0 Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Wed, 9 Feb 2022 16:15:08 -0700 Subject: [PATCH 1/2] remove ALL_BACKENDS --- vtkm/cont/RuntimeDeviceInformation.cxx | 1 - vtkm/filter/field_transform/testing/CMakeLists.txt | 1 - vtkm/filter/vector_analysis/testing/CMakeLists.txt | 1 - vtkm/random/testing/CMakeLists.txt | 3 +-- vtkm/source/testing/CMakeLists.txt | 6 +----- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/vtkm/cont/RuntimeDeviceInformation.cxx b/vtkm/cont/RuntimeDeviceInformation.cxx index a78732ae2..0efc5b9a6 100644 --- a/vtkm/cont/RuntimeDeviceInformation.cxx +++ b/vtkm/cont/RuntimeDeviceInformation.cxx @@ -195,7 +195,6 @@ struct VTKM_NEVER_EXPORT InitializeDeviceMemoryManagers if (id > 0 && id < VTKM_MAX_DEVICE_ADAPTER_ID) { - auto name = vtkm::cont::DeviceAdapterTraits::GetName(); this->Managers[id].reset(new vtkm::cont::internal::DeviceAdapterMemoryManager); } } diff --git a/vtkm/filter/field_transform/testing/CMakeLists.txt b/vtkm/filter/field_transform/testing/CMakeLists.txt index f4462db77..8368b3f57 100644 --- a/vtkm/filter/field_transform/testing/CMakeLists.txt +++ b/vtkm/filter/field_transform/testing/CMakeLists.txt @@ -35,6 +35,5 @@ endif() vtkm_unit_tests( SOURCES ${unit_tests} LIBRARIES ${libraries} - ALL_BACKENDS # renderer requires device compiler USE_VTKM_JOB_POOL ) diff --git a/vtkm/filter/vector_analysis/testing/CMakeLists.txt b/vtkm/filter/vector_analysis/testing/CMakeLists.txt index 4960f8b9e..375e805e8 100644 --- a/vtkm/filter/vector_analysis/testing/CMakeLists.txt +++ b/vtkm/filter/vector_analysis/testing/CMakeLists.txt @@ -34,6 +34,5 @@ endif() vtkm_unit_tests( SOURCES ${unit_tests} LIBRARIES ${libraries} - ALL_BACKENDS # RendererTest needs device compiler USE_VTKM_JOB_POOL ) diff --git a/vtkm/random/testing/CMakeLists.txt b/vtkm/random/testing/CMakeLists.txt index 9158d0372..071a320b0 100644 --- a/vtkm/random/testing/CMakeLists.txt +++ b/vtkm/random/testing/CMakeLists.txt @@ -11,5 +11,4 @@ set(unit_tests UnitTestPhiloxRNG.cxx) -vtkm_unit_tests(SOURCES ${unit_tests} - ALL_BACKENDS) +vtkm_unit_tests(SOURCES ${unit_tests}) diff --git a/vtkm/source/testing/CMakeLists.txt b/vtkm/source/testing/CMakeLists.txt index a8e1508f6..38260af0a 100644 --- a/vtkm/source/testing/CMakeLists.txt +++ b/vtkm/source/testing/CMakeLists.txt @@ -25,11 +25,7 @@ if (VTKm_ENABLE_RENDERING) RenderTestPerlinNoise.cxx ) - # Currently to use the rendering in VTK-m, you have to compile with a device compiler. - # We hope to change that in the near future, but until then we need to add the - # `ALL_BACKENDS` flag to `vtkm_unit_tests` to compile with the device compiler. Here - # is a hack to add it. - list(APPEND unit_tests ALL_BACKENDS) + list(APPEND unit_tests) endif() vtkm_unit_tests( From 05d34aa8a4336faa2e46d117c1a651a7b8b3513f Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Thu, 10 Feb 2022 06:40:43 -0700 Subject: [PATCH 2/2] delete unneeded list append --- vtkm/source/testing/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/vtkm/source/testing/CMakeLists.txt b/vtkm/source/testing/CMakeLists.txt index 38260af0a..cbdc4e03d 100644 --- a/vtkm/source/testing/CMakeLists.txt +++ b/vtkm/source/testing/CMakeLists.txt @@ -24,8 +24,6 @@ if (VTKm_ENABLE_RENDERING) list(APPEND unit_tests RenderTestPerlinNoise.cxx ) - - list(APPEND unit_tests) endif() vtkm_unit_tests(