Changeset 9ee2ce3 for thirdparty/SZ/sz/include/sz.h

Timestamp:

09/28/18 16:32:55 (6 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

e6aa0eb

Parents:

abca157

git-author:

Hal Finkel <hfinkel@…> (09/28/18 16:32:55)

git-committer:

Hal Finkel <hfinkel@…> (09/28/18 16:32:55)

Message:

importing new SZ files

File:

• thirdparty/SZ/sz/include/sz.h (modified) (8 diffs)

thirdparty/SZ/sz/include/sz.h

@@ -55 +55 @@
 #include "sz_float_ts.h"
 #include "szd_float_ts.h"
+#include "utility.h"
 
 #ifdef _WIN32
@@ -75 +76 @@
 //typedef unsigned long uint64_t;
 
-#define SZ_VERNUM 0x0140
-#define SZ_VER_MAJOR 1
-#define SZ_VER_MINOR 4
-#define SZ_VER_BUILD 13
-#define SZ_VER_REVISION 5
+#define SZ_VERNUM 0x0200
+#define SZ_VER_MAJOR 2
+#define SZ_VER_MINOR 0
+#define SZ_VER_BUILD 2
+#define SZ_VER_REVISION 0
 
 #define PASTRI 103
@@ -131 +132 @@
 #define SZ_TEMPORAL_COMPRESSION 3
 
+#define SZ_NO_REGRESSION 0
+#define SZ_WITH_LINEAR_REGRESSION 1
+
 #define SZ_PWR_MIN_TYPE 0
 #define SZ_PWR_AVG_TYPE 1
@@ -152 +156 @@
         
 #define numOfBufferedSteps 1 //the number of time steps in the buffer   
+
+
+#define GZIP_COMPRESSOR 0 //i.e., ZLIB_COMPRSSOR
+#define ZSTD_COMPRESSOR 1
         
 //Note: the following setting should be consistent with stateNum in Huffman.h
@@ -237 +245 @@
         unsigned int maxRangeRadius;
         int sol_ID;// it's always SZ, unless the setting is PASTRI compression mode (./configure --enable-pastri)
+        int losslessCompressor;
         int sampleDistance; //2 bytes
         float predThreshold;  // 2 bytes
@@ -279 +288 @@
         char metadata_filename[256];
         FILE *metadata_file;
+        unsigned char* bit_array; //sihuan added
+        size_t intersect_size; //sihuan added
+        int64_t* hist_index; //sihuan added: prestep index 
+
 } sz_tsc_metadata;
 
@@ -290 +303 @@
 extern sz_params *confparams_dec;
 extern sz_exedata *exe_params;
+extern int sz_with_regression;
+
 //------------------------------------------------
 extern SZ_VarSet* sz_varset;
@@ -357 +372 @@
 size_t compute_total_batch_size();
 
-int isZlibFormat(unsigned char magic1, unsigned char magic2);
-
 void SZ_registerVar(char* varName, int dataType, void* data, 
                         int errBoundMode, double absErrBound, double relBoundRatio, double pwRelBoundRatio,