Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for 4D arrays in ZFP compressor #4344

Merged
merged 5 commits into from
Oct 3, 2024
Merged

Support for 4D arrays in ZFP compressor #4344

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b75283
add 4d support for ZFP compressor
gregorweiss Aug 9, 2024
505a152
CMake check_c_source_runs for zfp_field_4d API function
gregorweiss Aug 9, 2024
b61b208
rollback: check ZFP version number is greater than 0.5.3
gregorweiss Sep 16, 2024
137a8d3
clang-format
gregorweiss Sep 18, 2024
06e0af3
Merge branch 'master' into feature/zfp-4d
gregorweiss Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions source/adios2/operator/compress/CompressZFP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
#define ZFP_DEFAULT_EXECUTION_POLICY zfp_exec_serial
#endif

/* CMake will make sure zfp >= 0.5.3
ZFP features 4D input data since version 0.5.4
https://zfp.readthedocs.io/en/release0.5.4/versions.html */
#if ZFP_VERSION_MAJOR > 0 || ZFP_VERSION_MINOR > 5 || \
(ZFP_VERSION_MINOR == 5 && ZFP_VERSION_PATCH > 3)
#define ADIOS2_HAVE_ZFP_4D
#endif

namespace adios2
{
namespace core
Expand Down Expand Up @@ -75,7 +83,11 @@ size_t CompressZFP::Operate(const char *dataIn, const Dims &blockStart, const Di
PutParameters(bufferOut, bufferOutOffset, m_Parameters);
// zfp V1 metadata end

#ifdef ADIOS2_HAVE_ZFP_4D
Dims convertedDims = ConvertDims(blockCount, type, 4);
#else
Dims convertedDims = ConvertDims(blockCount, type, 3);
#endif

zfp_field *field = GetZFPField(dataIn, convertedDims, type);
zfp_stream *stream = GetZFPStream(convertedDims, type, m_Parameters);
Expand Down Expand Up @@ -163,7 +175,11 @@ size_t CompressZFP::DecompressV1(const char *bufferIn, const size_t sizeIn, char
". Please make sure a compatible version is used for decompression.";
const Params parameters = GetParameters(bufferIn, bufferInOffset);

#ifdef ADIOS2_HAVE_ZFP_4D
Dims convertedDims = ConvertDims(blockCount, type, 4);
#else
Dims convertedDims = ConvertDims(blockCount, type, 3);
#endif

zfp_field *field = nullptr;
zfp_stream *stream = nullptr;
Expand Down Expand Up @@ -249,6 +265,13 @@ zfp_field *GetZFPField(const char *data, const Dims &dimensions, DataType type)
field = zfp_field_3d(const_cast<char *>(data), zfpType, dimensions[0], dimensions[1],
dimensions[2]);
}
#ifdef ADIOS2_HAVE_ZFP_4D
else if (dimensions.size() == 4)
{
field = zfp_field_4d(const_cast<char *>(data), zfpType, dimensions[0], dimensions[1],
dimensions[2], dimensions[3]);
}
#endif
else
{
helper::Throw<std::invalid_argument>("Operator", "CompressZFP", "GetZfpField",
Expand Down