Changeset 9ee2ce3 for thirdparty/SZ/sz/src/sz.c

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/src/sz.c (modified) (8 diffs)

thirdparty/SZ/sz/src/sz.c

@@ -23 +23 @@
 #include "Huffman.h"
 #include "conf.h"
+#include "utility.h"
 //#include "CurveFillingCompressStorage.h"
 
@@ -36 +37 @@
 
 sz_exedata *exe_params = NULL;
+
+int sz_with_regression = SZ_WITH_LINEAR_REGRESSION; //SZ_NO_REGRESSION
 
 /*following global variables are desgined for time-series based compression*/
@@ -70 +73 @@
 int SZ_Init_Params(sz_params *params)
 {
-        int x = 1;
-        char *y = (char*)&x;
-        int endianType = BIG_ENDIAN_SYSTEM;
-        if(*y==1) endianType = LITTLE_ENDIAN_SYSTEM;
-
-        sysEndianType = endianType;
-        exe_params->SZ_SIZE_TYPE = sizeof(size_t);
-
-        // set default values
-        if(params->max_quant_intervals > 0) 
+        SZ_Init(NULL);
+
+        if(params->losslessCompressor!=GZIP_COMPRESSOR && params->losslessCompressor!=ZSTD_COMPRESSOR)
+                params->losslessCompressor = ZSTD_COMPRESSOR;
+
+        if(params->max_quant_intervals > 0)
                 params->maxRangeRadius = params->max_quant_intervals/2;
-        else
-                params->max_quant_intervals = params->maxRangeRadius*2;
-
-        exe_params->intvCapacity = params->maxRangeRadius*2;
-        exe_params->intvRadius = params->maxRangeRadius;
-
-        if(params->quantization_intervals>0)
-        {
-                updateQuantizationInfo(params->quantization_intervals);
-                exe_params->optQuantMode = 0;
-        }
-        else
-                exe_params->optQuantMode = 1;
-
+                
+        memcpy(confparams_cpr, params, sizeof(sz_params));
 
         if(params->quantization_intervals%2!=0)
@@ -101 +88 @@
                 return SZ_NSCS;
         }
-
-        confparams_cpr = (sz_params*)malloc(sizeof(sz_params));
-        memcpy(confparams_cpr, params, sizeof(sz_params));      
 
         return SZ_SCES;
@@ -536 +520 @@
         //confparams_dec->szMode = (sameRByte & 0x06)>>1;
         isLossless = (sameRByte & 0x10)>>4;
+        
+        int isRandomAccess = (sameRByte >> 7) & 0x01;
+        
+        if(exe_params==NULL)
+        {
+                exe_params = (sz_exedata *)malloc(sizeof(struct sz_exedata));
+                memset(exe_params, 0, sizeof(struct sz_exedata));
+        }
         exe_params->SZ_SIZE_TYPE = ((sameRByte & 0x40)>>6)==1?8:4;
         
@@ -548 +540 @@
         dataSeriesLength = bytesToSize(&(bytes[index]));// 4 or 8       
         index += exe_params->SZ_SIZE_TYPE;
-        index += 4; //max_quant_intervals
-        
+        //index += 4; //max_quant_intervals
+
         sz_metadata* metadata = (sz_metadata*)malloc(sizeof(struct sz_metadata));
         
@@ -565 +557 @@
         if(isConstant==0 && isLossless==0)
         {
-                int radExpoL = 0, segmentL = 0, pwrErrBoundBytesL = 0;
-                if(metadata->conf_params->errorBoundMode >= PW_REL)
+                if(isRandomAccess==1)
                 {
-                        radExpoL = 1;
-                        segmentL = exe_params->SZ_SIZE_TYPE;
-                        pwrErrBoundBytesL = 4;
+                        unsigned char* raBytes = &(bytes[index]);
+                        defactoNBBins = bytesToInt_bigEndian(raBytes + sizeof(int) + sizeof(double));
                 }
-                
-                int offset_typearray = 3 + 1 + MetaDataByteLength + exe_params->SZ_SIZE_TYPE + 4 + radExpoL + segmentL + pwrErrBoundBytesL + 4 + 4 + 1 + 8 
-                                + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE;
-                size_t nodeCount = bytesToInt_bigEndian(bytes+offset_typearray);
-                defactoNBBins = (nodeCount+1)/2;
-        }
+                else
+                {
+                        int radExpoL = 0, segmentL = 0, pwrErrBoundBytesL = 0;
+                        if(metadata->conf_params->errorBoundMode >= PW_REL)
+                        {
+                                radExpoL = 1;
+                                segmentL = exe_params->SZ_SIZE_TYPE;
+                                pwrErrBoundBytesL = 4;
+                        }
+                        
+                        int offset_typearray = 3 + 1 + MetaDataByteLength + exe_params->SZ_SIZE_TYPE + 4 + radExpoL + segmentL + pwrErrBoundBytesL + 4 + (4 + params->dataType*4) + 1 + 8 
+                                        + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + 4;
+                        defactoNBBins = bytesToInt_bigEndian(bytes+offset_typearray);                   
+                }
+
+        }       
         
         metadata->defactoNBBins = defactoNBBins;
@@ -778 +778 @@
         }
         return totalSize;
-}
-
-int isZlibFormat(unsigned char magic1, unsigned char magic2)
-{
-        if(magic1==104&&magic2==5) //DC+BS
-                return 1;
-        if(magic1==104&&magic2==129) //DC+DC
-                return 1;
-        if(magic1==104&&magic2==222) //DC+BC
-                return 1;
-        if(magic1==120&&magic2==1) //BC+BS
-                return 1;
-        if(magic1==120&&magic2==156) //BC+DC
-                return 1;
-        if(magic1==120&&magic2==218) //BC+BS
-                return 1;
-        return 0;
 }