Commit 3d13a10e authored by Sujin Philip's avatar Sujin Philip

Update to latest VTK-m

Brings in compatibilty changes for cuda 10.
parent 7e1821f0
......@@ -25,7 +25,6 @@ set(lib_srcs
vtkmlib/UnstructuredGridConverter.cxx
vtkmlib/ArrayConverters.cxx
vtkmlib/CellSetConverters.cxx
vtkmlib/DataSetConverters.cxx
vtkmlib/ImageDataConverter.cxx
vtkmlib/Storage.cxx
)
......@@ -75,6 +74,7 @@ set(cpu_accelerator_srcs
vtkmTriangleMeshPointNormals.cxx
vtkmWarpScalar.cxx
vtkmWarpVector.cxx
vtkmlib/DataSetConverters.cxx
vtkmlib/Portals.cxx
vtkmlib/ImplicitFunctionConverter.cxx
)
......@@ -102,6 +102,7 @@ set(cuda_accelerator_srcs
vtkmTriangleMeshPointNormals.cu
vtkmWarpScalar.cu
vtkmWarpVector.cu
vtkmlib/DataSetConverters.cu
vtkmlib/Portals.cu
vtkmlib/ImplicitFunctionConverter.cu
)
......
......@@ -332,19 +332,15 @@ struct CellSetConverter
CellInfoCopyWorklet worklet(&correctSize, connArray, this->Types,
this->Locations);
vtkm::worklet::DispatcherMapTopology<CellInfoCopyWorklet,
vtkm::cont::DeviceAdapterTagSerial>
dispatcher(worklet);
vtkm::worklet::DispatcherMapTopology<CellInfoCopyWorklet> dispatcher(worklet);
dispatcher.SetDevice(vtkm::cont::DeviceAdapterTagSerial{});
dispatcher.Invoke(cells);
}
else
{
CellConnCopyWorklet worklet(&correctSize, connArray);
vtkm::worklet::DispatcherMapTopology<CellConnCopyWorklet,
vtkm::cont::DeviceAdapterTagSerial>
dispatcher(worklet);
vtkm::worklet::DispatcherMapTopology<CellConnCopyWorklet> dispatcher(worklet);
dispatcher.SetDevice(vtkm::cont::DeviceAdapterTagSerial{});
dispatcher.Invoke(cells);
}
......
//=============================================================================
//
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
//
// This software is distributed WITHOUT ANY WARRANTY; without even
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//
// Copyright 2012 Sandia Corporation.
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
// the U.S. Government retains certain rights in this software.
//
//=============================================================================
#include "DataSetConverters.cxx"
Subproject commit a891e6d90a9f07a08ef4187a659c1f25c353668d
Subproject commit 8d0f441e1b391c6ec4c2662ee1454d8c901733fb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment