Fixed fread() for net->seen

AlexeyAB · Oct 21, 2017 · db1d98d · db1d98d
1 parent f18a82b
commit db1d98d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/additionally.c b/src/additionally.c
@@ -532,7 +532,7 @@ network make_network(int n)
     network net = {0};
     net.n = n;
     net.layers = calloc(net.n, sizeof(layer));
-    net.seen = calloc(1, sizeof(int));
+    net.seen = calloc(1, sizeof(uint64_t));
     #ifdef GPU
     net.input_gpu = calloc(1, sizeof(float *));
     net.truth_gpu = calloc(1, sizeof(float *));
@@ -1706,7 +1706,14 @@ void load_weights_upto_cpu(network *net, char *filename, int cutoff)
 	fread(&major, sizeof(int), 1, fp);
 	fread(&minor, sizeof(int), 1, fp);
 	fread(&revision, sizeof(int), 1, fp);
-	fread(net->seen, sizeof(int), 1, fp);
+	if ((major * 10 + minor) >= 2) {
+		fread(net->seen, sizeof(uint64_t), 1, fp);
+	}
+	else {
+		int iseen = 0;
+		fread(&iseen, sizeof(int), 1, fp);
+		*net->seen = iseen;
+	}
 	//int transpose = (major > 1000) || (minor > 1000);
 
 	int i;

diff --git a/src/additionally.h b/src/additionally.h
@@ -11,6 +11,7 @@
 #include <string.h>
 #include <float.h>
 #include <limits.h>
+#include <stdint.h>
 
 #ifdef CUDNN
 #include "cudnn.h"
@@ -493,7 +494,7 @@ typedef struct network {
 	float *workspace;
 	int n;
 	int batch;
-	int *seen;
+	uint64_t *seen;
 	float epoch;
 	int subdivisions;
 	float momentum;