From 5a2a5679708c098a9d9d5973bc485f2e3c35c61d Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 17 Jan 2018 09:56:51 +0000
Subject: [PATCH] Fixed wait_stream flag, for compilation without GPU
---
src/parser.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index ae9e194..9fc4966 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -584,6 +584,11 @@
network parse_network_cfg(char *filename)
{
+ return parse_network_cfg_custom(filename, 0);
+}
+
+network parse_network_cfg_custom(char *filename, int batch)
+{
list *sections = read_cfg(filename);
node *n = sections->front;
if(!n) error("Config file has no sections");
@@ -600,6 +605,7 @@
params.w = net.w;
params.c = net.c;
params.inputs = net.inputs;
+ if (batch > 0) net.batch = batch;
params.batch = net.batch;
params.time_steps = net.time_steps;
params.net = net;
@@ -666,6 +672,8 @@
}else{
fprintf(stderr, "Type not recognized: %s\n", s->type);
}
+ l.onlyforward = option_find_int_quiet(options, "onlyforward", 0);
+ l.stopbackward = option_find_int_quiet(options, "stopbackward", 0);
l.dontload = option_find_int_quiet(options, "dontload", 0);
l.dontloadscales = option_find_int_quiet(options, "dontloadscales", 0);
option_unused(options);
@@ -699,6 +707,8 @@
return net;
}
+
+
list *read_cfg(char *filename)
{
FILE *file = fopen(filename, "r");
@@ -836,7 +846,7 @@
fwrite(&major, sizeof(int), 1, fp);
fwrite(&minor, sizeof(int), 1, fp);
fwrite(&revision, sizeof(int), 1, fp);
- fwrite(net.seen, sizeof(uint64_t), 1, fp);
+ fwrite(net.seen, sizeof(int), 1, fp);
int i;
for(i = 0; i < net.n && i < cutoff; ++i){
@@ -1025,12 +1035,14 @@
fread(&minor, sizeof(int), 1, fp);
fread(&revision, sizeof(int), 1, fp);
if ((major * 10 + minor) >= 2) {
- fread(net->seen, sizeof(uint64_t), 1, fp);
+ printf("\n seen 64 \n");
+ uint64_t iseen = 0;
+ fread(&iseen, sizeof(uint64_t), 1, fp);
+ *net->seen = iseen;
}
else {
- int iseen = 0;
- fread(&iseen, sizeof(int), 1, fp);
- *net->seen = iseen;
+ printf("\n seen 32 \n");
+ fread(net->seen, sizeof(int), 1, fp);
}
int transpose = (major > 1000) || (minor > 1000);
--
Gitblit v1.10.0