Changeset 9ee2ce3 for thirdparty/SZ/sz/src/TightDataPointStorageD.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/TightDataPointStorageD.c (modified) (13 diffs)

thirdparty/SZ/sz/src/TightDataPointStorageD.c

@@ -47 +47 @@
         (*this)->pwrErrBoundBytes = NULL;
         (*this)->pwrErrBoundBytes_size = 0;
+        
+        (*this)->raBytes = NULL;
+        (*this)->raBytes_size = 0;
+
 }
 
@@ -84 +88 @@
         int mode = confparams_dec->szMode;
         int predictionMode = confparams_dec->predictionMode;
+        int losslessCompressor = confparams_dec->losslessCompressor;
         if(confparams_dec!=NULL)
                 free(confparams_dec);
         confparams_dec = params;
         confparams_dec->szMode = mode;
+        confparams_dec->losslessCompressor = losslessCompressor;
+        
         if(mode==SZ_TEMPORAL_COMPRESSION)
         {
@@ -94 +101 @@
         }
         index += MetaDataByteLength;
+
+        int isRandomAccess = (sameRByte >> 7) & 0x01;
 
         unsigned char dsLengthBytes[8];
@@ -122 +131 @@
                 (*this)->allSameData = 0;
                 
+        if(isRandomAccess == 1)
+        {
+                (*this)->raBytes_size = flatBytesLength - 3 - 1 - MetaDataByteLength - exe_params->SZ_SIZE_TYPE;
+                (*this)->raBytes = &(flatBytes[index]);
+                return errorBoundMode;
+        }                                       
+                
         int rtype_ = sameRByte & 0x08; //1000           
 
@@ -205 +221 @@
                 (*this)->leadNumArray_size = (logicLeadNumBitsNum >> 3) + 1;
         }
+        
+        int minLogValueSize = 0;
+        if(errorBoundMode>=PW_REL)
+                minLogValueSize = 8;
 
         if ((*this)->rtypeArray != NULL) 
@@ -210 +230 @@
                 (*this)->residualMidBits_size = flatBytesLength - 3 - 1 - MetaDataByteLength - exe_params->SZ_SIZE_TYPE - 4 - radExpoL - segmentL - pwrErrBoundBytesL - 4 - 8 - 1 - 8 
                                 - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - 8 - (*this)->rtypeArray_size 
-                                - (*this)->typeArray_size - (*this)->leadNumArray_size
+                                - minLogValueSize - (*this)->typeArray_size - (*this)->leadNumArray_size
                                 - (*this)->exactMidBytes_size - pwrErrBoundBytes_size;
                 for (i = 0; i < (*this)->rtypeArray_size; i++)
@@ -218 +238 @@
         {
                 (*this)->residualMidBits_size = flatBytesLength - 3 - 1 - MetaDataByteLength - exe_params->SZ_SIZE_TYPE - 4 - radExpoL - segmentL - pwrErrBoundBytesL - 4 - 8 - 1 - 8
-                                - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - (*this)->typeArray_size
+                                - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - exe_params->SZ_SIZE_TYPE - minLogValueSize - (*this)->typeArray_size
                                 - (*this)->leadNumArray_size - (*this)->exactMidBytes_size - pwrErrBoundBytes_size;
         }       
+
+        if(errorBoundMode >= PW_REL){
+                (*this)->minLogValue = bytesToDouble(&flatBytes[index]);
+                index+=8;
+        }
 
         (*this)->typeArray = &flatBytes[index];
@@ -423 +448 @@
                 bytes[k++] = exactMidBytesLength[i];
 
+        if(confparams_cpr->errorBoundMode>=PW_REL)
+        {
+                doubleToBytes(exactMidBytesLength, tdps->minLogValue);
+                for(i = 0;i < 8; i++)
+                        bytes[k++] = exactMidBytesLength[i];
+        }
+
         memcpy(&(bytes[k]), tdps->typeArray, tdps->typeArray_size);
         k += tdps->typeArray_size;
@@ -522 +554 @@
         memcpy(&(bytes[k]), tdps->rtypeArray, tdps->rtypeArray_size);
         k += tdps->rtypeArray_size;             
+        
+        if(confparams_cpr->errorBoundMode>=PW_REL)
+        {
+                doubleToBytes(exactMidBytesLength, tdps->minLogValue);
+                for(i = 0;i < 8; i++)
+                        bytes[k++] = exactMidBytesLength[i];
+        }
+        
         memcpy(&(bytes[k]), tdps->typeArray, tdps->typeArray_size);
         k += tdps->typeArray_size;
@@ -584 +624 @@
                 size_t residualMidBitsLength = tdps->residualMidBits == NULL ? 0 : tdps->residualMidBits_size;
                 size_t segmentL = 0, radExpoL = 0, pwrBoundArrayL = 0;
+
+                int minLogValueSize = 0;
                 if(confparams_cpr->errorBoundMode>=PW_REL)
                 {                       
@@ -589 +631 @@
                         radExpoL = 1;
                         pwrBoundArrayL = 4;
+                        minLogValueSize = 8;
                 }
 
                 size_t totalByteLength = 3 + 1 + MetaDataByteLength + exe_params->SZ_SIZE_TYPE + 4 + radExpoL + segmentL + pwrBoundArrayL + 4 + 8 + 1 + 8 
                                 + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE 
+                                + minLogValueSize /*max absolute log value*/
                                 + tdps->typeArray_size + tdps->leadNumArray_size
                                 + tdps->exactMidBytes_size + residualMidBitsLength + tdps->pwrErrBoundBytes_size;
@@ -606 +650 @@
                 size_t residualMidBitsLength = tdps->residualMidBits == NULL ? 0 : tdps->residualMidBits_size;
                 size_t segmentL = 0, radExpoL = 0, pwrBoundArrayL = 0;
+                int minLogValueSize = 0;
                 if(confparams_cpr->errorBoundMode>=PW_REL)
                 {
@@ -611 +656 @@
                         radExpoL = 1;
                         pwrBoundArrayL = 4;
+                        minLogValueSize = 8;
                 }
 
                 size_t totalByteLength = 3 + 1 + MetaDataByteLength + exe_params->SZ_SIZE_TYPE + 4 + radExpoL + segmentL + pwrBoundArrayL + 4 + 8 + 1 + 8 
                                 + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + exe_params->SZ_SIZE_TYPE + 8 + tdps->rtypeArray_size
-                                + tdps->typeArray_size + tdps->leadNumArray_size 
+                                + minLogValueSize + tdps->typeArray_size + tdps->leadNumArray_size 
                                 + tdps->exactMidBytes_size + residualMidBitsLength + tdps->pwrErrBoundBytes_size;