Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'compile_fix_for_sycl' into release-2.0

Browse Source 
7d3ea2126 Changes for compiling with SYCL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2986
This commit is contained in:
Mark Bolstad 2023-02-15 21:49:13 +00:00 committed by Kitware Robot
commit da65e0bcef
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/cont/kokkos/internal/DeviceAdapterAlgorithmKokkos.h
View File

@ -256,10 +256,7 @@ private:
}
KOKKOS_INLINE_FUNCTION
void join(volatile value_type& dst, const volatile value_type& src) const
{
dst = this->Operator(dst, src);
}
void join(value_type& dst, const value_type& src) const { dst = this->Operator(dst, src); }
KOKKOS_INLINE_FUNCTION
void init(value_type& dst) const

20
vtkm/cont/testing/UnitTestBitField.cxx
View File

@ -24,6 +24,25 @@
#include <cstdio>
#if defined(KOKKOS_ENABLE_SYCL)
#define DEVICE_ASSERT_MSG(cond, message) \
do \
{ \
if (!(cond)) \
{ \
return false; \
} \
} while (false)
#define DEVICE_ASSERT(cond) \
do \
{ \
if (!(cond)) \
{ \
return false; \
} \
} while (false)
#else
#define DEVICE_ASSERT_MSG(cond, message) \
do \
{ \
@ -47,6 +66,7 @@
return false; \
} \
} while (false)
#endif
// Test with some trailing bits in partial last word:
#define NUM_BITS \

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

@ -110,8 +110,6 @@ public:
{
tableOffset = tables.FaceLookUp(3, 0);
}
else
printf("Error shape not recognized %d\n", (int)shapeType);
return tableOffset;
}
@ -282,7 +280,6 @@ public:
vtkm::Int32 shapesFaceOffset = tables.FaceLookUp(tables.CellTypeLookUp(shapeId), 0);
if (shapesFaceOffset == -1)
{
printf("Unsupported Shape Type %d\n", shapeId);
return;
}
@ -403,10 +400,6 @@ public:
for (segment = 0; index >= Segments[segment + 1]; ++segment)
;
if (segment >= 6)
{
printf("OUT OF BOUDNS %d", (int)index);
}
vtkm::Int32 cellFace = SegmentToFace[segment];
// Face relative directions of the

1
vtkm/rendering/raytracing/MortonCodes.h
View File

@ -183,7 +183,6 @@ public:
}
else
{
printf("Unknown shape type %d\n", (int)cellShape.Id);
return;
}