From a978c195a8b0cbf9ff1330ab8c6af1deb79a8b83 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sun, 18 Mar 2018 02:11:20 -0400 Subject: trying new config mode --- redist/Makefile | 2 +- redist/test_dcl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'redist') diff --git a/redist/Makefile b/redist/Makefile index 0d74106..1437758 100644 --- a/redist/Makefile +++ b/redist/Makefile @@ -7,7 +7,7 @@ lintest : lintest.c linmath.c linmath.h gcc -g -O0 -o $@ $^ -lm test_dcl : test_dcl.c dclhelpers.c minimal_opencv.c ../src/epnp/epnp.c - gcc -o $@ $^ os_generic.c -DFLT=double -lpthread -lcblas -lm -llapacke + gcc -o $@ $^ os_generic.c -DFLT=double -lpthread -lcblas -lm -llapacke -O3 -msse2 -ftree-vectorize clean : rm -rf *.o *~ jsmntest lintest diff --git a/redist/test_dcl.c b/redist/test_dcl.c index dc6a93e..b2481a6 100644 --- a/redist/test_dcl.c +++ b/redist/test_dcl.c @@ -90,7 +90,7 @@ void compareToCblasTrans() { cvMulTransposed(&Em1, &Em1tEm1, 1, 0, 1); print_mat(&Em1tEm1); - test_dcldgemm_speed("Trans", 1, 0, + test_dcldgemm_speed("Trans", 0, 0, n, // # of rows in OP(A) == em1' -- 20 n, // # of cols in OP(B) == em1 -- 20 m, // # of cols in OP(A) == em1' -- 12 -- cgit v1.2.3 From 0996cfcee351bfd665f48a205d2f7fe37dec336c Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sun, 18 Mar 2018 22:00:55 -0400 Subject: Fix configuration system and fix race condition in survive_vive. --- redist/json_helpers.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'redist') diff --git a/redist/json_helpers.c b/redist/json_helpers.c index 8704a93..ebacd2c 100644 --- a/redist/json_helpers.c +++ b/redist/json_helpers.c @@ -188,7 +188,6 @@ void json_load_file(const char* path) { if (value_t->type == JSMN_ARRAY) { i += json_load_array(JSON_STRING, tokens+i+2,value_t->size, tag); //look at array children } else if (value_t->type == JSMN_OBJECT) { - printf("Begin Object\n"); if (json_begin_object != NULL) json_begin_object(tag); children = (int16_t)(value_t->size +1); //+1 to account for this loop where we are not yed parsing children // i += decode_jsmn_object(JSON_STRING, tokens+i+2,value_t->size); @@ -200,7 +199,6 @@ void json_load_file(const char* path) { if (children>=0) children--; if (children == 0) { children = -1; - printf("End Object\n"); if (json_end_object!=NULL) json_end_object(); } -- cgit v1.2.3