deepQlearn: change Makefile test, and add Makefile to create libdeepqlearn.so

deepQlearn_0/Makefile

@@ -0,0 +1,102 @@
+
+
+
+
+LIB_DEEPQLEARN=libdeepqlearn.so
+CC=gcc
+ROOT_DIR=$(PWD)
+YTESTDIR=$(PWD)/../ytest_t
+YTOOLDIR=$(PWD)/../ytools_t
+YPERMDIR=$(PWD)/../ypermutation_t
+DIMDIR=$(PWD)/../dimension_t
+
+TENSDIR=$(PWD)/../tensor_t
+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
+#CFLAGS=-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 -lOpenCL -lm -lpthread -Werror -fpic $(INCLUDE) #-lcurses
+#LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread  #-lcurses
+
+#SRC_DIR=$(ROOT_DIR)/src
+#SRC=$(wildcard */*/*.c) 
+SRC=$(wildcard **/**/*.c) 
+#HEADS=$(OBJS:.o=.h)
+#TEST_DIR=$(PWD)
+
+EXECSRC=$(NAME_TEST).c 
+#EXECSRC=openF.c
+
+EXEC=launch_$(NAME_TEST)_m
+
+NEUROSRC=$(NEURODIR)/src/neuron_t/neuron_t.c
+NEUROSRC_O=$(NEUROSRC:.c=.o)
+
+
+TENSRC=$(TENSDIR)/src/tensor_t/tensor_t.c
+TENSRC_O=$(TENSRC:.c=.o)
+
+VEHICLESRC=$(INCLUDE_DIR)/vehicle.c
+VEHICLESRC_O=$(VEHICLESRC:.c=.o)
+
+LEARNTODRIVESRC=$(INCLUDE_DIR)/learn_to_drive.c
+LEARNTODRIVESRC_O=$(LEARNTODRIVESRC:.c=.o)
+
+TOOLSRC_O=$(YTOOLDIR)/src/tools_t/tools_t.o
+
+PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o
+
+DIMSRC_O=$(DIMDIR)/src/dimension_t/dimension_t.o
+
+LISTSRC_O=$(LISTDIR)/src/list_t/list_t.o
+
+
+TOPTARGETS := all clean 
+
+DEPS=$(DIMDIR) $(YPERMDIR) $(YTESTDIR) $(TENSDIR) $(NEURODIR) $(YTOOLDIR) $(LISTDIR)
+
+OBJ=$(VEHICLESRC_O) $(DIMSRC_O) $(PERMSRC_O) $(TENSRC_O) $(NEUROSRC_O) $(TOOLSRC_O) $(LISTSRC_O) $(LEARNTODRIVESRC_O)
+
+LIB_YTEST=$(YTESTDIR)/libytest.so
+
+all: $(LIB_DEEPQLEARN)
+
+$(TOPTARGETS): $(DEPS) 
+
+$(DEPS):
+	$(MAKE) -C $@ $(MAKECMDGOALS)
+
+
+#PERMSRC_O=$(PERMSRC:.c=.o)
+#SETTSRC_O=$(PWD)/../src/set_theoric_t/set_theoric_t.o
+#SETTSRC_O=$(SETTSRC:.c=.o)
+#TOOLSRC=$(TOOLDIR)/src/tools_t/tools_t.c
+#TOOLSRC_O=$(TOOLSRC:.c=.o)
+
+
+$(EXEC):	$(EXECSRC) $(OBJ)
+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
+$(LIB_DEEPQLEARN):	$(OBJ)
+	$(CC) -shared -o $@ $^ $(CFLAGS)
+
+$(VEHICLESRC_O): $(VEHICLESRC) $(TOOLSRC_O) $(DIMSRC_O)
+	$(CC) -o $@ -c $< $(CFLAGS) 
+
+$(LEARNTODRIVESRC_O): $(LEARNTODRIVESRC) $(VEHICLESRC_O)  $(LISTSRC_O)
+	$(CC) -o $@ -c $< $(CFLAGS) 
+
+.PHONY: clean mrproper
+
+clean:
+	rm -f $(OBJ)
+
+mrproper: clean
+	rm -f $(EXEC)
+
+run: $(EXEC)
+	$(EXEC) -h

deepQlearn_0/test/Makefile

@@ -4,7 +4,7 @@
 
 NAME_TEST=is_good
 CC=gcc
-ROOT_DIR=$(PWD)
+ROOT_DIR=$(PWD)/..
 YTESTDIR=$(PWD)/../../ytest_t
 YTOOLDIR=$(PWD)/../../ytools_t
 YPERMDIR=$(PWD)/../../ypermutation_t
@@ -16,8 +16,9 @@ LISTDIR=$(PWD)/../../list_t
 
 NEURODIR=$(PWD)/../../neuron_t
 INCLUDE_DIR=$(PWD)/../src/deepQlearning
-CFLAGS=-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
+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
  #"-D DEBUG=1"
+CFLAGS=-Wall -Werror -fpic -I$(INCLUDE)  #-lcurses
 LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread  #-lcurses
 
 #SRC_DIR=$(ROOT_DIR)/src
@@ -52,14 +53,20 @@ DIMSRC_O=$(DIMDIR)/src/dimension_t/dimension_t.o
 
 LISTSRC_O=$(LISTDIR)/src/list_t/list_t.o
 
+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)
+DEPS=$(DIMDIR) $(YPERMDIR) $(YTESTDIR) $(TENSDIR) $(NEURODIR) $(YTOOLDIR) $(LISTDIR) $(ROOT_DIR)
 
 OBJ=$(VEHICLESRC_O) $(DIMSRC_O) $(PERMSRC_O) $(TENSRC_O) $(NEUROSRC_O) $(TOOLSRC_O) $(LISTSRC_O) $(LEARNTODRIVESRC_O)
 
-LIB_YTEST=$(YTESTDIR)/libytest.so
 
 
 $(TOPTARGETS): $(DEPS) 
@@ -75,18 +82,18 @@ $(DEPS):
 #TOOLSRC_O=$(TOOLSRC:.c=.o)
 
 
-all: $(EXEC) $(LIB_YTEST)
+all: $(EXEC) $(LIB_DEEPQLEARN)
 
-$(EXEC):	$(EXECSRC) $(OBJ)
+$(EXEC):	$(EXECSRC) $(OBJ) $(LIB_YTEST)
 	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
 
-$(VEHICLESRC_O): $(VEHICLESRC) $(TOOLSRC_O) $(DIMSRC_O)
+#$(VEHICLESRC_O): $(VEHICLESRC) $(TOOLSRC_O) $(DIMSRC_O)
-	$(CC) -o $@ -c $< $(CFLAGS) 
+#	$(CC) -o $@ -c $< $(CFLAGS) 
 
-$(LEARNTODRIVESRC_O): $(LEARNTODRIVESRC) $(VEHICLESRC_O)  $(LISTSRC_O)
+#$(LEARNTODRIVESRC_O): $(LEARNTODRIVESRC) $(VEHICLESRC_O)  $(LISTSRC_O)
-	$(CC) -o $@ -c $< $(CFLAGS) 
+#	$(CC) -o $@ -c $< $(CFLAGS) 
 
-.PHONY: clean mrproper
+.PHONY: all clean mrproper
 
 clean:
 	rm -f $(OBJ)