Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Home stretch of warnings...(?)

Browse Source
This commit is contained in:
Mark Kim 2018-12-18 12:15:13 -05:00
parent f5569fb931
commit 865942f189
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/worklet/zfp/ZFPBlockReader.h
View File

@ -50,7 +50,7 @@ struct BlockReader
, m_maxbits(maxbits)
, MaxIndex(words.GetNumberOfValues() - 1)
{
Index = static_cast<size_t>(block_idx * maxbits) / (sizeof(Word) * 8);
Index = vtkm::Id(static_cast<size_t>(block_idx * maxbits) / (sizeof(Word) * 8));
m_buffer = static_cast<Word>(Words.Get(Index));
m_current_bit = (block_idx * maxbits) % vtkm::Int32((sizeof(Word) * 8));

24
vtkm/worklet/zfp/ZFPDecode.h
View File

@ -35,30 +35,32 @@ namespace zfp
template <typename Int, typename Scalar>
VTKM_EXEC Scalar dequantize(const Int& x, const int& e);
inline VTKM_EXEC Scalar dequantize(const Int& x, const int& e);
template <>
VTKM_EXEC vtkm::Float64 dequantize<vtkm::Int64, vtkm::Float64>(const vtkm::Int64& x,
const vtkm::Int32& e)
inline VTKM_EXEC vtkm::Float64 dequantize<vtkm::Int64, vtkm::Float64>(const vtkm::Int64& x,
const vtkm::Int32& e)
{
return vtkm::Ldexp((vtkm::Float64)x, e - (CHAR_BIT * scalar_sizeof<vtkm::Float64>() - 2));
}
template <>
VTKM_EXEC vtkm::Float32 dequantize<vtkm::Int32, vtkm::Float32>(const vtkm::Int32& x,
const vtkm::Int32& e)
inline VTKM_EXEC vtkm::Float32 dequantize<vtkm::Int32, vtkm::Float32>(const vtkm::Int32& x,
const vtkm::Int32& e)
{
return vtkm::Ldexp((vtkm::Float32)x, e - (CHAR_BIT * scalar_sizeof<vtkm::Float32>() - 2));
}
template <>
VTKM_EXEC vtkm::Int32 dequantize<vtkm::Int32, vtkm::Int32>(const vtkm::Int32&, const vtkm::Int32&)
inline VTKM_EXEC vtkm::Int32 dequantize<vtkm::Int32, vtkm::Int32>(const vtkm::Int32&,
const vtkm::Int32&)
{
return 1;
}
template <>
VTKM_EXEC vtkm::Int64 dequantize<vtkm::Int64, vtkm::Int64>(const vtkm::Int64&, const vtkm::Int32&)
inline VTKM_EXEC vtkm::Int64 dequantize<vtkm::Int64, vtkm::Int64>(const vtkm::Int64&,
const vtkm::Int32&)
{
return 1;
}
@ -162,14 +164,14 @@ struct inv_transform<4>
};
VTKM_EXEC
vtkm::Int64 uint2int(vtkm::UInt64 x)
inline VTKM_EXEC vtkm::Int64 uint2int(vtkm::UInt64 x)
{
return static_cast<vtkm::Int64>((x ^ 0xaaaaaaaaaaaaaaaaull) - 0xaaaaaaaaaaaaaaaaull);
}
VTKM_EXEC
vtkm::Int32 uint2int(vtkm::UInt32 x)
inline VTKM_EXEC vtkm::Int32 uint2int(vtkm::UInt32 x)
{
return static_cast<vtkm::Int32>((x ^ 0xaaaaaaaau) - 0xaaaaaaaau);
}

7
vtkm/worklet/zfp/ZFPFunctions.h
View File

@ -46,20 +46,21 @@ void print_bits(T bits)
printf("\n");
}
template <typename T>
vtkm::UInt32 MinBits(const vtkm::UInt32 bits)
inline vtkm::UInt32 MinBits(const vtkm::UInt32 bits)
{
return bits;
}
template <>
vtkm::UInt32 MinBits<vtkm::Float32>(const vtkm::UInt32 bits)
inline vtkm::UInt32 MinBits<vtkm::Float32>(const vtkm::UInt32 bits)
{
return vtkm::Max(bits, 1 + 8u);
}
template <>
vtkm::UInt32 MinBits<vtkm::Float64>(const vtkm::UInt32 bits)
inline vtkm::UInt32 MinBits<vtkm::Float64>(const vtkm::UInt32 bits)
{
return vtkm::Max(bits, 1 + 11u);
}

7
vtkm/worklet/zfp/ZFPTools.h
View File

@ -58,7 +58,7 @@ public:
}
}; //class MemTransfer
size_t CalcMem3d(const vtkm::Id3 dims, const vtkm::UInt32 bits_per_block)
inline size_t CalcMem3d(const vtkm::Id3 dims, const vtkm::UInt32 bits_per_block)
{
const size_t vals_per_block = 64;
const size_t size = static_cast<size_t>(dims[0] * dims[1] * dims[2]);
@ -69,8 +69,7 @@ size_t CalcMem3d(const vtkm::Id3 dims, const vtkm::UInt32 bits_per_block)
return alloc_size * sizeof(ZFPWord);
}
size_t CalcMem2d(const vtkm::Id2 dims, const vtkm::UInt32 bits_per_block)
inline size_t CalcMem2d(const vtkm::Id2 dims, const vtkm::UInt32 bits_per_block)
{
constexpr size_t vals_per_block = 16;
const size_t size = static_cast<size_t>(dims[0] * dims[1]);
@ -81,7 +80,7 @@ size_t CalcMem2d(const vtkm::Id2 dims, const vtkm::UInt32 bits_per_block)
return alloc_size * sizeof(ZFPWord);
}
size_t CalcMem1d(const vtkm::Id dims, const vtkm::UInt32 bits_per_block)
inline size_t CalcMem1d(const vtkm::Id dims, const vtkm::UInt32 bits_per_block)
{
constexpr size_t vals_per_block = 4;
const size_t size = static_cast<size_t>(dims);