aboutsummaryrefslogtreecommitdiff
path: root/redist
diff options
context:
space:
mode:
Diffstat (limited to 'redist')
-rw-r--r--redist/Makefile2
-rw-r--r--redist/json_helpers.c2
-rw-r--r--redist/test_dcl.c2
3 files changed, 2 insertions, 4 deletions
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/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();
}
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