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

cleanup debug prints

Browse Source
This commit is contained in:
Mark Kim 2018-12-12 20:58:57 -05:00
parent ba60650706
commit 51d19d9bef
6 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,10 +183,7 @@ VTKM_EXEC void decode_ints(ReaderType<BlockSize, PortalType>& reader,
for (; n < (BlockSize - 1) && bits && (bits--, !reader.read_bit()); n++)
;
// deposit bit plane
#ifdef VTKM_ENABLE_CUDA
#pragma unroll
#endif
// deposit bit plane
for (int i = 0; x; i++, x >>= 1)
{
data[i] += (UInt)(x & 1u) << k;
@ -201,9 +198,6 @@ VTKM_EXEC void decode_ints(ReaderType<BlockSize, PortalType>& reader,
template <vtkm::Int32 BlockSize, typename Scalar, typename Int>
void zfp_convert(Scalar inv_w, Scalar* fblock, Int* iblock)
{
#ifdef VTKM_ENABLE_CUDA
#pragma unroll
#endif
for (vtkm::Int32 i = 0; i < BlockSize; ++i)
{
fblock[i] = inv_w * (Scalar)iblock[i];
@ -255,9 +249,6 @@ VTKM_EXEC void zfp_decode(Scalar* fblock,
Int iblock[BlockSize];
const zfp::ZFPCodec<BlockSize> codec;
#ifdef VTKM_ENABLE_CUDA
#pragma unroll
#endif
for (vtkm::Int32 i = 0; i < BlockSize; ++i)
{
vtkm::UInt8 idx = codec.CodecLookup(i);

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

@ -101,7 +101,7 @@ public:
// std::cout<<" "<<fblock[i];
//}
std::cout << "\n";
//std::cout<<"\n";
vtkm::Id3 zfpBlock;
zfpBlock[0] = blockIdx % ZFPDims[0];
zfpBlock[1] = (blockIdx / ZFPDims[0]) % ZFPDims[1];

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

@ -296,7 +296,7 @@ inline VTKM_EXEC void zfp_encodef(Scalar* fblock,
using Int = typename zfp::zfp_traits<Scalar>::Int;
zfp::BlockWriter<BlockSize, PortalType> blockWriter(stream, maxbits, blockIdx);
vtkm::Int32 emax = zfp::MaxExponent<BlockSize, Scalar>(fblock);
std::cout << "EMAX " << emax << "\n";
// std::cout<<"EMAX "<<emax<<"\n";
vtkm::Int32 maxprec =
zfp::precision(emax, zfp::get_precision<Scalar>(), zfp::get_min_exp<Scalar>());
vtkm::UInt32 e = maxprec ? emax + zfp::get_ebias<Scalar>() : 0;

5
vtkm/worklet/zfp/ZFPEncode1.h
View File

@ -124,11 +124,6 @@ public:
Gather1(fblock, scalars, logicalStart, 1);
}
for (int i = 0; i < BlockSize; ++i)
{
std::cout << " " << fblock[i];
}
std::cout << "\n";
//zfp_encode_block<Scalar, ZFP_2D_BLOCK_SIZE>(fblock, maxbits, block_idx, stream);
zfp::ZFPBlockEncoder<BlockSize, Scalar, BitstreamPortal> encoder;

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

@ -143,12 +143,6 @@ public:
Gather2(fblock, scalars, offset, 1, static_cast<vtkm::Int32>(Dims[0]));
}
for (int i = 0; i < 16; ++i)
{
std::cout << " " << fblock[i];
}
std::cout << "\n";
//zfp_encode_block<Scalar, ZFP_2D_BLOCK_SIZE>(fblock, maxbits, block_idx, stream);
zfp::ZFPBlockEncoder<BlockSize, Scalar, BitstreamPortal> encoder;
encoder.encode(fblock, MaxBits, vtkm::UInt32(blockIdx), stream);

10
vtkm/worklet/zfp/ZFPEncode3.h
View File

@ -145,11 +145,11 @@ public:
Gather3(fblock, scalars, Dims, offset);
}
for (int i = 0; i < 64; ++i)
{
std::cout << " " << fblock[i];
}
std::cout << "\n";
// for(int i = 0; i < 64; ++i)
// {
// std::cout<<" "<<fblock[i];
// }
// std::cout<<"\n";
zfp::ZFPBlockEncoder<BlockSize, Scalar, BitstreamPortal> encoder;
encoder.encode(fblock, MaxBits, vtkm::UInt32(blockIdx), stream);