Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Attempt 13 to resolve Windows compiler warning with streaming storage

Browse Source
This commit is contained in:
Christopher Sewell 2016-10-21 16:08:13 -06:00
parent 92d686fccd
commit 93d7956daf
18 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/CMakeLists.txt
View File

@ -51,7 +51,7 @@ vtkm_declare_headers(${headers})
#-----------------------------------------------------------------------------
#first add all the components vtkm that are shared between control and exec
#add_subdirectory(testing)
add_subdirectory(testing)
add_subdirectory(internal)
#-----------------------------------------------------------------------------
@ -70,7 +70,7 @@ add_subdirectory(filter)
#-----------------------------------------------------------------------------
# Build rendering
if(VTKm_ENABLE_RENDERING)
# add_subdirectory(rendering)
add_subdirectory(rendering)
endif()
add_subdirectory(interop)

4
vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h
View File

@ -591,7 +591,7 @@ public:
return GetExecutionValue(output, numValues-1);
}
//#if 0
#if 0
//--------------------------------------------------------------------------
// Streaming inclusive scan
template<typename T, class CIn, class COut>
@ -650,7 +650,7 @@ public:
}
return lastResult;
}
//#endif
#endif
//--------------------------------------------------------------------------
// Sort
template<typename T, class Storage, class BinaryCompare>

2
vtkm/exec/CMakeLists.txt
View File

@ -43,4 +43,4 @@ add_subdirectory(cuda)
#-----------------------------------------------------------------------------
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/exec/arg/CMakeLists.txt
View File

@ -43,4 +43,4 @@ vtkm_declare_headers(${headers})
#-----------------------------------------------------------------------------
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/exec/cuda/internal/CMakeLists.txt
View File

@ -38,6 +38,6 @@ set_source_files_properties(ThrustPatches.h
#-----------------------------------------------------------------------------
if (VTKm_ENABLE_CUDA)
# add_subdirectory(testing)
add_subdirectory(testing)
endif()

2
vtkm/exec/internal/CMakeLists.txt
View File

@ -30,4 +30,4 @@ vtkm_declare_headers(${headers})
vtkm_pyexpander_generated_file(WorkletInvokeFunctorDetail.h)
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/filter/CMakeLists.txt
View File

@ -62,5 +62,5 @@ vtkm_install_template_sources(${header_template_sources})
add_subdirectory(internal)
#-----------------------------------------------------------------------------
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/internal/CMakeLists.txt
View File

@ -68,5 +68,5 @@ vtkm_declare_headers(${headers})
vtkm_pyexpander_generated_file(FunctionInterfaceDetailPre.h)
vtkm_pyexpander_generated_file(FunctionInterfaceDetailPost.h)
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/interop/CMakeLists.txt
View File

@ -46,5 +46,5 @@ if(VTKm_ENABLE_OPENGL_INTEROP)
#-----------------------------------------------------------------------------
vtkm_declare_headers(${headers})
# add_subdirectory(testing)
add_subdirectory(testing)
endif()

2
vtkm/interop/cuda/CMakeLists.txt
View File

@ -30,5 +30,5 @@ vtkm_declare_headers(CUDA ${headers})
add_subdirectory(internal)
if(VTKm_ENABLE_OPENGL_TESTS)
# add_subdirectory(testing)
add_subdirectory(testing)
endif()

2
vtkm/interop/internal/CMakeLists.txt
View File

@ -27,4 +27,4 @@ set(headers
#-----------------------------------------------------------------------------
vtkm_declare_headers(${headers})
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/io/reader/CMakeLists.txt
View File

@ -29,4 +29,4 @@ set(headers
vtkm_declare_headers(${headers})
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/io/writer/CMakeLists.txt
View File

@ -25,4 +25,4 @@ set(headers
vtkm_declare_headers(${headers})
#-----------------------------------------------------------------------------
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/rendering/CMakeLists.txt
View File

@ -167,4 +167,4 @@ add_subdirectory(raytracing)
#-----------------------------------------------------------------------------
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/worklet/CMakeLists.txt
View File

@ -57,4 +57,4 @@ vtkm_declare_headers(${headers})
#-----------------------------------------------------------------------------
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/worklet/internal/CMakeLists.txt
View File

@ -27,4 +27,4 @@ set(headers
vtkm_declare_headers(${headers})
#add_subdirectory(testing)
add_subdirectory(testing)

2
vtkm/worklet/testing/CMakeLists.txt
View File

@ -28,7 +28,7 @@ set(unit_tests
UnitTestPointElevation.cxx
UnitTestScatterCounting.cxx
UnitTestSplatKernels.cxx
# UnitTestStreamingSine.cxx
UnitTestStreamingSine.cxx
UnitTestStreamLineUniformGrid.cxx
UnitTestTetrahedralizeExplicitGrid.cxx
UnitTestTetrahedralizeUniformGrid.cxx

9
vtkm/worklet/testing/UnitTestStreamingSine.cxx
View File

@ -91,11 +91,12 @@ void TestStreamingSine()
reference = vtkm::cont::make_ArrayHandle(test);
compareArrays(input, output, reference, "Wrong result for streaming sine worklet");
vtkm::Float32 referenceSum, streamSum;
/*
// Test the streaming inclusive scan
std::cout << "Testing streaming inclusive scan: " << std::endl;
vtkm::Float32 referenceSum = DeviceAlgorithms::ScanInclusive(input, summation);
vtkm::Float32 streamSum = DeviceAlgorithms::StreamingScanInclusive(4, input, output);
referenceSum = DeviceAlgorithms::ScanInclusive(input, summation);
streamSum = DeviceAlgorithms::StreamingScanInclusive(4, input, output);
VTKM_TEST_ASSERT(test_equal(streamSum, referenceSum, 0.01f), "Wrong sum for streaming inclusive scan");
compareArrays(input, output, summation, "Wrong result for streaming inclusive scan");
@ -105,7 +106,7 @@ void TestStreamingSine()
streamSum = DeviceAlgorithms::StreamingScanInclusive(4, input, output, vtkm::Maximum());
VTKM_TEST_ASSERT(test_equal(streamSum, referenceSum, 0.01f), "Wrong sum for streaming inclusive scan with binary operator");
compareArrays(input, output, summation, "Wrong result for streaming inclusive scan with binary operator");
*/
// Test the streaming exclusive scan
std::cout << "Testing streaming exclusive scan: " << std::endl;
referenceSum = DeviceAlgorithms::ScanExclusive(input, summation);