From 5608615970670770ce771f7779fdd35bc4cd089e Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Fri, 5 Oct 2018 09:01:37 -0600 Subject: [PATCH 1/2] Disable header testing in PPP2 mesh_dem_meshtypes For some unknown reason, on windows these header tests were producing the following errors: fatal error C1041: cannot open program database There might be a better way around this, but the easiest way is to simply remove those test builds. --- .../mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt | 2 ++ .../mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt | 2 ++ .../mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt b/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt index 5609fc50c..d3f564fbe 100644 --- a/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt +++ b/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt @@ -66,6 +66,8 @@ set(headers ExecutionObject_MeshStructure.h Types.h + # Testing on windows causes access issues with compiler database files for some reason + TESTABLE OFF ) #----------------------------------------------------------------------------- diff --git a/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt b/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt index 5609fc50c..d3f564fbe 100644 --- a/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt +++ b/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt @@ -66,6 +66,8 @@ set(headers ExecutionObject_MeshStructure.h Types.h + # Testing on windows causes access issues with compiler database files for some reason + TESTABLE OFF ) #----------------------------------------------------------------------------- diff --git a/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt b/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt index 5609fc50c..d3f564fbe 100644 --- a/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt +++ b/vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt @@ -66,6 +66,8 @@ set(headers ExecutionObject_MeshStructure.h Types.h + # Testing on windows causes access issues with compiler database files for some reason + TESTABLE OFF ) #----------------------------------------------------------------------------- From cd8b41f4783b1049592ee6c775dde2ba3d50aa7b Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Fri, 5 Oct 2018 09:08:19 -0600 Subject: [PATCH 2/2] Fix type conversion warnings Make the types consistent in an std::accumulate call. Previously it was taking vtkm::Id values, multiplying them as std::size_t, and then storing them in an int. Now, the std::accumulate does everything as a vtkm::Id and at the end converts the result to an std::size_t. --- examples/contour_tree_augmented/ContourTreeApp.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/contour_tree_augmented/ContourTreeApp.cxx b/examples/contour_tree_augmented/ContourTreeApp.cxx index dd7687d55..1af6e2014 100644 --- a/examples/contour_tree_augmented/ContourTreeApp.cxx +++ b/examples/contour_tree_augmented/ContourTreeApp.cxx @@ -246,9 +246,8 @@ int main(int argc, char* argv[]) // Compute the number of vertices, i.e., xdim * ydim * zdim auto nDims = dims.size(); - std::vector::size_type nVertices = - std::vector::size_type(std::accumulate( - dims.begin(), dims.end(), 1, std::multiplies::size_type>())); + std::vector::size_type nVertices = std::vector::size_type( + std::accumulate(dims.begin(), dims.end(), vtkm::Id(1), std::multiplies())); // Print the mesh metadata std::cout << "Number of dimensions: " << nDims << std::endl;