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

More warnings.

Browse Source
This commit is contained in:
Mark Kim 2018-12-18 11:09:43 -05:00
parent 6beefb4ab2
commit f5569fb931
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/worklet/ZFP1DCompressor.h
View File

@ -69,7 +69,7 @@ public:
size_t outbits = detail::CalcMem1d(paddedDims, stream.minbits);
vtkm::Id outsize = outbits / sizeof(ZFPWord);
vtkm::Id outsize = vtkm::Id(outbits / sizeof(ZFPWord));
vtkm::cont::ArrayHandle<vtkm::Int64> output;
// hopefully this inits/allocates the mem only on the device

2
vtkm/worklet/ZFP2DCompressor.h
View File

@ -71,7 +71,7 @@ public:
size_t outbits = detail::CalcMem2d(paddedDims, stream.minbits);
vtkm::Id outsize = outbits / sizeof(ZFPWord);
vtkm::Id outsize = vtkm::Id(outbits / sizeof(ZFPWord));
vtkm::cont::ArrayHandle<vtkm::Int64> output;
// hopefully this inits/allocates the mem only on the device

2
vtkm/worklet/ZFPCompressor.h
View File

@ -73,7 +73,7 @@ public:
size_t outbits = detail::CalcMem3d(paddedDims, stream.minbits);
vtkm::Id outsize = outbits / sizeof(ZFPWord);
vtkm::Id outsize = vtkm::Id(outbits / sizeof(ZFPWord));
vtkm::cont::ArrayHandle<vtkm::Int64> output;
// hopefully this inits/allocates the mem only on the device

6
vtkm/worklet/zfp/ZFPEncode.h
View File

@ -315,7 +315,7 @@ inline VTKM_EXEC void zfp_encodef(Scalar* fblock,
PortalType& stream)
{
using Int = typename zfp::zfp_traits<Scalar>::Int;
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, blockIdx);
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, vtkm::Id(blockIdx));
vtkm::Int32 emax = zfp::MaxExponent<BlockSize, Scalar>(fblock);
// std::cout<<"EMAX "<<emax<<"\n";
vtkm::Int32 maxprec =
@ -375,7 +375,7 @@ struct ZFPBlockEncoder<BlockSize, vtkm::Int32, PortalType>
PortalType& stream)
{
using Int = typename zfp::zfp_traits<vtkm::Int32>::Int;
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, blockIdx);
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, vtkm::Id(blockIdx));
encode_block<BlockSize>(blockWriter, maxbits, get_precision<vtkm::Int32>(), (Int*)fblock);
}
};
@ -389,7 +389,7 @@ struct ZFPBlockEncoder<BlockSize, vtkm::Int64, PortalType>
PortalType& stream)
{
using Int = typename zfp::zfp_traits<vtkm::Int64>::Int;
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, blockIdx);
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, vtkm::Id(blockIdx));
encode_block<BlockSize>(blockWriter, maxbits, get_precision<vtkm::Int64>(), (Int*)fblock);
}
};