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

thirdparty/SZ/sz/src/conf.c

@@ -103 +103 @@
                 
                 confparams_cpr->szMode = SZ_BEST_COMPRESSION;
-                
-                confparams_cpr->gzipMode = 1; //fast mode
+                confparams_cpr->losslessCompressor = ZSTD_COMPRESSOR; //other option: GZIP_COMPRESSOR;
+                if(confparams_cpr->losslessCompressor==ZSTD_COMPRESSOR)
+                        confparams_cpr->gzipMode = 3; //fast mode
+                else
+                        confparams_cpr->gzipMode = 1; //high speed mode
                 
                 confparams_cpr->errorBoundMode = PSNR;
                 confparams_cpr->psnr = 90;
+                confparams_cpr->absErrBound = 1E-4;
+                confparams_cpr->relBoundRatio = 1E-4;
                 
                 confparams_cpr->pw_relBoundRatio = 1E-3;
@@ -115 +120 @@
                 
                 confparams_cpr->snapshotCmprStep = 5;
+                
+                sz_with_regression = SZ_WITH_LINEAR_REGRESSION;
         
                 return SZ_SCES;
@@ -213 +220 @@
                 }
                 
-                modeBuf = iniparser_getstring(ini, "PARAMETER:gzipMode", NULL);
+                modeBuf = iniparser_getstring(ini, "PARAMETER:losslessCompressor", "ZSTD_COMPRESSOR");
+                if(strcmp(modeBuf, "GZIP_COMPRESSOR")==0)
+                        confparams_cpr->losslessCompressor = GZIP_COMPRESSOR;
+                else if(strcmp(modeBuf, "ZSTD_COMPRESSOR")==0)
+                        confparams_cpr->losslessCompressor = ZSTD_COMPRESSOR;
+                else
+                {
+                        printf("[SZ] Error: Wrong losslessCompressor setting (please check sz.config file)\n");\
+                        printf("No Such a lossless compressor: %s\n", modeBuf);
+                        iniparser_freedict(ini);
+                        return SZ_NSCS; 
+                }               
+                
+                modeBuf = iniparser_getstring(ini, "PARAMETER:withLinearRegression", "YES");
+                if(strcmp(modeBuf, "YES")==0 || strcmp(modeBuf, "yes")==0)
+                        sz_with_regression = SZ_WITH_LINEAR_REGRESSION;
+                else
+                        sz_with_regression = SZ_NO_REGRESSION;
+                
+                modeBuf = iniparser_getstring(ini, "PARAMETER:gzipMode", "Gzip_BEST_SPEED");
                 if(modeBuf==NULL)
                 {
@@ -233 +259 @@
                         return SZ_NSCS;
                 }
+                
+                modeBuf = iniparser_getstring(ini, "PARAMETER:zstdMode", "Zstd_HIGH_SPEED");            
+                if(modeBuf==NULL)
+                {
+                        printf("[SZ] Error: Null Zstd mode setting (please check sz.config file)\n");
+                        iniparser_freedict(ini);
+                        return SZ_NSCS;                                 
+                }               
+                else if(strcmp(modeBuf, "Zstd_BEST_SPEED")==0)
+                        confparams_cpr->gzipMode = 1;
+                else if(strcmp(modeBuf, "Zstd_HIGH_SPEED")==0)
+                        confparams_cpr->gzipMode = 3;
+                else if(strcmp(modeBuf, "Zstd_HIGH_COMPRESSION")==0)
+                        confparams_cpr->gzipMode = 19;
+                else if(strcmp(modeBuf, "Zstd_BEST_COMPRESSION")==0)
+                        confparams_cpr->gzipMode = 22;                  
+                else if(strcmp(modeBuf, "Zstd_DEFAULT_COMPRESSION")==0)
+                        confparams_cpr->gzipMode = 3;
+                else
+                {
+                        printf("[SZ] Error: Wrong zstd Mode (please check sz.config file)\n");
+                        return SZ_NSCS;
+                }               
                 
                 //TODO