Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix/rendering_timers'

Browse Source 
c021ef188 remove serial only timers to avoid warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1906
This commit is contained in:
Matt Larsen 2019-11-25 18:36:40 +00:00 committed by Kitware Robot
commit 68cb8f317f
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/rendering/raytracing/Camera.cxx
View File

@ -748,14 +748,14 @@ template <typename Precision>
VTKM_CONT void Camera::CreateRaysImpl(Ray<Precision>& rays, const vtkm::Bounds boundingBox)
{
Logger* logger = Logger::GetInstance();
vtkm::cont::Timer createTimer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer createTimer;
createTimer.Start();
logger->OpenLogEntry("ray_camera");
bool ortho = this->CameraView.GetMode() == vtkm::rendering::Camera::MODE_2D;
this->UpdateDimensions(rays, boundingBox, ortho);
this->WriteSettingsToLog();
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
//Set the origin of the ray back to the camera position

10
vtkm/rendering/raytracing/ConnectivityTracer.cxx
View File

@ -1120,7 +1120,7 @@ template <typename FloatType>
void ConnectivityTracer::IntersectCell(Ray<FloatType>& rays,
detail::RayTracking<FloatType>& tracker)
{
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::worklet::DispatcherMapField<LocateCell> locateDispatch;
locateDispatch.Invoke(rays.HitIdx,
@ -1150,7 +1150,7 @@ void ConnectivityTracer::AccumulatePathLengths(Ray<FloatType>& rays,
template <typename FloatType>
void ConnectivityTracer::FindLostRays(Ray<FloatType>& rays, detail::RayTracking<FloatType>& tracker)
{
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::worklet::DispatcherMapField<RayBumper> bumpDispatch;
@ -1172,7 +1172,7 @@ void ConnectivityTracer::SampleCells(Ray<FloatType>& rays, detail::RayTracking<F
{
using SampleP = SampleCellAssocPoints<FloatType>;
using SampleC = SampleCellAssocCells<FloatType>;
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
VTKM_ASSERT(rays.Buffers.at(0).GetNumChannels() == 4);
@ -1220,7 +1220,7 @@ template <typename FloatType>
void ConnectivityTracer::IntegrateCells(Ray<FloatType>& rays,
detail::RayTracking<FloatType>& tracker)
{
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
if (HasEmission)
{
@ -1293,7 +1293,7 @@ void ConnectivityTracer::OffsetMinDistances(Ray<FloatType>& rays)
template <typename FloatType>
void ConnectivityTracer::FindMeshEntry(Ray<FloatType>& rays)
{
vtkm::cont::Timer entryTimer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer entryTimer;
entryTimer.Start();
//
// if ray misses the external face it will be marked RAY_EXITED_MESH

12
vtkm/rendering/raytracing/MeshConnectivityBuilder.cxx
View File

@ -522,7 +522,7 @@ VTKM_CONT void GenerateFaceConnnectivity(const CellSetType cellSet,
vtkm::cont::ArrayHandle<vtkm::Int32>& uniqueFaces)
{
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::Id numCells = shapes.GetNumberOfValues();
@ -611,7 +611,7 @@ VTKM_CONT vtkm::cont::ArrayHandle<vtkm::Vec<Id, 4>> ExtractFaces(
const OffsetsHandleType& shapeOffsets)
{
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::cont::ArrayHandle<vtkm::Id3> externalFacePairs;
vtkm::cont::Algorithm::CopyIf(cellFaceId, uniqueFaces, externalFacePairs, IsUnique());
@ -668,7 +668,7 @@ void MeshConnectivityBuilder::BuildConnectivity(
Logger* logger = Logger::GetInstance();
logger->OpenLogEntry("mesh_conn");
//logger->AddLogData("device", GetDeviceString(DeviceAdapter()));
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::Float32 BoundingBox[6];
@ -730,7 +730,7 @@ void MeshConnectivityBuilder::BuildConnectivity(
{
Logger* logger = Logger::GetInstance();
logger->OpenLogEntry("meah_conn");
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::Float32 BoundingBox[6];
@ -807,7 +807,7 @@ VTKM_CONT
vtkm::cont::ArrayHandle<vtkm::Id4> MeshConnectivityBuilder::ExternalTrianglesStructured(
vtkm::cont::CellSetStructured<3>& cellSetStructured)
{
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
vtkm::Id3 cellDims = cellSetStructured.GetCellDimensions();
@ -895,7 +895,7 @@ MeshConnContainer* MeshConnectivityBuilder::BuildConnectivity(
logger->OpenLogEntry("mesh_conn_construction");
MeshConnContainer* meshConn = nullptr;
vtkm::cont::Timer timer{ cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer timer;
timer.Start();
if (type == Unstructured)

2
vtkm/rendering/raytracing/RayTracer.cxx
View File

@ -269,7 +269,7 @@ void RayTracer::RenderOnDevice(Ray<Precision>& rays)
using Timer = vtkm::cont::Timer;
Logger* logger = Logger::GetInstance();
Timer renderTimer{ vtkm::cont::DeviceAdapterTagSerial() };
Timer renderTimer;
renderTimer.Start();
vtkm::Float64 time = 0.;
logger->OpenLogEntry("ray_tracer");