diff --git a/source/adios2/toolkit/format/bp/bpOperation/BPOperation.cpp b/source/adios2/toolkit/format/bp/bpOperation/BPOperation.cpp index 0f7b497063..4f4c0068a2 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/BPOperation.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/BPOperation.cpp @@ -17,46 +17,18 @@ namespace format { #define declare_type(T) \ - void BPOperation::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - } \ \ - void BPOperation::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - } \ - \ - void BPOperation::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - } - -ADIOS2_FOREACH_STDTYPE_1ARG(declare_type) -#undef declare_type - -#define declare_type(T) \ - \ - template void BPOperation::SetDataDefault( \ + template void BPOperation::SetData( \ const core::Variable &, const typename core::Variable::BPInfo &, \ const typename core::Variable::Operation &, BufferSTL &bufferSTL) \ const noexcept; \ \ - template void BPOperation::SetMetadataDefault( \ + template void BPOperation::SetMetadata( \ const core::Variable &, const typename core::Variable::BPInfo &, \ const typename core::Variable::Operation &, std::vector &) \ const noexcept; \ \ - template void BPOperation::UpdateMetadataDefault( \ + template void BPOperation::UpdateMetadata( \ const core::Variable &, const typename core::Variable::BPInfo &, \ const typename core::Variable::Operation &, std::vector &) \ const noexcept; diff --git a/source/adios2/toolkit/format/bp/bpOperation/BPOperation.h b/source/adios2/toolkit/format/bp/bpOperation/BPOperation.h index d022231171..d5a3fd9c72 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/BPOperation.h +++ b/source/adios2/toolkit/format/bp/bpOperation/BPOperation.h @@ -30,28 +30,6 @@ class BPOperation BPOperation() = default; virtual ~BPOperation() = default; -#define declare_type(T) \ - virtual void SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept; \ - \ - virtual void SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept; \ - \ - virtual void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept; - - ADIOS2_FOREACH_STDTYPE_1ARG(declare_type) -#undef declare_type - /** * Deserializes metadata in the form of parameters * @param buffer contains serialized metadata buffer @@ -64,41 +42,38 @@ class BPOperation const helper::BlockOperationInfo &blockOperationInfo, char *dataOutput) const = 0; -protected: template - void SetDataDefault(const core::Variable &variable, - const typename core::Variable::BPInfo &blockInfo, - const typename core::Variable::Operation &operation, - BufferSTL &bufferSTL) const noexcept; + void SetData(const core::Variable &variable, + const typename core::Variable::BPInfo &blockInfo, + const typename core::Variable::Operation &operation, + BufferSTL &bufferSTL) const noexcept; template - void - SetMetadataDefault(const core::Variable &variable, - const typename core::Variable::BPInfo &blockInfo, - const typename core::Variable::Operation &operation, - std::vector &buffer) const noexcept; + void SetMetadata(const core::Variable &variable, + const typename core::Variable::BPInfo &blockInfo, + const typename core::Variable::Operation &operation, + std::vector &buffer) const noexcept; template - void UpdateMetadataDefault( - const core::Variable &variable, - const typename core::Variable::BPInfo &blockInfo, - const typename core::Variable::Operation &operation, - std::vector &buffer) const noexcept; + void UpdateMetadata(const core::Variable &variable, + const typename core::Variable::BPInfo &blockInfo, + const typename core::Variable::Operation &operation, + std::vector &buffer) const noexcept; }; #define declare_type(T) \ \ - extern template void BPOperation::SetDataDefault( \ + extern template void BPOperation::SetData( \ const core::Variable &, const typename core::Variable::BPInfo &, \ const typename core::Variable::Operation &, BufferSTL &bufferSTL) \ const noexcept; \ \ - extern template void BPOperation::SetMetadataDefault( \ + extern template void BPOperation::SetMetadata( \ const core::Variable &, const typename core::Variable::BPInfo &, \ const typename core::Variable::Operation &, std::vector &) \ const noexcept; \ \ - extern template void BPOperation::UpdateMetadataDefault( \ + extern template void BPOperation::UpdateMetadata( \ const core::Variable &, const typename core::Variable::BPInfo &, \ const typename core::Variable::Operation &, std::vector &) \ const noexcept; diff --git a/source/adios2/toolkit/format/bp/bpOperation/BPOperation.tcc b/source/adios2/toolkit/format/bp/bpOperation/BPOperation.tcc index 1782256235..dc6ec92d0d 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/BPOperation.tcc +++ b/source/adios2/toolkit/format/bp/bpOperation/BPOperation.tcc @@ -20,7 +20,7 @@ namespace format // DEFAULTS only saves input and output payload sizes in metadata // PROTECTED template -void BPOperation::SetDataDefault( +void BPOperation::SetData( const core::Variable &variable, const typename core::Variable::BPInfo &blockInfo, const typename core::Variable::Operation &operation, @@ -43,7 +43,7 @@ void BPOperation::SetDataDefault( } template -void BPOperation::SetMetadataDefault( +void BPOperation::SetMetadata( const core::Variable &variable, const typename core::Variable::BPInfo &blockInfo, const typename core::Variable::Operation &operation, @@ -65,7 +65,7 @@ void BPOperation::SetMetadataDefault( } template -void BPOperation::UpdateMetadataDefault( +void BPOperation::UpdateMetadata( const core::Variable &variable, const typename core::Variable::BPInfo &blockInfo, const typename core::Variable::Operation &operation, diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.cpp index eac3f30ae8..21da5e7ebb 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.cpp @@ -21,37 +21,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPBZIP2::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPBZIP2::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPBZIP2::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_type) -#undef declare_type - void BPBZIP2::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.h index e56ddffc4b..50a1a44755 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBZIP2.h @@ -28,26 +28,6 @@ class BPBZIP2 : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; - // using override due to PGI compiler warnings -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.cpp index 584667f4cd..fbba7653d2 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.cpp @@ -21,37 +21,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPBlosc::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPBlosc::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPBlosc::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_type) -#undef declare_type - void BPBlosc::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.h index a1d619347f..15d83b7592 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPBlosc.h @@ -28,25 +28,6 @@ class BPBlosc : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.cpp index 9d87adfd65..d63b320196 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.cpp @@ -22,37 +22,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPLIBPRESSIO::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPLIBPRESSIO::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPLIBPRESSIO::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_LIBPRESSIO_TYPE_1ARG(declare_type) -#undef declare_type - void BPLIBPRESSIO::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.h index 9059a73e45..900c328d9d 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPLIBPRESSIO.h @@ -28,25 +28,6 @@ class BPLIBPRESSIO : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_LIBPRESSIO_TYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.cpp index eda59dc5a7..248058d182 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.cpp @@ -22,37 +22,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPMGARD::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPMGARD::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPMGARD::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_MGARD_TYPE_1ARG(declare_type) -#undef declare_type - void BPMGARD::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.h index bbc397c147..69e275dd72 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPMGARD.h @@ -28,25 +28,6 @@ class BPMGARD : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_MGARD_TYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.cpp index 0a5b0033cd..d8864b19e1 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.cpp @@ -21,37 +21,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPPNG::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPPNG::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPPNG::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_type) -#undef declare_type - void BPPNG::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.h index d81ea94c01..421136cef6 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPPNG.h @@ -28,25 +28,6 @@ class BPPNG : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.cpp index 512c8bba11..e9a3646578 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.cpp @@ -22,36 +22,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPSZ::SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPSZ::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPSZ::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_SZ_TYPE_1ARG(declare_type) -#undef declare_type - void BPSZ::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.h index deef59bbdf..3e232e944f 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSZ.h @@ -28,25 +28,6 @@ class BPSZ : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_SZ_TYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.cpp index 4616045ef8..8ed21389e8 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.cpp @@ -21,37 +21,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPSirius::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPSirius::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPSirius::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_SIRIUS_TYPE_1ARG(declare_type) -#undef declare_type - void BPSirius::GetMetadata(const std::vector &buffer, Params &info) const noexcept { diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.h index 2a2bc4fa90..dadfb38af3 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPSirius.h @@ -28,25 +28,6 @@ class BPSirius : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_SIRIUS_TYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.cpp b/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.cpp index bcf9dbcf21..7db8178f01 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.cpp +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.cpp @@ -22,37 +22,6 @@ namespace adios2 namespace format { -#define declare_type(T) \ - void BPZFP::SetData( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept \ - { \ - SetDataDefault(variable, blockInfo, operation, bufferSTL); \ - } \ - \ - void BPZFP::SetMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - SetMetadataDefault(variable, blockInfo, operation, buffer); \ - } \ - \ - void BPZFP::UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept \ - { \ - UpdateMetadataDefault(variable, blockInfo, operation, buffer); \ - } - -ADIOS2_FOREACH_ZFP_TYPE_1ARG(declare_type) -#undef declare_type - void BPZFP::GetMetadata(const std::vector &buffer, Params &info) const noexcept { @@ -61,25 +30,6 @@ void BPZFP::GetMetadata(const std::vector &buffer, Params &info) const std::to_string(helper::ReadValue(buffer, position)); info["OutputSize"] = std::to_string(helper::ReadValue(buffer, position)); - const int mode = - static_cast(helper::ReadValue(buffer, position)); - - const std::string modeStr(buffer.data() + position); - - switch (mode) - { - case zfp_mode_precision: - info["precision"] = modeStr; - break; - - case zfp_mode_accuracy: - info["accuracy"] = modeStr; - break; - - case zfp_mode_rate: - info["rate"] = modeStr; - break; - } } void BPZFP::GetData(const char *input, diff --git a/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.h b/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.h index 90fee2201b..4eac0a1fcd 100644 --- a/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.h +++ b/source/adios2/toolkit/format/bp/bpOperation/compress/BPZFP.h @@ -28,25 +28,6 @@ class BPZFP : public BPOperation using BPOperation::SetData; using BPOperation::SetMetadata; using BPOperation::UpdateMetadata; -#define declare_type(T) \ - void SetData(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - BufferSTL &bufferSTL) const noexcept override; \ - \ - void SetMetadata(const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; \ - \ - void UpdateMetadata( \ - const core::Variable &variable, \ - const typename core::Variable::BPInfo &blockInfo, \ - const typename core::Variable::Operation &operation, \ - std::vector &buffer) const noexcept override; - - ADIOS2_FOREACH_ZFP_TYPE_1ARG(declare_type) -#undef declare_type void GetMetadata(const std::vector &buffer, Params &info) const noexcept final; @@ -54,21 +35,6 @@ class BPZFP : public BPOperation void GetData(const char *input, const helper::BlockOperationInfo &blockOperationInfo, char *dataOutput) const final; - -private: - enum Mode - { - zfp_mode_accuracy = 0, - zfp_mode_precision = 1, - zfp_mode_rate = 2 - }; - - template - void - SetMetadataCommon(const core::Variable &variable, - const typename core::Variable::BPInfo &blockInfo, - const typename core::Variable::Operation &operation, - std::vector &buffer) const noexcept; }; } // end namespace format