Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

clean up warnings.

Browse Source
This commit is contained in:
Mark Kim 2018-12-11 13:07:44 -05:00
parent 9c86727225
commit 20328534b5
10 changed files with 49 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/filter/ZFPCompressor1D.hxx
View File

@ -60,8 +60,8 @@ template <typename T, typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPCompressor1D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
// if (fieldMeta.IsPointField() == false)
// {

4
vtkm/filter/ZFPCompressor2D.hxx
View File

@ -59,8 +59,8 @@ template <typename T, typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPCompressor2D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
// if (fieldMeta.IsPointField() == false)
// {

4
vtkm/filter/ZFPCompressor3D.hxx
View File

@ -59,8 +59,8 @@ template <typename T, typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPCompressor3D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
// if (fieldMeta.IsPointField() == false)
// {

14
vtkm/filter/ZFPDecompressor1D.hxx
View File

@ -41,12 +41,14 @@ inline VTKM_CONT ZFPDecompressor1D::ZFPDecompressor1D()
//-----------------------------------------------------------------------------
template <typename T, typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPDecompressor1D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::cont::DataSet&,
const vtkm::cont::ArrayHandle<T, StorageType>&,
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
VTKM_ASSERT(true);
vtkm::cont::DataSet ds;
return ds;
}
//-----------------------------------------------------------------------------
@ -54,8 +56,8 @@ template <typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPDecompressor1D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<vtkm::Int64, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
// if (fieldMeta.IsPointField() == false)
// {

15
vtkm/filter/ZFPDecompressor2D.hxx
View File

@ -41,12 +41,15 @@ inline VTKM_CONT ZFPDecompressor2D::ZFPDecompressor2D()
//-----------------------------------------------------------------------------
template <typename T, typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPDecompressor2D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::cont::DataSet&,
const vtkm::cont::ArrayHandle<T, StorageType>&,
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
VTKM_ASSERT(true);
vtkm::cont::DataSet ds;
return ds;
}
//-----------------------------------------------------------------------------
@ -54,8 +57,8 @@ template <typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPDecompressor2D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<vtkm::Int64, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
// if (fieldMeta.IsPointField() == false)
// {

14
vtkm/filter/ZFPDecompressor3D.hxx
View File

@ -41,12 +41,14 @@ inline VTKM_CONT ZFPDecompressor3D::ZFPDecompressor3D()
//-----------------------------------------------------------------------------
template <typename T, typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPDecompressor3D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<T, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::cont::DataSet&,
const vtkm::cont::ArrayHandle<T, StorageType>&,
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
VTKM_ASSERT(true);
vtkm::cont::DataSet ds;
return ds;
}
//-----------------------------------------------------------------------------
@ -54,8 +56,8 @@ template <typename StorageType, typename DerivedPolicy>
inline VTKM_CONT vtkm::cont::DataSet ZFPDecompressor3D::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::cont::ArrayHandle<vtkm::Int64, StorageType>& field,
const vtkm::filter::FieldMetadata& fieldMeta,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy)
const vtkm::filter::FieldMetadata&,
const vtkm::filter::PolicyBase<DerivedPolicy>&)
{
// if (fieldMeta.IsPointField() == false)
// {

25
vtkm/worklet/testing/UnitTestZFPCompressor.cxx
View File

@ -39,7 +39,7 @@ void writeArray(vtkm::cont::ArrayHandle<T>& field, std::string filename)
{
auto val = vtkm::worklet::GetVTKMPointer(field);
std::ofstream output(filename, std::ios::binary | std::ios::out);
output.write((char*)val, field.GetNumberOfValues() * 8);
output.write(reinterpret_cast<char*>(val), field.GetNumberOfValues() * 8);
output.close();
for (int i = 0; i < field.GetNumberOfValues(); i++)
@ -60,18 +60,17 @@ void Test1D(int rate)
auto dynField = dataset.GetField("pointvar").GetData();
auto field = dynField.Cast<Handle64>();
auto oport = field.GetPortalControl();
writeArray(field, "orig.zfp");
//writeArray(field, "orig.zfp");
vtkm::worklet::ZFP1DCompressor compressor;
vtkm::worklet::ZFP1DDecompressor decompressor;
if (dynField.IsSameType(Handle64()))
{
Handle64 field = dynField.Cast<Handle64>();
vtkm::cont::ArrayHandle<Scalar> handle;
const vtkm::Id size = field.GetNumberOfValues();
const vtkm::Id size = dynField.Cast<Handle64>().GetNumberOfValues();
handle.Allocate(size);
auto fPortal = field.GetPortalControl();
auto fPortal = dynField.Cast<Handle64>().GetPortalControl();
auto hPortal = handle.GetPortalControl();
for (vtkm::Id i = 0; i < size; ++i)
{
@ -79,7 +78,7 @@ void Test1D(int rate)
}
auto compressed = compressor.Compress(handle, rate, dims);
writeArray(compressed, "output.zfp");
//writeArray(compressed, "output.zfp");
vtkm::cont::ArrayHandle<Scalar> decoded;
decompressor.Decompress(compressed, decoded, rate, dims);
auto port = decoded.GetPortalControl();
@ -106,12 +105,11 @@ void Test2D(int rate)
if (dynField.IsSameType(Handle64()))
{
Handle64 field = dynField.Cast<Handle64>();
vtkm::cont::ArrayHandle<Scalar> handle;
const vtkm::Id size = field.GetNumberOfValues();
const vtkm::Id size = dynField.Cast<Handle64>().GetNumberOfValues();
handle.Allocate(size);
auto fPortal = field.GetPortalControl();
auto fPortal = dynField.Cast<Handle64>().GetPortalControl();
auto hPortal = handle.GetPortalControl();
for (vtkm::Id i = 0; i < size; ++i)
{
@ -148,12 +146,11 @@ void Test3D(int rate)
if (dynField.IsSameType(Handle64()))
{
Handle64 field = dynField.Cast<Handle64>();
vtkm::cont::ArrayHandle<Scalar> handle;
const vtkm::Id size = field.GetNumberOfValues();
const vtkm::Id size = dynField.Cast<Handle64>().GetNumberOfValues();
handle.Allocate(size);
auto fPortal = field.GetPortalControl();
auto fPortal = dynField.Cast<Handle64>().GetPortalControl();
auto hPortal = handle.GetPortalControl();
for (vtkm::Id i = 0; i < size; ++i)
{
@ -169,8 +166,8 @@ void Test3D(int rate)
void TestZFP()
{
// Test3D<vtkm::Float64>(4);
//Test2D<vtkm::Float64>(4);
Test3D<vtkm::Float64>(4);
Test2D<vtkm::Float64>(4);
Test1D<vtkm::Float64>(4);
//Test3D<vtkm::Float32>(4);
//Test3D<vtkm::Int64>(4);

20
vtkm/worklet/zfp/ZFPDecode1.h
View File

@ -21,11 +21,10 @@ namespace zfp
template <typename Scalar, typename PortalType>
VTKM_EXEC inline void ScatterPartial1(const Scalar* q,
PortalType& scalars,
const vtkm::Id dims,
vtkm::Id offset,
vtkm::Int32 nx)
{
vtkm::Id x, y;
vtkm::Id x;
for (x = 0; x < nx; x++, offset++, q++)
{
scalars.Set(offset, *q);
@ -33,10 +32,7 @@ VTKM_EXEC inline void ScatterPartial1(const Scalar* q,
}
template <typename Scalar, typename PortalType>
VTKM_EXEC inline void Scatter1(const Scalar* q,
PortalType& scalars,
const vtkm::Id dims,
vtkm::Id offset)
VTKM_EXEC inline void Scatter1(const Scalar* q, PortalType& scalars, vtkm::Id offset)
{
for (vtkm::Id x = 0; x < 4; x++, ++offset)
{
@ -77,15 +73,9 @@ public:
}
zfp::zfp_decode<BlockSize>(fblock, MaxBits, blockIdx, stream);
zfp::zfp_decode<BlockSize>(fblock, MaxBits, static_cast<vtkm::UInt32>(blockIdx), stream);
//for(int i = 0; i < BlockSize; ++i)
//{
// std::cout<<" "<<fblock[i];
//}
std::cout << "\n";
vtkm::Id zfpBlock;
zfpBlock = blockIdx % ZFPDims;
vtkm::Id logicalStart = zfpBlock * vtkm::Id(4);
@ -107,12 +97,12 @@ public:
logicalStart + 4 > Dims ? vtkm::Int32(Dims - logicalStart) : vtkm::Int32(4);
//std::cout<<"Partial block "<<logicalStart<<" offset "<<offset<<"\n";
//std::cout<<"Nx "<<nx<<" "<<ny<<" "<<nz<<"\n";
ScatterPartial1(fblock, scalars, Dims, logicalStart, nx);
ScatterPartial1(fblock, scalars, logicalStart, nx);
}
else
{
//std::cout<<"FULL block "<<zfpBlock<<"\n";
Scatter1(fblock, scalars, Dims, logicalStart);
Scatter1(fblock, scalars, logicalStart);
}
}
};

9
vtkm/worklet/zfp/ZFPDecode2.h
View File

@ -85,15 +85,8 @@ public:
}
zfp::zfp_decode<BlockSize>(fblock, MaxBits, blockIdx, stream);
zfp::zfp_decode<BlockSize>(fblock, MaxBits, static_cast<vtkm::UInt32>(blockIdx), stream);
//for(int i = 0; i < BlockSize; ++i)
//{
// std::cout<<" "<<fblock[i];
//}
std::cout << "\n";
vtkm::Id2 zfpBlock;
zfpBlock[0] = blockIdx % ZFPDims[0];
zfpBlock[1] = (blockIdx / ZFPDims[0]) % ZFPDims[1];

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

@ -93,7 +93,7 @@ public:
}
zfp::zfp_decode<BlockSize>(fblock, MaxBits, blockIdx, stream);
zfp::zfp_decode<BlockSize>(fblock, MaxBits, static_cast<vtkm::UInt32>(blockIdx), stream);
//for(int i = 0; i < BlockSize; ++i)