New release

lemire · lemire · commit 74c0dc37dcea · 2014-08-21T15:02:58.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,8 @@
-upcoming 
+0.1.5 August 21st 2014
     Added SIMD versions of OptPFD and NewPFD.
     Fixed buffer overrun in varintg8iu
     Factor out decodeBlock method from decodeArray (Matthias Petri)
+    Renamed the FastPfor namespace FastPforLib to avoid name clash
 0.1.4  May 21st 2014
     Added "myths" section to README file
 0.1.3  January 22nd 2014
diff --git a/example.cpp b/example.cpp
@@ -14,7 +14,7 @@
 
 
 int main() {
-    using namespace FastPFor;
+    using namespace FastPForLib;
 
     // We pick a CODEC
     IntegerCODEC & codec =  * CODECFactory::getFromName("simdfastpfor");
diff --git a/headers/VarIntG8IU.h b/headers/VarIntG8IU.h
@@ -15,7 +15,7 @@
 #define PREDICT_FALSE(x) x
 #endif
 
-namespace FastPFor {
+namespace FastPForLib {
 /**
  *
  * Implementation of varint-G8IU taken from
diff --git a/headers/bitpackingaligned.h b/headers/bitpackingaligned.h
@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 const uint32_t * fastunpack_8(const uint32_t * __restrict__ in,
         uint32_t * __restrict__ out, const uint32_t bit);
diff --git a/headers/bitpackinghelpers.h b/headers/bitpackinghelpers.h
@@ -10,7 +10,7 @@
 
 #include "bitpacking.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 inline void fastunpack(const uint32_t *  __restrict__ in, uint32_t *  __restrict__  out, const uint32_t bit) {
     // Could have used function pointers instead of switch.
diff --git a/headers/bitpackingunaligned.h b/headers/bitpackingunaligned.h
@@ -8,7 +8,7 @@
 #define BITPACKINGUNALIGNED
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 typedef uint8_t byte;
 
diff --git a/headers/blockpacking.h b/headers/blockpacking.h
@@ -14,7 +14,7 @@
 #include "bitpackingaligned.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * This is 32-bit *aligned* binary packing, designed from the
diff --git a/headers/codecfactory.h b/headers/codecfactory.h
@@ -31,7 +31,7 @@
 #include "simdbinarypacking.h"
 #include "snappydelta.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 typedef std::map<std::string, std::shared_ptr<IntegerCODEC> > CodecMap;
 
diff --git a/headers/codecs.h b/headers/codecs.h
@@ -12,7 +12,7 @@
 #include "util.h"
 #include "bitpackinghelpers.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 class NotEnoughStorage: public std::runtime_error {
 public:
diff --git a/headers/compositecodec.h b/headers/compositecodec.h
@@ -11,7 +11,7 @@
 #include "util.h"
 #include "codecs.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * This is a useful class for CODEC that only compress
diff --git a/headers/cpubenchmark.h b/headers/cpubenchmark.h
@@ -10,11 +10,11 @@
 
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 #if defined( __corei7__  )  // __amd64__ is untested
 // start and stop are as recommended by
-// Gabriele Paoloni, How to Benchmark Code Execution Times on Intel� IA-32 and IA-64 Instruction Set Architectures
+// Gabriele Paoloni, How to Benchmark Code Execution Times on Intel� IA-32 and IA-64 Instruction Set Architectures
 // September 2010
 // http://edc.intel.com/Link.aspx?id=3954
 
diff --git a/headers/csv.h b/headers/csv.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 enum {
     INCREASINGCARDINALITY, DECREASINGCARDINALITY
diff --git a/headers/deltautil.h b/headers/deltautil.h
@@ -15,7 +15,7 @@
 #include "entropy.h"
 #include "ztimer.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * This file is made of various convenient functions and structures.
diff --git a/headers/entropy.h b/headers/entropy.h
@@ -12,7 +12,7 @@
 #include "common.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 class EntropyRecorder {
 public:
diff --git a/headers/externalvector.h b/headers/externalvector.h
@@ -11,7 +11,7 @@
 #include <queue>
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 template<class CMP>
 class BinaryFileBuffer {
diff --git a/headers/fastpfor.h b/headers/fastpfor.h
@@ -14,7 +14,7 @@
 #include "blockpacking.h"
 #include "simple8b.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * FastPFor
diff --git a/headers/horizontalbitpacking.h b/headers/horizontalbitpacking.h
@@ -31,7 +31,7 @@
 #endif
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 void simdhunpack(const uint8_t * __restrict__ in,uint32_t * __restrict__ out, uint32_t bit);
 
diff --git a/headers/maropuparser.h b/headers/maropuparser.h
@@ -10,7 +10,7 @@
 
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * This is just a bit of code to parse the binary files provided by the
diff --git a/headers/memutil.h b/headers/memutil.h
@@ -10,7 +10,7 @@
 
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 template<class T, size_t alignment>
 T * moveToBoundary(T * inbyte) {
diff --git a/headers/mersenne.h b/headers/mersenne.h
@@ -9,7 +9,7 @@
 #include "common.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  *  Mersenne twister - random number generator.
diff --git a/headers/newpfor.h b/headers/newpfor.h
@@ -19,7 +19,7 @@
 #include "util.h"
 #include "codecs.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * NewPFD also known as NewPFOR.
diff --git a/headers/optpfor.h b/headers/optpfor.h
@@ -18,7 +18,7 @@
 #include "simple16.h"
 #include "newpfor.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * OptPFD
diff --git a/headers/packingvectors.h b/headers/packingvectors.h
@@ -11,7 +11,7 @@
 #include "common.h"
 #include "bitpacking.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 template <uint32_t PACKSIZE = 32>
 class packingvector
diff --git a/headers/pfor.h b/headers/pfor.h
@@ -13,7 +13,7 @@
 #include "bitpacking.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * This implements as best as possible the PFor scheme
diff --git a/headers/pfor2008.h b/headers/pfor2008.h
@@ -14,7 +14,7 @@
 #include "util.h"
 #include <iostream>
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * Follows:
diff --git a/headers/rolledbitpacking.h b/headers/rolledbitpacking.h
@@ -13,7 +13,7 @@
 #include "util.h"
 
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /***
  * The idea here is not to unroll the loops and to let the
diff --git a/headers/simdbinarypacking.h b/headers/simdbinarypacking.h
@@ -12,7 +12,7 @@
 #include "simdbitpacking.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  *
diff --git a/headers/simdbitpacking.h b/headers/simdbitpacking.h
@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 void simdpack(const uint32_t * __restrict__ in,__m128i * __restrict__ out, uint32_t bit);
 void simdpackwithoutmask(const uint32_t * __restrict__ in,__m128i * __restrict__ out, uint32_t bit);
diff --git a/headers/simdfastpfor.h b/headers/simdfastpfor.h
@@ -13,7 +13,7 @@
 #include "memutil.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * SIMDFastPFor
diff --git a/headers/simdnewpfor.h b/headers/simdnewpfor.h
@@ -23,7 +23,7 @@
 #include "usimdbitpacking.h"
 
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * SIMDNewPFD, a SIMD-version of NewPFD designed by D. Lemire.
diff --git a/headers/simdoptpfor.h b/headers/simdoptpfor.h
@@ -18,7 +18,7 @@
 #include "simple16.h"
 #include "simdnewpfor.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * SIMDOptPFor, a SIMD-version of OPTPFor designed by D. Lemire
diff --git a/headers/simdpfor.h b/headers/simdpfor.h
@@ -13,7 +13,7 @@
 #include "usimdbitpacking.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * This implements as best as possible the PFor scheme
diff --git a/headers/simple16.h b/headers/simple16.h
@@ -15,7 +15,7 @@
 #include "common.h"
 #include "codecs.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * If MarkLength is true, than the number of symbols is written
diff --git a/headers/simple8b.h b/headers/simple8b.h
@@ -11,7 +11,7 @@
 #include "common.h"
 #include "codecs.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * Follows Vo Ngoc Anh, Alistair Moffat: Index compression using 64-bit words.
@@ -31,7 +31,6 @@ namespace FastPFor {
 template<bool MarkLength>
 class Simple8b: public IntegerCODEC {
 public:
-
     template<uint32_t num1, uint32_t log1>
     static bool tryme(const uint32_t *n, size_t len) {
         if (log1 >= 32)
@@ -53,7 +52,6 @@ class Simple8b: public IntegerCODEC {
         }
         return true;
     }
-
     static void bit_writer(uint64_t * out, const uint32_t value,
             const uint32_t bits) {
         *out = (*out << bits) | value;
diff --git a/headers/simple9.h b/headers/simple9.h
@@ -14,7 +14,7 @@
 #include "common.h"
 #include "codecs.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 /**
  * If MarkLength is true, than the number of symbols is written
diff --git a/headers/stringutil.h b/headers/stringutil.h
@@ -12,7 +12,7 @@
 #include "common.h"
 #include "util.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 using namespace std;
 
diff --git a/headers/synthetic.h b/headers/synthetic.h
@@ -13,7 +13,7 @@
 #include "mersenne.h"
 #include "memutil.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 std::vector<uint32_t,cacheallocator> generateArray(uint32_t N, const uint32_t mask = 0xFFFFFFFFU) {
     std::vector<uint32_t,cacheallocator> ans(N);
diff --git a/headers/usimdbitpacking.h b/headers/usimdbitpacking.h
@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 void usimdpack(const uint32_t * __restrict__ in,__m128i * __restrict__ out, uint32_t bit);
 void usimdpackwithoutmask(const uint32_t * __restrict__ in,__m128i * __restrict__ out, uint32_t bit);
diff --git a/headers/util.h b/headers/util.h
@@ -14,7 +14,7 @@
 #define USE_O_DIRECT
 #endif
 
-namespace FastPFor {
+namespace FastPForLib {
 
 //#define STATS
 // taken from stackoverflow
diff --git a/headers/variablebyte.h b/headers/variablebyte.h
@@ -10,7 +10,7 @@
 #include "common.h"
 #include "codecs.h"
 
-namespace FastPFor {
+namespace FastPForLib {
 
 class VariableByte: public IntegerCODEC {
 public:
diff --git a/headers/vsencoding.h b/headers/vsencoding.h
diff --git a/headers/ztimer.h b/headers/ztimer.h
diff --git a/src/benchbitpacking.cpp b/src/benchbitpacking.cpp
diff --git a/src/bitpackingaligned.cpp b/src/bitpackingaligned.cpp
diff --git a/src/bitpackingunaligned.cpp b/src/bitpackingunaligned.cpp
diff --git a/src/codecs.cpp b/src/codecs.cpp
diff --git a/src/csv2maropu.cpp b/src/csv2maropu.cpp
diff --git a/src/entropy.cpp b/src/entropy.cpp
diff --git a/src/gapstats.cpp b/src/gapstats.cpp
diff --git a/src/inmemorybenchmark.cpp b/src/inmemorybenchmark.cpp
diff --git a/src/partitionbylength.cpp b/src/partitionbylength.cpp
diff --git a/src/simdbitpacking.cpp b/src/simdbitpacking.cpp
diff --git a/src/simdunalignedbitpacking.cpp b/src/simdunalignedbitpacking.cpp
diff --git a/src/unit.cpp b/src/unit.cpp

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#define PREDICT_FALSE(x) x`
`16`	`16`	`#endif`
`17`	`17`
`18`		`-namespace FastPFor {`
	`18`	`+namespace FastPForLib {`
`19`	`19`	`/**`
`20`	`20`	`*`
`21`	`21`	`* Implementation of varint-G8IU taken from`