Avoid exposing rANS internal details to ROOT (#11892)

ktf · davidrohr · commit 3ca9050f8f04 · 2023-10-10T15:06:40.000+02:00
diff --git a/DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/EncodedBlocks.h b/DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/EncodedBlocks.h
@@ -40,6 +40,7 @@
 #include "rANS/factory.h"
 #include "rANS/metrics.h"
 #include "rANS/utils.h"
+#endif
 
 namespace o2
 {
@@ -333,8 +334,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)
   {
@@ -360,6 +363,7 @@ class EncodedBlocks
     return mBlocks[i];
   }
 
+#ifndef __CLING__
   template <typename source_T>
   dictionaryType<source_T> getDictionary(int i, ANSHeader ansVersion = ANSVersionUnspecified) const
   {
@@ -416,6 +420,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)
   {
@@ -940,6 +945,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
@@ -1425,6 +1431,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>

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`#include "rANS/factory.h"`
`41`	`41`	`#include "rANS/metrics.h"`
`42`	`42`	`#include "rANS/utils.h"`
	`43`	`+#endif`
`43`	`44`
`44`	`45`	`namespace o2`
`45`	`46`	`{`
`@@ -333,8 +334,10 @@ class EncodedBlocks`
`333`	`334`	`public:`
`334`	`335`	`typedef EncodedBlocks<H, N, W> base;`
`335`	`336`
	`337`	`+#ifndef __CLING__`
`336`	`338`	`template <typename source_T>`
`337`	`339`	`using dictionaryType = std::variant<rans::RenormedSparseHistogram<source_T>, rans::RenormedDenseHistogram<source_T>>;`
	`340`	`+#endif`
`338`	`341`
`339`	`342`	`void setHeader(const H& h)`
`340`	`343`	`{`
`@@ -360,6 +363,7 @@ class EncodedBlocks`
`360`	`363`	`return mBlocks[i];`
`361`	`364`	`}`
`362`	`365`
	`366`	`+#ifndef __CLING__`
`363`	`367`	`template <typename source_T>`
`364`	`368`	`dictionaryType<source_T> getDictionary(int i, ANSHeader ansVersion = ANSVersionUnspecified) const`
`365`	`369`	`{`
`@@ -416,6 +420,7 @@ class EncodedBlocks`
`416`	`420`	`throw std::runtime_error(fmt::format("Failed to load serialized Dictionary. Unsupported ANS Version: {}", static_cast<std::string>(ansVersion)));`
`417`	`421`	`}`
`418`	`422`	`};`
	`423`	`+#endif`
`419`	`424`
`420`	`425`	`void setANSHeader(const ANSHeader& h)`
`421`	`426`	`{`
`@@ -940,6 +945,7 @@ CTFIOSize EncodedBlocks<H, N, W>::decode(D_IT dest, // it`
`940`	`945`	`}`
`941`	`946`	`};`
`942`	`947`
	`948`	`+#ifndef __CLING__`
`943`	`949`	`template <typename H, int N, typename W>`
`944`	`950`	`template <typename dst_IT>`
`945`	`951`	`CTFIOSize EncodedBlocks<H, N, W>::decodeCompatImpl(dst_IT dstBegin, int slot, const std::any& decoderExt) const`
`@@ -1425,6 +1431,7 @@ CTFIOSize EncodedBlocks<H, N, W>::encodeRANSV1Inplace(const input_IT srcBegin, c`
`1425`	`1431`
`1426`	`1432`	`return {0, thisMetadata->getUncompressedSize(), thisMetadata->getCompressedSize()};`
`1427`	`1433`	`}; // namespace ctf`
	`1434`	`+#endif`
`1428`	`1435`
`1429`	`1436`	`template <typename H, int N, typename W>`
`1430`	`1437`	`template <typename input_IT, typename buffer_T>`