diff --git a/deepQlearn_0/test/Makefile b/deepQlearn_0/test/Makefile index 4a1499f..68bf4af 100644 --- a/deepQlearn_0/test/Makefile +++ b/deepQlearn_0/test/Makefile @@ -16,9 +16,9 @@ LISTDIR=$(PWD)/../../list_t NEURODIR=$(PWD)/../../neuron_t INCLUDE_DIR=$(PWD)/../src/deepQlearning -INCLUDE=-I$(ROOT_DIR)/src/deepQlearning -I$(NEURODIR)/src -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include -I$(DIMDIR)/src -I$(TENSDIR)/src -I$(YTOOLDIR)/include -I$(LISTDIR)/src +INCLUDE=-I$(INCLUDE_DIR) -I$(NEURODIR)/src -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include -I$(DIMDIR)/src -I$(TENSDIR)/src -I$(YTOOLDIR)/include -I$(LISTDIR)/src #"-D DEBUG=1" -CFLAGS=-Wall -Werror -fpic -I$(INCLUDE) #-lcurses +CFLAGS=-Wall -Werror -fpic $(INCLUDE) #-lcurses LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread #-lcurses #SRC_DIR=$(ROOT_DIR)/src @@ -57,10 +57,6 @@ LIB_YTEST=$(YTESTDIR)/libytest.so LIB_DEEPQLEARN=$(ROOT_DIR)/libdeepqlearn.so -$(LIB_YTEST) : $(YTESTDIR) - -$(LIB_DEEPQLEARN) : $(ROOT_DIR) - TOPTARGETS := all clean DEPS=$(DIMDIR) $(YPERMDIR) $(YTESTDIR) $(TENSDIR) $(NEURODIR) $(YTOOLDIR) $(LISTDIR) $(ROOT_DIR) @@ -68,6 +64,7 @@ DEPS=$(DIMDIR) $(YPERMDIR) $(YTESTDIR) $(TENSDIR) $(NEURODIR) $(YTOOLDIR) $(LIST OBJ=$(VEHICLESRC_O) $(DIMSRC_O) $(PERMSRC_O) $(TENSRC_O) $(NEUROSRC_O) $(TOOLSRC_O) $(LISTSRC_O) $(LEARNTODRIVESRC_O) +all: $(EXEC) $(LIB_DEEPQLEARN) $(TOPTARGETS): $(DEPS) @@ -75,6 +72,10 @@ $(DEPS): $(MAKE) -C $@ $(MAKECMDGOALS) +$(LIB_YTEST) : $(YTESTDIR) + +$(LIB_DEEPQLEARN) : $(ROOT_DIR) + #PERMSRC_O=$(PERMSRC:.c=.o) #SETTSRC_O=$(PWD)/../src/set_theoric_t/set_theoric_t.o #SETTSRC_O=$(SETTSRC:.c=.o) @@ -82,7 +83,6 @@ $(DEPS): #TOOLSRC_O=$(TOOLSRC:.c=.o) -all: $(EXEC) $(LIB_DEEPQLEARN) $(EXEC): $(EXECSRC) $(OBJ) $(LIB_YTEST) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) diff --git a/neuron_t/src/neuron_t/nneuron_t_file.h b/neuron_t/src/neuron_t/nneuron_t_file.h index fea74cd..4c3b861 100644 --- a/neuron_t/src/neuron_t/nneuron_t_file.h +++ b/neuron_t/src/neuron_t/nneuron_t_file.h @@ -270,7 +270,7 @@ do{\ char *recInput=malloc(buf_size + 1);\ memset(recInput,0, buf_size + 1);\ char *iinput=malloc(buf_size * 2);\ - bool size_unknown=false, broken=false; \ + /*bool size_unknown=false, broken=false*/; \ bool Done=false;\ int retread = 0, curIn=0, lastNonNumber=0, lenRecIn=0;\ \ @@ -279,7 +279,7 @@ do{\ size_t ss;\ char *ttmp=NULL;\ char *ppEnd=NULL;\ - bool bracketsDown=false, endTensor = false;\ + bool bracketsDown=false/*, endTensor = false*/;\ size_t j=0;\ neurons_##type * tmpNN = neuronDst;\ tensor_##type * T=NULL;\ @@ -307,7 +307,7 @@ j=0;\ iinput[curIn]=recInput[lenRecIn-curIn-1];\ }\ retread = read(fd_input, input, buf_size) ;\ - endTensor = (retread != buf_size);\ + /*endTensor = (retread != buf_size);*/\ /*printf("debug: ************************* ------>input = |%s|, retread=%d, input[ret-1]={%c}\n", input,retread,input[retread-1]);*/\ lenRecIn = 0;\ for(lastNonNumber=retread-1; lastNonNumber>=0; --lastNonNumber){ \ @@ -405,7 +405,7 @@ j=0;\ }\ ttmp=ppEnd;\ Done=(j==dim->rank);\ - endTensor=(j==dim->rank);\ + /*endTensor=(j==dim->rank);*/\ }\ if(Done) break;\ if(j == dim->rank ){\ diff --git a/ytest_t/Makefile b/ytest_t/Makefile index 68d7467..cc89216 100644 --- a/ytest_t/Makefile +++ b/ytest_t/Makefile @@ -31,6 +31,7 @@ $(TOPTARGETS): $(SUBDIRS) $(PROJECT_LIB): $(OBJ) echo $(OBJ) + echo $(SUBDIRS) #$(CC) -shared -o $@ $^ $(INCLUDE) $(LDFLAGS) #$(CC) -shared -o $@ $^ $(LDFLAGS) $(CC) -shared -o $@ $^ $(CFLAGS) diff --git a/ytest_t/libytest.so b/ytest_t/libytest.so index 857a2d8..e8e0835 100755 Binary files a/ytest_t/libytest.so and b/ytest_t/libytest.so differ