mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
Merge topic 'fix/rendering_timers'
c021ef188 remove serial only timers to avoid warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1906
This commit is contained in:
commit
68cb8f317f
@ -748,14 +748,14 @@ template <typename Precision>
|
|||||||
VTKM_CONT void Camera::CreateRaysImpl(Ray<Precision>& rays, const vtkm::Bounds boundingBox)
|
VTKM_CONT void Camera::CreateRaysImpl(Ray<Precision>& rays, const vtkm::Bounds boundingBox)
|
||||||
{
|
{
|
||||||
Logger* logger = Logger::GetInstance();
|
Logger* logger = Logger::GetInstance();
|
||||||
vtkm::cont::Timer createTimer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer createTimer;
|
||||||
createTimer.Start();
|
createTimer.Start();
|
||||||
logger->OpenLogEntry("ray_camera");
|
logger->OpenLogEntry("ray_camera");
|
||||||
|
|
||||||
bool ortho = this->CameraView.GetMode() == vtkm::rendering::Camera::MODE_2D;
|
bool ortho = this->CameraView.GetMode() == vtkm::rendering::Camera::MODE_2D;
|
||||||
this->UpdateDimensions(rays, boundingBox, ortho);
|
this->UpdateDimensions(rays, boundingBox, ortho);
|
||||||
this->WriteSettingsToLog();
|
this->WriteSettingsToLog();
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
//Set the origin of the ray back to the camera position
|
//Set the origin of the ray back to the camera position
|
||||||
|
|
||||||
|
@ -1120,7 +1120,7 @@ template <typename FloatType>
|
|||||||
void ConnectivityTracer::IntersectCell(Ray<FloatType>& rays,
|
void ConnectivityTracer::IntersectCell(Ray<FloatType>& rays,
|
||||||
detail::RayTracking<FloatType>& tracker)
|
detail::RayTracking<FloatType>& tracker)
|
||||||
{
|
{
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
vtkm::worklet::DispatcherMapField<LocateCell> locateDispatch;
|
vtkm::worklet::DispatcherMapField<LocateCell> locateDispatch;
|
||||||
locateDispatch.Invoke(rays.HitIdx,
|
locateDispatch.Invoke(rays.HitIdx,
|
||||||
@ -1150,7 +1150,7 @@ void ConnectivityTracer::AccumulatePathLengths(Ray<FloatType>& rays,
|
|||||||
template <typename FloatType>
|
template <typename FloatType>
|
||||||
void ConnectivityTracer::FindLostRays(Ray<FloatType>& rays, detail::RayTracking<FloatType>& tracker)
|
void ConnectivityTracer::FindLostRays(Ray<FloatType>& rays, detail::RayTracking<FloatType>& tracker)
|
||||||
{
|
{
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
vtkm::worklet::DispatcherMapField<RayBumper> bumpDispatch;
|
vtkm::worklet::DispatcherMapField<RayBumper> bumpDispatch;
|
||||||
@ -1172,7 +1172,7 @@ void ConnectivityTracer::SampleCells(Ray<FloatType>& rays, detail::RayTracking<F
|
|||||||
{
|
{
|
||||||
using SampleP = SampleCellAssocPoints<FloatType>;
|
using SampleP = SampleCellAssocPoints<FloatType>;
|
||||||
using SampleC = SampleCellAssocCells<FloatType>;
|
using SampleC = SampleCellAssocCells<FloatType>;
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
VTKM_ASSERT(rays.Buffers.at(0).GetNumChannels() == 4);
|
VTKM_ASSERT(rays.Buffers.at(0).GetNumChannels() == 4);
|
||||||
@ -1220,7 +1220,7 @@ template <typename FloatType>
|
|||||||
void ConnectivityTracer::IntegrateCells(Ray<FloatType>& rays,
|
void ConnectivityTracer::IntegrateCells(Ray<FloatType>& rays,
|
||||||
detail::RayTracking<FloatType>& tracker)
|
detail::RayTracking<FloatType>& tracker)
|
||||||
{
|
{
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
if (HasEmission)
|
if (HasEmission)
|
||||||
{
|
{
|
||||||
@ -1293,7 +1293,7 @@ void ConnectivityTracer::OffsetMinDistances(Ray<FloatType>& rays)
|
|||||||
template <typename FloatType>
|
template <typename FloatType>
|
||||||
void ConnectivityTracer::FindMeshEntry(Ray<FloatType>& rays)
|
void ConnectivityTracer::FindMeshEntry(Ray<FloatType>& rays)
|
||||||
{
|
{
|
||||||
vtkm::cont::Timer entryTimer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer entryTimer;
|
||||||
entryTimer.Start();
|
entryTimer.Start();
|
||||||
//
|
//
|
||||||
// if ray misses the external face it will be marked RAY_EXITED_MESH
|
// if ray misses the external face it will be marked RAY_EXITED_MESH
|
||||||
|
@ -522,7 +522,7 @@ VTKM_CONT void GenerateFaceConnnectivity(const CellSetType cellSet,
|
|||||||
vtkm::cont::ArrayHandle<vtkm::Int32>& uniqueFaces)
|
vtkm::cont::ArrayHandle<vtkm::Int32>& uniqueFaces)
|
||||||
{
|
{
|
||||||
|
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
vtkm::Id numCells = shapes.GetNumberOfValues();
|
vtkm::Id numCells = shapes.GetNumberOfValues();
|
||||||
@ -611,7 +611,7 @@ VTKM_CONT vtkm::cont::ArrayHandle<vtkm::Vec<Id, 4>> ExtractFaces(
|
|||||||
const OffsetsHandleType& shapeOffsets)
|
const OffsetsHandleType& shapeOffsets)
|
||||||
{
|
{
|
||||||
|
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
vtkm::cont::ArrayHandle<vtkm::Id3> externalFacePairs;
|
vtkm::cont::ArrayHandle<vtkm::Id3> externalFacePairs;
|
||||||
vtkm::cont::Algorithm::CopyIf(cellFaceId, uniqueFaces, externalFacePairs, IsUnique());
|
vtkm::cont::Algorithm::CopyIf(cellFaceId, uniqueFaces, externalFacePairs, IsUnique());
|
||||||
@ -668,7 +668,7 @@ void MeshConnectivityBuilder::BuildConnectivity(
|
|||||||
Logger* logger = Logger::GetInstance();
|
Logger* logger = Logger::GetInstance();
|
||||||
logger->OpenLogEntry("mesh_conn");
|
logger->OpenLogEntry("mesh_conn");
|
||||||
//logger->AddLogData("device", GetDeviceString(DeviceAdapter()));
|
//logger->AddLogData("device", GetDeviceString(DeviceAdapter()));
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
vtkm::Float32 BoundingBox[6];
|
vtkm::Float32 BoundingBox[6];
|
||||||
@ -730,7 +730,7 @@ void MeshConnectivityBuilder::BuildConnectivity(
|
|||||||
{
|
{
|
||||||
Logger* logger = Logger::GetInstance();
|
Logger* logger = Logger::GetInstance();
|
||||||
logger->OpenLogEntry("meah_conn");
|
logger->OpenLogEntry("meah_conn");
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
vtkm::Float32 BoundingBox[6];
|
vtkm::Float32 BoundingBox[6];
|
||||||
@ -807,7 +807,7 @@ VTKM_CONT
|
|||||||
vtkm::cont::ArrayHandle<vtkm::Id4> MeshConnectivityBuilder::ExternalTrianglesStructured(
|
vtkm::cont::ArrayHandle<vtkm::Id4> MeshConnectivityBuilder::ExternalTrianglesStructured(
|
||||||
vtkm::cont::CellSetStructured<3>& cellSetStructured)
|
vtkm::cont::CellSetStructured<3>& cellSetStructured)
|
||||||
{
|
{
|
||||||
vtkm::cont::Timer timer{ vtkm::cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
vtkm::Id3 cellDims = cellSetStructured.GetCellDimensions();
|
vtkm::Id3 cellDims = cellSetStructured.GetCellDimensions();
|
||||||
@ -895,7 +895,7 @@ MeshConnContainer* MeshConnectivityBuilder::BuildConnectivity(
|
|||||||
logger->OpenLogEntry("mesh_conn_construction");
|
logger->OpenLogEntry("mesh_conn_construction");
|
||||||
|
|
||||||
MeshConnContainer* meshConn = nullptr;
|
MeshConnContainer* meshConn = nullptr;
|
||||||
vtkm::cont::Timer timer{ cont::DeviceAdapterTagSerial() };
|
vtkm::cont::Timer timer;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
if (type == Unstructured)
|
if (type == Unstructured)
|
||||||
|
@ -269,7 +269,7 @@ void RayTracer::RenderOnDevice(Ray<Precision>& rays)
|
|||||||
using Timer = vtkm::cont::Timer;
|
using Timer = vtkm::cont::Timer;
|
||||||
|
|
||||||
Logger* logger = Logger::GetInstance();
|
Logger* logger = Logger::GetInstance();
|
||||||
Timer renderTimer{ vtkm::cont::DeviceAdapterTagSerial() };
|
Timer renderTimer;
|
||||||
renderTimer.Start();
|
renderTimer.Start();
|
||||||
vtkm::Float64 time = 0.;
|
vtkm::Float64 time = 0.;
|
||||||
logger->OpenLogEntry("ray_tracer");
|
logger->OpenLogEntry("ray_tracer");
|
||||||
|
Loading…
Reference in New Issue
Block a user