Skip to content

Avoid exposing rANS internal details to ROOT #11892

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

Merged
TimoWilken merged 1 commit into from
Sep 14, 2023
Merged

Avoid exposing rANS internal details to ROOT #11892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/EncodedBlocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@
#include "DetectorsCommonDataFormats/internal/InplaceEntropyCoder.h"
#include "DetectorsCommonDataFormats/internal/Packer.h"
#include "DetectorsCommonDataFormats/Metadata.h"
#ifndef __CLING__
#include "rANS/compat.h"
#include "rANS/histogram.h"
#include "rANS/serialize.h"
#include "rANS/factory.h"
#include "rANS/metrics.h"
#include "rANS/serialize.h"
#include "rANS/utils.h"
#endif

namespace o2
{
Expand Down Expand Up @@ -333,8 +335,10 @@ class EncodedBlocks
public:
typedef EncodedBlocks<H, N, W> base;

#ifndef __CLING__
template <typename source_T>
using dictionaryType = std::variant<rans::RenormedSparseHistogram<source_T>, rans::RenormedDenseHistogram<source_T>>;
#endif

void setHeader(const H& h) { mHeader = h; }
const H& getHeader() const { return mHeader; }
Expand All @@ -357,6 +361,7 @@ class EncodedBlocks
return mBlocks[i];
}

#ifndef __CLING__
template <typename source_T>
dictionaryType<source_T> getDictionary(int i, ANSHeader ansVersion = ANSVersionUnspecified) const
{
Expand Down Expand Up @@ -393,6 +398,7 @@ class EncodedBlocks
throw std::runtime_error(fmt::format("Failed to load serialized Dictionary. Unsupported ANS Version: {}", static_cast<std::string>(ansVersion)));
}
};
#endif

void setANSHeader(const ANSHeader& h)
{
Expand Down Expand Up @@ -913,6 +919,7 @@ CTFIOSize EncodedBlocks<H, N, W>::decode(D_IT dest, // it
}
};

#ifndef __CLING__
template <typename H, int N, typename W>
template <typename dst_IT>
CTFIOSize EncodedBlocks<H, N, W>::decodeCompatImpl(dst_IT dstBegin, int slot, const std::any& decoderExt) const
Expand Down Expand Up @@ -1400,6 +1407,7 @@ CTFIOSize EncodedBlocks<H, N, W>::encodeRANSV1Inplace(const input_IT srcBegin, c

return {0, thisMetadata->getUncompressedSize(), thisMetadata->getCompressedSize()};
}; // namespace ctf
#endif

template <typename H, int N, typename W>
template <typename input_IT, typename buffer_T>
Expand Down