Skip to content

Commit

Permalink
Read uncompressed MAT file in blocks
Browse files Browse the repository at this point in the history 
As reported by #65
  • Loading branch information
@tbeu
tbeu committed Aug 21, 2017
1 parent 91ff267 commit bc5289a
Showing 1 changed file with 76 additions and 52 deletions.
128 changes: 76 additions & 52 deletions src/read_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,54 @@
# include <zlib.h>
#endif

#if !defined(READ_BLOCK_SIZE)
#define READ_BLOCK_SIZE (256)
#endif

#define Mat_uint8Swap(x) (*x)
#define Mat_int8Swap(x) (*x)

#define READ_DATA(SwapFunc) \
do { \
if ( mat->byteswap ) { \
for ( i = 0; i < len; i++ ) { \
bytesread += fread(&v,data_size,1,(FILE*)mat->fp); \
data[i] = SwapFunc(&v); \
if ( len <= READ_BLOCK_SIZE ) { \
bytesread += fread(v,data_size,len,(FILE*)mat->fp); \
for (j = 0; j < len; j++) { \
data[j] = SwapFunc(&v[j]); \
} \
} else { \
for ( i = 0; i < len-READ_BLOCK_SIZE; i+=READ_BLOCK_SIZE ) { \
bytesread += fread(v,data_size,READ_BLOCK_SIZE,(FILE*)mat->fp); \
for (j = 0; j < READ_BLOCK_SIZE; j++) { \
data[i+j] = SwapFunc(&v[j]); \
} \
} \
if ( len > i ) { \
bytesread += fread(v,data_size,len-i,(FILE*)mat->fp); \
for (j = 0; j < len-i; j++) { \
data[i+j] = SwapFunc(&v[j]); \
} \
}\
} \
} else { \
for ( i = 0; i < len; i++ ) { \
bytesread += fread(&v,data_size,1,(FILE*)mat->fp); \
data[i] = v; \
if ( len <= READ_BLOCK_SIZE ) { \
bytesread += fread(v,data_size,len,(FILE*)mat->fp); \
for (j = 0; j < len; j++) { \
data[j] = v[j]; \
} \
} else { \
for ( i = 0; i < len-READ_BLOCK_SIZE; i+=READ_BLOCK_SIZE ) { \
bytesread += fread(v,data_size,READ_BLOCK_SIZE,(FILE*)mat->fp); \
for (j = 0; j < READ_BLOCK_SIZE; j++) { \
data[i+j] = v[j]; \
} \
} \
if ( len > i ) { \
bytesread += fread(v,data_size,len-i,(FILE*)mat->fp); \
for (j = 0; j < len-i; j++) { \
data[i+j] = v[j]; \
} \
}\
} \
} \
} while (0)
Expand All @@ -60,7 +97,7 @@
#define READ_DATA_INT64 \
do { \
if ( MAT_T_INT64 == data_type ) { \
mat_int64_t v; \
mat_int64_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_int64Swap); \
} \
} while (0)
Expand All @@ -72,7 +109,7 @@
#define READ_DATA_UINT64 \
do { \
if ( MAT_T_UINT64 == data_type ) { \
mat_uint64_t v; \
mat_uint64_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_uint64Swap); \
} \
} while (0)
Expand All @@ -85,56 +122,50 @@
switch ( data_type ) { \
case MAT_T_DOUBLE: \
{ \
double v; \
double v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_doubleSwap); \
break; \
} \
case MAT_T_SINGLE: \
{ \
float v; \
float v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_floatSwap); \
break; \
} \
case MAT_T_INT32: \
{ \
mat_int32_t v; \
mat_int32_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_int32Swap); \
break; \
} \
case MAT_T_UINT32: \
{ \
mat_uint32_t v; \
mat_uint32_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_uint32Swap); \
break; \
} \
case MAT_T_INT16: \
{ \
mat_int16_t v; \
mat_int16_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_int16Swap); \
break; \
} \
case MAT_T_UINT16: \
{ \
mat_uint16_t v; \
mat_uint16_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_uint16Swap); \
break; \
} \
case MAT_T_INT8: \
{ \
mat_int8_t v; \
for ( i = 0; i < len; i++ ) { \
bytesread += fread(&v,data_size,1,(FILE*)mat->fp); \
data[i] = v; \
} \
mat_int8_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_int8Swap); \
break; \
} \
case MAT_T_UINT8: \
{ \
mat_uint8_t v; \
for ( i = 0; i < len; i++ ) { \
bytesread += fread(&v,data_size,1,(FILE*)mat->fp); \
data[i] = v; \
} \
mat_uint8_t v[READ_BLOCK_SIZE]; \
READ_DATA(Mat_uint8Swap); \
break; \
} \
default: \
Expand Down Expand Up @@ -272,7 +303,7 @@
int
ReadDoubleData(mat_t *mat,double *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand All @@ -294,67 +325,60 @@ ReadDoubleData(mat_t *mat,double *data,enum matio_types data_type,int len)
}
case MAT_T_SINGLE:
{
float v;
float v[READ_BLOCK_SIZE];
READ_DATA(Mat_floatSwap);
break;
}
#ifdef HAVE_MAT_INT64_T
case MAT_T_INT64:
{
mat_int64_t v;
mat_int64_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_int64Swap);
break;
}
#endif
#ifdef HAVE_MAT_UINT64_T
case MAT_T_UINT64:
{
mat_uint64_t v;
mat_uint64_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_uint64Swap);
break;
}
#endif
case MAT_T_INT32:
{
mat_int32_t v;
mat_int32_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_int32Swap);
break;
}
case MAT_T_UINT32:
{
mat_uint32_t v;
mat_uint32_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_uint32Swap);
break;
}
case MAT_T_INT16:
{
mat_int16_t v;
mat_int16_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_int16Swap);
break;
}
case MAT_T_UINT16:
{
mat_uint16_t v;
mat_uint16_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_uint16Swap);
break;
}
case MAT_T_INT8:
{
mat_int8_t v;
for ( i = 0; i < len; i++ ) {
bytesread += fread(&v,data_size,1,(FILE*)mat->fp);
data[i] = v;
}
mat_int8_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_int8Swap);
break;
}
case MAT_T_UINT8:
{
mat_uint8_t v;

for ( i = 0; i < len; i++ ) {
bytesread += fread(&v,data_size,1,(FILE*)mat->fp);
data[i] = v;
}
mat_uint8_t v[READ_BLOCK_SIZE];
READ_DATA(Mat_uint8Swap);
break;
}
default:
Expand Down Expand Up @@ -769,7 +793,7 @@ ReadCompressedDoubleData(mat_t *mat,z_streamp z,double *data,
int
ReadSingleData(mat_t *mat,float *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -827,7 +851,7 @@ ReadCompressedSingleData(mat_t *mat,z_streamp z,float *data,
int
ReadInt64Data(mat_t *mat,mat_int64_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -887,7 +911,7 @@ ReadCompressedInt64Data(mat_t *mat,z_streamp z,mat_int64_t *data,
int
ReadUInt64Data(mat_t *mat,mat_uint64_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -947,7 +971,7 @@ ReadCompressedUInt64Data(mat_t *mat,z_streamp z,mat_uint64_t *data,
int
ReadInt32Data(mat_t *mat,mat_int32_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -1005,7 +1029,7 @@ ReadCompressedInt32Data(mat_t *mat,z_streamp z,mat_int32_t *data,
int
ReadUInt32Data(mat_t *mat,mat_uint32_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -1063,7 +1087,7 @@ ReadCompressedUInt32Data(mat_t *mat,z_streamp z,mat_uint32_t *data,
int
ReadInt16Data(mat_t *mat,mat_int16_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -1121,7 +1145,7 @@ ReadCompressedInt16Data(mat_t *mat,z_streamp z,mat_int16_t *data,
int
ReadUInt16Data(mat_t *mat,mat_uint16_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -1179,7 +1203,7 @@ ReadCompressedUInt16Data(mat_t *mat,z_streamp z,mat_uint16_t *data,
int
ReadInt8Data(mat_t *mat,mat_int8_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down Expand Up @@ -1237,7 +1261,7 @@ ReadCompressedInt8Data(mat_t *mat,z_streamp z,mat_int8_t *data,
int
ReadUInt8Data(mat_t *mat,mat_uint8_t *data,enum matio_types data_type,int len)
{
int bytesread = 0, data_size, i;
int bytesread = 0, data_size, i, j;

if ( (mat == NULL) || (data == NULL) || (mat->fp == NULL) )
return 0;
Expand Down

0 comments on commit bc5289a

Please sign in to comment.