diff --git a/deepQlearn_0/Makefile b/deepQlearn_0/Makefile index 6cab953..4ceb86f 100644 --- a/deepQlearn_0/Makefile +++ b/deepQlearn_0/Makefile @@ -1,21 +1,24 @@ +# file: deepQlearn_0/Makefile + +ROOTPROJECTDIR:=$(realpath ..) - - -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 +DEEPQLEARNDIR=$(ROOTPROJECTDIR)/deepQlearn_0 +LIB_DEEPQLEARN=$(DEEPQLEARNDIR)/libdeepqlearn.so -TENSDIR=$(PWD)/../tensor_t -LISTDIR=$(PWD)/../list_t +ROOT_DIR=$(ROOTPROJECTDIR)/deepQlearn_0 +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YTOOLDIR=$(ROOTPROJECTDIR)/ytools_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t + +TENSDIR=$(ROOTPROJECTDIR)/tensor_t +LISTDIR=$(ROOTPROJECTDIR)/list_t -NEURODIR=$(PWD)/../neuron_t -INCLUDE_DIR=$(PWD)/src/deepQlearning +NEURODIR=$(ROOTPROJECTDIR)/neuron_t +INCLUDE_DIR=$(ROOT_DIR)/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" @@ -72,7 +75,7 @@ $(DEPS): #PERMSRC_O=$(PERMSRC:.c=.o) -#SETTSRC_O=$(PWD)/../src/set_theoric_t/set_theoric_t.o +#SETTSRC_O=$(ROOTPROJECTDIR)/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) @@ -96,7 +99,7 @@ clean: rm -f $(OBJ) mrproper: clean - rm -f $(EXEC) + rm -f $(LIB_DEEPQLEARN) run: $(EXEC) $(EXEC) -h diff --git a/deepQlearn_0/test/Makefile b/deepQlearn_0/test/Makefile index 68bf4af..298d70e 100644 --- a/deepQlearn_0/test/Makefile +++ b/deepQlearn_0/test/Makefile @@ -1,21 +1,21 @@ - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD)/.. -YTESTDIR=$(PWD)/../../ytest_t -YTOOLDIR=$(PWD)/../../ytools_t -YPERMDIR=$(PWD)/../../ypermutation_t -DIMDIR=$(PWD)/../../dimension_t +ROOT_DIR=$(ROOTPROJECTDIR)/deepQlearn_0 +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YTOOLDIR=$(ROOTPROJECTDIR)/ytools_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t -TENSDIR=$(PWD)/../../tensor_t -LISTDIR=$(PWD)/../../list_t +TENSDIR=$(ROOTPROJECTDIR)/tensor_t +LISTDIR=$(ROOTPROJECTDIR)/list_t -NEURODIR=$(PWD)/../../neuron_t -INCLUDE_DIR=$(PWD)/../src/deepQlearning +NEURODIR=$(ROOTPROJECTDIR)/neuron_t +INCLUDE_DIR=$(ROOT_DIR)/src/deepQlearning 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 $(INCLUDE) #-lcurses diff --git a/dimension_t/Makefile b/dimension_t/Makefile index 5863173..04fed29 100644 --- a/dimension_t/Makefile +++ b/dimension_t/Makefile @@ -1,7 +1,8 @@ - +# file: dimension_t/Makefile CC=gcc -TOOLDIR=$(PWD)/../ytools_t -PERMDIR=$(PWD)/../ypermutation_t +ROOTPROJECTDIR:=$(realpath ..) +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t +PERMDIR=$(ROOTPROJECTDIR)/ypermutation_t INCLUDE_PERMDIR=$(PERMDIR)/src INCLUDE_TOOLDIR=$(TOOLDIR)/include diff --git a/dimension_t/test/Makefile b/dimension_t/test/Makefile index 769b519..117fe20 100644 --- a/dimension_t/test/Makefile +++ b/dimension_t/test/Makefile @@ -1,14 +1,16 @@ - +# file dimension_t/test/Makefile +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t -YPERMDIR=$(PWD)/../../ypermutation_t +ROOT_DIR=$(DIMDIR)/test +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t -INCLUDE_DIR=$(PWD)/../src +DIMDIR=$(ROOTPROJECTDIR)/dimension_t +INCLUDE_DIR=$(DIMDIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include LDFLAGS=-L$(YTESTDIR) -lytest @@ -16,11 +18,10 @@ LDFLAGS=-L$(YTESTDIR) -lytest #SRC=$(wildcard */*/*.c) SRC=$(wildcard **/**/*.c) #HEADS=$(OBJS:.o=.h) -TEST_DIR=$(PWD) +TEST_DIR=$(ROOT_DIR) EXECSRC=$(NAME_TEST).c EXEC=launch_$(NAME_TEST)_m -DIMDIR=$(PWD)/.. PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o diff --git a/list_t/Makefile b/list_t/Makefile index 579f5d8..f9c3d8c 100644 --- a/list_t/Makefile +++ b/list_t/Makefile @@ -1,6 +1,7 @@ - +# file list_t/Makefile CC=gcc -TOOLDIR=$(PWD)/../ytools_t +ROOTPROJECTDIR:=$(realpath ..) +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t INCLUDE_DIR=$(TOOLDIR)/include CFLAGS=-I$(INCLUDE_DIR) -I./src diff --git a/list_t/test/Makefile b/list_t/test/Makefile index cedecc1..ce2f155 100644 --- a/list_t/test/Makefile +++ b/list_t/test/Makefile @@ -1,13 +1,13 @@ +# file list_t/test/Makefile - - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t +ROOT_DIR=$(ROOTPROJECTDIR)/list_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t -INCLUDE_DIR=$(PWD)/../src +INCLUDE_DIR=$(ROOT_DIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YTESTDIR)/include_ytest/include LDFLAGS=-L$(YTESTDIR) -lytest @@ -15,11 +15,11 @@ LDFLAGS=-L$(YTESTDIR) -lytest #SRC=$(wildcard */*/*.c) SRC=$(wildcard **/**/*.c) #HEADS=$(OBJS:.o=.h) -TEST_DIR=$(PWD) +TEST_DIR=$(ROOT_DIR)/test EXECSRC=$(NAME_TEST).c EXEC=launch_$(NAME_TEST)_m -LISTDIR=$(PWD)/.. +LISTDIR=$(ROOT_DIR) LISTSRC_O=$(LISTDIR)/src/list_t/list_t.o diff --git a/neuron_t/Makefile b/neuron_t/Makefile index 7a3aad0..8fb45fc 100644 --- a/neuron_t/Makefile +++ b/neuron_t/Makefile @@ -1,17 +1,17 @@ +# file neuron_t/Makefile # lib: -lneurons PROJECT_LIB=libneurons.so - +ROOTPROJECTDIR:=$(realpath ..) CC=gcc -ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../ytest_t -YPERMDIR=$(PWD)/../ypermutation_t +ROOT_DIR=$(ROOTPROJECTDIR)/neuron_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t -TENSDIR=$(PWD)/../tensor_t +TENSDIR=$(ROOTPROJECTDIR)/tensor_t -NEURODIR=$(PWD) -DIMDIR=$(PWD)/../dimension_t -INCLUDE_DIR=$(PWD)/sr +NEURODIR=$(ROOT_DIR) +DIMDIR=$(ROOTPROJECTDIR)/dimension_t #CFLAGS=-I$(INCLUDE_DIR) -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include -I$(DIMDIR)/src -I$(TENSDIR)/src #"-D DEBUG=1" INCLUDE=-I$(NEURODIR)/src -I$(YPERMDIR)/src -I$(DIMDIR)/src -I$(TENSDIR)/src #"-D DEBUG=1" @@ -24,7 +24,7 @@ LDFLAGS= -lOpenCL -lpthread #SRC=$(wildcard */*/*.c) SRC=$(wildcard **/**/*.c) #HEADS=$(OBJS:.o=.h) -TEST_DIR=$(PWD) +TEST_DIR=$(PWD)/test EXECSRC=$(NAME_TEST).c #EXECSRC=openF.c @@ -77,7 +77,7 @@ update_headers: $(PROJECT_LIB) #PERMSRC_O=$(PERMSRC:.c=.o) -#SETTSRC_O=$(PWD)/../src/set_theoric_t/set_theoric_t.o +#SETTSRC_O=$(ROOTPROJECTDIR)/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) diff --git a/neuron_t/test/Makefile b/neuron_t/test/Makefile index 5d40dcc..7cdcbec 100644 --- a/neuron_t/test/Makefile +++ b/neuron_t/test/Makefile @@ -1,18 +1,18 @@ - - - +# file neuron_t/test/Makefile +# is_good.c +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t -YPERMDIR=$(PWD)/../../ypermutation_t +ROOT_DIR=$(ROOTPROJECTDIR)/neuron_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t -TENSDIR=$(PWD)/../../tensor_t +TENSDIR=$(ROOTPROJECTDIR)/tensor_t -NEURODIR=$(PWD)/.. -DIMDIR=$(PWD)/../../dimension_t -INCLUDE_DIR=$(PWD)/../src +NEURODIR=$(ROOT_DIR) +DIMDIR=$(ROOTPROJECTDIR)/dimension_t +INCLUDE_DIR=$(ROOT_DIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include -I$(DIMDIR)/src -I$(TENSDIR)/src #"-D DEBUG=1" LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread @@ -20,7 +20,7 @@ LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread #SRC=$(wildcard */*/*.c) SRC=$(wildcard **/**/*.c) #HEADS=$(OBJS:.o=.h) -TEST_DIR=$(PWD) +TEST_DIR=$(ROOT_DIR)/test EXECSRC=$(NAME_TEST).c #EXECSRC=openF.c diff --git a/qlearn_0/test/Makefile b/qlearn_0/test/Makefile index b520a60..5a9c352 100644 --- a/qlearn_0/test/Makefile +++ b/qlearn_0/test/Makefile @@ -1,18 +1,18 @@ +# file qlearn_0/test/Makefile - - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) -FROZENLAKEDIR=$(PWD)/.. -YTESTDIR=$(PWD)/../../ytest_t -YPERMDIR=$(PWD)/../../ypermutation_t -DIMDIR=$(PWD)/../../dimension_t -LISTDIR=$(PWD)/../../list_t -TOOLDIR=$(PWD)/../../ytools_t +ROOT_DIR=$(ROOTPROJECTDIR)/qlearn_0 +FROZENLAKEDIR=$(ROOT_DIR) +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t +LISTDIR=$(ROOTPROJECTDIR)/list_t +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t -INCLUDE_DIR=$(PWD)/../src +INCLUDE_DIR=$(ROOT_DIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YTESTDIR)/include_ytest/include -I$(YPERMDIR)/src -I$(DIMDIR)/src -I$(LISTDIR)/src -I$(TOOLDIR)/include LDFLAGS=-L$(YTESTDIR) -lytest #"-D DEBUG=1" @@ -20,7 +20,7 @@ LDFLAGS=-L$(YTESTDIR) -lytest #"-D DEBUG=1" #SRC=$(wildcard */*/*.c) SRC=$(wildcard **.c) #HEADS=$(OBJS:.o=.h) -TEST_DIR=$(PWD) +TEST_DIR=$(ROOT_DIR)/test EXECSRC=$(NAME_TEST).c EXEC=launch_$(NAME_TEST)_m LISTSRC_O=$(LISTDIR)/src/list_t/list_t.o @@ -44,7 +44,7 @@ $(DEPS): $(MAKE) -C $@ $(MAKECMDGOALS) -OBJ=$(FROZENLAKESRC_O) $(LISTSRC_O) $(PERMSRC_O) $(DIMSRC_O) $(TOOLSRC_O) +OBJ=$(FROZENLAKESRC_O) $(PERMSRC_O) $(DIMSRC_O) $(TOOLSRC_O) $(LISTSRC_O) LIB_YTEST=$(YTESTDIR)/libytest.so @@ -54,7 +54,7 @@ $(EXEC): $(EXECSRC) $(OBJ) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(FROZENLAKESRC_O): $(FROZENLAKESRC) $(LISTSRC_O) $(PERMSRC_O) $(DIMSRC_O) $(TOOLSRC_O) - $(CC) -o $@ -c $^ $(CFLAGS) + $(CC) -o $@ -c $< $(CFLAGS) #$(LDFLAGS) diff --git a/tensor_t/Makefile b/tensor_t/Makefile index acd00c0..5620869 100644 --- a/tensor_t/Makefile +++ b/tensor_t/Makefile @@ -1,11 +1,12 @@ - +# file tensor_t/Makefile +ROOTPROJECTDIR:=$(realpath ..) CC=gcc -TOOLDIR=$(PWD)/../ytools_t -PERMDIR=$(PWD)/../ypermutation_t +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t +PERMDIR=$(ROOTPROJECTDIR)/ypermutation_t -DIMDIR=$(PWD)/../dimension_t - -INCLUDE_TENS=$(PWD)/src +DIMDIR=$(ROOTPROJECTDIR)/dimension_t +TENSEDIR=$(ROOTPROJECTDIR)/tensor_t +INCLUDE_TENS=$(TENSEDIR)/src INCLUDE_PERMDIR=$(PERMDIR)/src INCLUDE_DIMDIR=$(DIMDIR)/src INCLUDE_TOOLDIR=$(TOOLDIR)/include diff --git a/tensor_t/test/Makefile b/tensor_t/test/Makefile index 0d8fa20..2419f39 100644 --- a/tensor_t/test/Makefile +++ b/tensor_t/test/Makefile @@ -1,16 +1,16 @@ +# file: tensor_t/test/Makefile - - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t -YPERMDIR=$(PWD)/../../ypermutation_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t -TENSDIR=$(PWD)/.. -DIMDIR=$(PWD)/../../dimension_t -INCLUDE_DIR=$(PWD)/../src +TENSDIR=$(ROOTPROJECTDIR)/tensor_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t +INCLUDE_DIR=$(TENSDIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include -I$(DIMDIR)/src -I$(TENSDIR)/src #"-D DEBUG=1" LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL @@ -18,7 +18,7 @@ LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL #SRC=$(wildcard */*/*.c) SRC=$(wildcard **/**/*.c) #HEADS=$(OBJS:.o=.h) -TEST_DIR=$(PWD) +TEST_DIR=$(TENSDIR)/test EXECSRC=$(NAME_TEST).c #EXECSRC=openF.c diff --git a/tensor_t/test_cl/Makefile b/tensor_t/test_cl/Makefile index b7184f0..2924bda 100644 --- a/tensor_t/test_cl/Makefile +++ b/tensor_t/test_cl/Makefile @@ -1,17 +1,18 @@ +# file: tensor_t/test_cl/Makefile - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t -YPERMDIR=$(PWD)/../../ypermutation_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t -TENSDIR=$(PWD)/.. -DIMDIR=$(PWD)/../../dimension_t -#TOOLDIR=$(PWD)/../../ytools_t -INCLUDE_DIR=$(PWD)/../src +TENSDIR=$(ROOTPROJECTDIR)/tensor_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t +#TOOLDIR=$(ROOTPROJECTDIR)/ytools_t +INCLUDE_DIR=$(TENSDIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YPERMDIR)/src -I$(YTESTDIR)/include_ytest/include -I$(DIMDIR)/src -I$(TENSDIR)/src LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL diff --git a/y_network_neural_network_/Makefile b/y_network_neural_network_/Makefile index 02bbbbd..2260ab5 100644 --- a/y_network_neural_network_/Makefile +++ b/y_network_neural_network_/Makefile @@ -1,18 +1,28 @@ #file: y_network_neural_network_/Makefile # lib: -lynetneurnet -PROJECT_LIB=libynetneurnet.so CC=gcc -NETNEURNETDIR=$(PWD) +ROOTPROJECTDIR:=$(realpath ..) +NETNEURNETDIR=$(ROOTPROJECTDIR)/y_network_neural_network_ +PROJECT_LIB=$(NETNEURNETDIR)/libynetneurnet.so + +YNETMANAGER_SRC=$(NETNEURNETDIR)/src/y_net_neur_net/y_nnn_manager.c +YNETMANAGER_SRC_O=$(YNETMANAGER_SRC:.c=.o) + +YNETSCREENMANAGER_SRC=$(NETNEURNETDIR)/src/y_net_neur_net/y_nnn_screen_manager.c +YNETSCREENMANAGER_SRC_O=$(YNETSCREENMANAGER_SRC:.c=.o) + +OBJ_NNN=$(YNETMANAGER_SRC_O) $(YNETSCREENMANAGER_SRC_O) + +INCLUDE_NNN=-I$(NETNEURNETDIR)/include -ROOTPROJECTDIR=$(PWD)/.. #$(wildcard $(PWD)/**/include) -YLISTDIR=$(PWD)/../list_t -YWORKDIR=$(PWD)/../y_worker_t -YJSONDIR=$(PWD)/../yjson_t +YLISTDIR=$(ROOTPROJECTDIR)/list_t +YWORKDIR=$(ROOTPROJECTDIR)/y_worker_t +YJSONDIR=$(ROOTPROJECTDIR)/yjson_t #YSOCKETDIR=$(YSOCKET_DIR) -YSOCKET_DIR=$(PWD)/../y_socket_t +YSOCKET_DIR=$(ROOTPROJECTDIR)/y_socket_t INCLUDE_SOCKET=-I$(YSOCKET_DIR)/include -I$(YLISTDIR)/src -I$(YWORKDIR)/include -I$(YJSONDIR)/src -I$(YSOCKET_DIR)/include @@ -41,18 +51,18 @@ OBJ_SOCKET=$(YSOCKSRC_O) $(YNODESRC_O) $(YY_STRINGSRC_O) $(YLISTSRC_O) $(WORKSRC #CC=gcc -DEEPQLEARNDIR=$(PWD)/../deepQlearn_0 +DEEPQLEARNDIR=$(ROOTPROJECTDIR)/deepQlearn_0 LIB_DEEPQLEARN=$(DEEPQLEARNDIR)/libdeepqlearn.so -YTESTDIR=$(PWD)/../ytest_t -YTOOLDIR=$(PWD)/../ytools_t -YPERMDIR=$(PWD)/../ypermutation_t -DIMDIR=$(PWD)/../dimension_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YTOOLDIR=$(ROOTPROJECTDIR)/ytools_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t -TENSDIR=$(PWD)/../tensor_t -LISTDIR=$(PWD)/../list_t +TENSDIR=$(ROOTPROJECTDIR)/tensor_t +LISTDIR=$(ROOTPROJECTDIR)/list_t -NEURODIR=$(PWD)/../neuron_t +NEURODIR=$(ROOTPROJECTDIR)/neuron_t #DEEPQLEARN_SRC_DIR=$(PWD)/src/deepQlearning INCLUDE_DEEPQLEARN=-I$(DEEPQLEARNDIR)/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 @@ -111,7 +121,7 @@ $(TOPTARGETS): $(DEPS) -INCLUDE=$(INCLUDE_SOCKET) $(INCLUDE_DEEPQLEARN) +INCLUDE=$(INCLUDE_NNN) $(INCLUDE_SOCKET) $(INCLUDE_DEEPQLEARN) CFLAGS=-Wall -lOpenCL -lm -lpthread -Werror -fpic $(INCLUDE) #-lcurses #LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread #-lcurses @@ -120,7 +130,7 @@ CFLAGS=-Wall -lOpenCL -lm -lpthread -Werror -fpic $(INCLUDE) #-lcurses #CFLAGS=-g -lpthread -Wall -Werror -fpic $(INCLUDE) #"-D DEBUG=1" #LDFLAGS= -OBJ=$(OBJ_DEEPQLEARN) $(OBJ_SOCKET) +OBJ=$(OBJ_NNN) $(OBJ_DEEPQLEARN) $(OBJ_SOCKET) $(PROJECT_LIB): $(OBJ) #$(LIB_SOCKET) $(LIB_DEEPQLEARN) @@ -131,12 +141,20 @@ $(PROJECT_LIB): $(OBJ) #$(LIB_SOCKET) $(LIB_DEEPQLEARN) # .PHONY: $(TOPTARGETS) $(SUBDIRS) +$(YNETMANAGER_SRC_O): $(YNETMANAGER_SRC) $(LISTSRC_O) + $(CC) -o $@ -c $< $(CFLAGS) + + +$(YNETSCREENMANAGER_SRC_O): $(YNETSCREENMANAGER_SRC) $(LISTSRC_O) + $(CC) -o $@ -c $< $(CFLAGS) + $(DEPS): $(MAKE) -C $@ $(MAKECMDGOALS) .PHONY: all clean + clean: rm -f $(OBJ) diff --git a/y_network_neural_network_/test/Makefile b/y_network_neural_network_/test/Makefile index 19506e8..8649bc6 100644 --- a/y_network_neural_network_/test/Makefile +++ b/y_network_neural_network_/test/Makefile @@ -1,86 +1,158 @@ -#file: y_network_neural_network_t/test/Makefile - - - -NAME_TEST=is_good +#file: y_network_neural_network_/test/Makefile +# lib: -lynetneurnet CC=gcc -YTESTDIR=$(PWD)/../../ytest_t -YLISTDIR=$(PWD)/../../list_t -YWORKDIR=$(PWD)/../../y_worker_t -YJSONDIR=$(PWD)/../../yjson_t +NAME_TEST=is_good +ROOTPROJECTDIR:=$(realpath ../..) +NETNEURNETDIR=$(ROOTPROJECTDIR)/y_network_neural_network_ +LIB_NNN=$(NETNEURNETDIR)/libynetneurnet.so -YSOCKETDIR=$(PWD)/../../y_socket_t -INCLUDE_DIR=$(YSOCKETDIR)/include -INCLUDE=-I$(YSOCKETDIR)/include -I$(YLISTDIR)/src -I$(YWORKDIR)/include -I$(YJSONDIR)/src -I$(YTESTDIR)/include_ytest/include -CFLAGS=-Wall -Werror -fpic $(INCLUDE) -LDFLAGS=-L$(YTESTDIR) -lytest -lpthread -lm -lOpenCL #-L$(YSOCKETDIR) -lysocket +YNETMANAGER_SRC=$(NETNEURNETDIR)/src/y_net_neur_net/y_nnn_manager.c +YNETMANAGER_SRC_O=$(YNETMANAGER_SRC:.c=.o) -#SRC_DIR=$(YSOCKETDIR)/src +YNETSCREENMANAGER_SRC=$(NETNEURNETDIR)/src/y_net_neur_net/y_nnn_screen_manager.c +YNETSCREENMANAGER_SRC_O=$(YNETSCREENMANAGER_SRC:.c=.o) + +OBJ_NNN=$(YNETMANAGER_SRC_O) $(YNETSCREENMANAGER_SRC_O) + +INCLUDE_NNN=-I$(NETNEURNETDIR)/include + + +#$(wildcard $(ROOTPROJECTDIR)/include) + +YLISTDIR=$(ROOTPROJECTDIR)/list_t +YWORKDIR=$(ROOTPROJECTDIR)/y_worker_t +YJSONDIR=$(ROOTPROJECTDIR)/yjson_t +YSOCKET_DIR=$(ROOTPROJECTDIR)/y_socket_t + +INCLUDE_SOCKET=-I$(YSOCKET_DIR)/include -I$(YLISTDIR)/src -I$(YWORKDIR)/include -I$(YJSONDIR)/src -I$(YSOCKET_DIR)/include + +LIB_SOCKET=$(YSOCKET_DIR)/libysocket.so + +YSOCKSRC_O=$(YSOCKET_DIR)/src/y_socket_t/y_socket_t.o + +YNODESRC_O=$(YSOCKET_DIR)/src/y_socket_t/y_node_t.o + +YY_STRINGSRC_O=$(YSOCKET_DIR)/src/y_socket_t/y_list_var_tool.o + +YFILEHANDLERSRC_O=$(YSOCKET_DIR)/src/y_socket_t/y_file_handler.o + +YLISTSRC_O=$(YLISTDIR)/src/list_t/list_t.o + +WORKSRC_0=$(YWORKDIR)/src/y_worker_t/y_worker_t.o +YTASKSRC_0=$(YWORKDIR)/src/y_worker_t/y_task_t.o + +YJSONSRC_O=$(YJSONDIR)/src/json_t/json_t.o + + +DEPS_SOCKET=$(YLISTDIR) $(YWORKDIR) $(YJSONDIR) $(YSOCKET_DIR) + +OBJ_SOCKET=$(YSOCKSRC_O) $(YNODESRC_O) $(YY_STRINGSRC_O) $(YLISTSRC_O) $(WORKSRC_0) $(YTASKSRC_0) $(YFILEHANDLERSRC_O) $(YJSONSRC_O) + + + +#CC=gcc +DEEPQLEARNDIR=$(ROOTPROJECTDIR)/deepQlearn_0 +LIB_DEEPQLEARN=$(DEEPQLEARNDIR)/libdeepqlearn.so + +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YTOOLDIR=$(ROOTPROJECTDIR)/ytools_t +YPERMDIR=$(ROOTPROJECTDIR)/ypermutation_t +DIMDIR=$(ROOTPROJECTDIR)/dimension_t + +TENSDIR=$(ROOTPROJECTDIR)/tensor_t +LISTDIR=$(ROOTPROJECTDIR)/list_t + +NEURODIR=$(ROOTPROJECTDIR)/neuron_t + +#DEEPQLEARN_SRC_DIR=$(ROOTPROJECTDIR)c/deepQlearning +INCLUDE_DEEPQLEARN=-I$(DEEPQLEARNDIR)/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$(DEEPQLEARN_SRC_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" + + +#SRC_DIR=$(ROOT_DIR)/src #SRC=$(wildcard */*/*.c) -#SRC=$(wildcard **/**/*.c) - -#OBJ=$(SRC:.c=.o) - +SRC=$(wildcard **/**/*.c) #HEADS=$(OBJS:.o=.h) #TEST_DIR=$(PWD) -EXECSRC=$(NAME_TEST).c +EXECSRC=$(NAME_TEST).c +#EXECSRC=openF.c + EXEC=launch_$(NAME_TEST)_m -YSOCKSRC=$(YSOCKETDIR)/src/y_socket_t/y_socket_t.c -YSOCKSRC_O=$(YSOCKSRC:.c=.o) +NEUROSRC_O=$(NEURODIR)/src/neuron_t/neuron_t.o -YFILEHANDLSRC=$(YSOCKETDIR)/src/y_socket_t/y_file_handler.c -YFILEHANDLSRC_O=$(YFILEHANDLSRC:.c=.o) +TENSRC_O=$(TENSDIR)/src/tensor_t/tensor_t.o -YNODESRC=$(YSOCKETDIR)/src/y_socket_t/y_node_t.c -YNODESRC_O=$(YNODESRC:.c=.o) +DEEPQLEARN_SRC_DIR=$(DEEPQLEARNDIR)/src/deepQlearning -YY_STRINGSRC=$(YSOCKETDIR)/src/y_socket_t/y_list_var_tool.c -YY_STRINGSRC_O=$(YY_STRINGSRC:.c=.o) +VEHICLESRC_O=$(DEEPQLEARN_SRC_DIR)/vehicle.o -YLISTSRC=$(YLISTDIR)/src/list_t/list_t.c -YLISTSRC_O=$(YLISTSRC:.c=.o) +LEARNTODRIVESRC_O=$(DEEPQLEARN_SRC_DIR)/learn_to_drive.o -YWORKSRC_0=$(YWORKDIR)/src/y_worker_t/y_worker_t.o -YTASKSRC_0=$(YWORKDIR)/src/y_worker_t/y_task_t.o +TOOLSRC_O=$(YTOOLDIR)/src/tools_t/tools_t.o -YJSONSRC=$(YJSONDIR)/src/json_t/json_t.c -YJSONSRC_O=$(YJSONSRC:.c=.o) +PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o -TOPTARGETS := all clean +DIMSRC_O=$(DIMDIR)/src/dimension_t/dimension_t.o -DEPS := $(YTESTDIR) $(YLISTDIR) $(YWORKDIR) $(YSOCKETDIR) $(YJSONDIR) +LISTSRC_O=$(LISTDIR)/src/list_t/list_t.o -OBJ=$(YSOCKSRC_O) $(YFILEHANDLSRC_O) $(YNODESRC_O) $(YY_STRINGSRC_O) $(YLISTSRC_O) $(YWORKSRC_0) $(YTASKSRC_0) $(YJSONSRC_O) + +TOPTARGETS= all clean + +DEPS_DEEPQLEARN=$(DIMDIR) $(YPERMDIR) $(YTESTDIR) $(TENSDIR) $(NEURODIR) $(YTOOLDIR) $(DEEPQLEARNDIR) #$(LISTDIR) + +OBJ_DEEPQLEARN=$(VEHICLESRC_O) $(DIMSRC_O) $(PERMSRC_O) $(TENSRC_O) $(NEUROSRC_O) $(TOOLSRC_O) $(LEARNTODRIVESRC_O) #$(LISTSRC_O) LIB_YTEST=$(YTESTDIR)/libytest.so -LIB_YSOCK=$(YSOCKETDIR)/libysocket.so +LIB=$(LIB_SOCKET) $(LIB_YTEST) $(LIB_DEEPQLEARN) $(LIB_NNN) -all: $(EXEC) $(LIB_YSOCK) +#all: $(LIB_DEEPQLEARN) +all: $(EXEC) + +#TOPTARGETS := all clean + +DEPS=$(DEPS_SOCKET) $(DEPS_DEEPQLEARN) $(NETNEURNETDIR) $(TOPTARGETS): $(DEPS) - -$(LIB_YTEST): $(YTESTDIR) - -$(LIB_YSOCK): $(YSOCKETDIR) - -$(DEPS): +$(DEPS): $(MAKE) -C $@ $(MAKECMDGOALS) -$(EXEC): $(EXECSRC) $(LIB_YSOCK) $(LIB_YTEST) $(OBJ) - $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) +DEPLIBS=$(NETNEURNETDIR) $(YTESTDIR) $(YSOCKET_DIR) $(DEEPQLEARNDIR) -.PHONY: all clean mrproper +INCLUDE=$(INCLUDE_NNN) $(INCLUDE_SOCKET) $(INCLUDE_DEEPQLEARN) -clean: +CFLAGS=-Wall -lOpenCL -lm -lpthread -Werror -fpic $(INCLUDE) #-lcurses +#LDFLAGS=-L$(YTESTDIR) -lytest -lOpenCL -lm -lpthread #-lcurses + + +#CFLAGS=-g -lpthread -Wall -Werror -fpic $(INCLUDE) #"-D DEBUG=1" +#LDFLAGS= + +OBJ=$(OBJ_NNN) $(OBJ_DEEPQLEARN) $(OBJ_SOCKET) $(LIB) + +$(EXEC): $(EXECSRC) $(OBJ) #$(LIB_YTEST) + $(CC) -o $@ $^ $(CFLAGS) + +$(LIB) : $(DEPLIBS) + +#$(LIB_YTEST) : $(YTESTDIR) + +#$(LIB_DEEPQLEARN) : $(DEEPQLEARNDIR) + +#$(LIB_SOCKET) : $(YSOCKET_DIR) + + +.PHONY: clean mrproper $(DEPLIBS) + +clean: rm -f $(OBJ) mrproper: clean rm -f $(EXEC) -run: $(EXEC) - $(EXEC) -h diff --git a/y_network_neural_network_/test/is_good.c b/y_network_neural_network_/test/is_good.c index 2f5d46d..cf594cd 100644 --- a/y_network_neural_network_/test/is_good.c +++ b/y_network_neural_network_/test/is_good.c @@ -13,205 +13,11 @@ #include "ftest/ftest_array.h" #include "fmock/fmock.h" -//#include "permutation_t/permutation_t.h" -#include "y_socket_t/y_socket_t.h" -#include "y_socket_t/y_node_t.h" - -//#include -//#include -//#include - -#define VALGRIND_ 1 - -TEST(first){ - - struct y_socket_t *firstSock = y_socket_create_("1600"); - LOG("create y_socket_t in port |%s|\n",firstSock->port); - - y_socket_free(firstSock); - -for(int af=v4; af<=v6;++af) - LOG("af_array[%d]=%d\n",af,af_array[af]); - - -} - -TEST(list_nodes){ - struct main_list_y_NODE_T * listNodes = create_var_list_y_NODE_T(); - - LOG("main_list_y_NODE_T created\n"); - - y_NODE_T firstNode; - - push_back_list_y_NODE_T(listNodes, firstNode); - - - free_all_var_list_y_NODE_T(listNodes); - - - -} - -TEST(equalNode){ - y_NODE_T nA, nB; - init_len_y_NODE_T(&nA); - init_len_y_NODE_T(&nB); - - nA.addr.ss_family=AF_INET; - nB.addr.ss_family=AF_INET; - - //((struct sockaddr_in*)(&(nA.addr)))->sin_port = 22; - //((struct sockaddr_in*)(&(nB.addr)))->sin_port = 22; - set_port_y_NODE_T_from_int_port(&nA, 22); - set_port_y_NODE_T_from_int_port(&nB, 22); - //((struct sockaddr_in*)&(nA.addr))->sin_addr.s_addr = inet_addr("192.168.1.2"); - //((struct sockaddr_in*)&(nB.addr))->sin_addr.s_addr = inet_addr("192.168.1.2"); - - GET_IN_type_ADDR(&(nA.addr),) = inet_addr("1.1.1.1"); - GET_IN_type_ADDR(&(nB.addr),) = inet_addr("1.1.1.1"); - - LOG("nA = %d\n",GET_IN_type_ADDR(&(nA.addr),)); - LOG("nB = %d\n",GET_IN_type_ADDR(&(nB.addr),)); - - EXPECT_EQ(0, y_NODE_T_cmp(nA,nB)); - GET_IN_type_ADDR(&(nB.addr),) = inet_addr("0.1.1.1"); - LOG("diff = %d\n", y_NODE_T_cmp(nA,nB)); - - -} -TEST(equalNode6){ - y_NODE_T nA, nB; - init_len_y_NODE_T(&nA); - init_len_y_NODE_T(&nB); - - nA.addr.ss_family=AF_INET6; - nB.addr.ss_family=AF_INET6; - - set_port_y_NODE_T_from_int_port(&nA, 22); - set_port_y_NODE_T_from_int_port(&nB, 22); - //((struct sockaddr_in6*)(&(nA.addr)))->sin6_port = 22; - //((struct sockaddr_in6*)(&(nB.addr)))->sin6_port = 22; - - //((struct sockaddr_in*)&(nA.addr))->sin_addr.s_addr = inet_addr("192.168.1.2"); - //((struct sockaddr_in*)&(nB.addr))->sin_addr.s_addr = inet_addr("192.168.1.2"); - - inet_pton(AF_INET6, "::1", &(GET_IN_type_ADDR(&(nA.addr),6))); - inet_pton(AF_INET6, "::1", &(GET_IN_type_ADDR(&(nB.addr),6))); - - - EXPECT_EQ(0, y_NODE_T_cmp(nA,nB)); - inet_pton(AF_INET6, "::", &(GET_IN_type_ADDR(&(nB.addr),6))); - LOG("diff = %d\n", y_NODE_T_cmp(nA,nB)); - - -} - - - -TEST(searchNode){ - y_NODE_T nA, nB; - init_len_y_NODE_T(&nA); - init_len_y_NODE_T(&nB); - - nA.addr.ss_family=AF_INET; - nB.addr.ss_family=AF_INET; - - set_port_y_NODE_T_from_int_port(&nA, 22); - set_port_y_NODE_T_from_int_port(&nB, 22); - //((struct sockaddr_in*)(&(nA.addr)))->sin_port = 22; - //((struct sockaddr_in*)(&(nB.addr)))->sin_port = 22; - - //((struct sockaddr_in*)&(nA.addr))->sin_addr.s_addr = inet_addr("192.168.1.2"); - //((struct sockaddr_in*)&(nB.addr))->sin_addr.s_addr = inet_addr("192.168.1.2"); - - GET_IN_type_ADDR(&(nA.addr),) = inet_addr("1.1.1.1"); - GET_IN_type_ADDR(&(nB.addr),) = inet_addr("1.1.1.2"); - - LOG("nA = %d\n",GET_IN_type_ADDR(&(nA.addr),)); - LOG("nB = %d\n",GET_IN_type_ADDR(&(nB.addr),)); - - struct main_list_y_NODE_T *listNodes = create_var_list_y_NODE_T(); - push_back_list_y_NODE_T(listNodes, nA); - push_back_list_y_NODE_T(listNodes, nB); - GET_IN_type_ADDR(&(nA.addr),) = inet_addr("1.1.1.3"); - push_back_list_y_NODE_T(listNodes, nA); - - //GET_IN_type_ADDR(&(nB.addr),) = inet_addr("0.1.1.1"); - int ret = set_addr_y_NODE_T_from_str_addr(&nB, "0.1.1.1"); - LOG("return of set =%d\n", ret); - - EXPECT_TRUE(NULL == search_node_in_list_y_NODE_T(listNodes, nB)); - //GET_IN_type_ADDR(&(nA.addr),) = inet_addr("1.1.1.3"); - inet_pton(AF_INET, "1.1.1.3", &(GET_IN_type_ADDR(&(nA.addr),))); - EXPECT_FALSE(NULL == search_node_in_list_y_NODE_T(listNodes, nA)); - - //inet_pton(AF_INET6, "::1", GET_IN_type_ADDR(&(nB.addr),6)); - //((struct sockaddr_in6*)(&(nB.addr)))->sin6_port = 22; - ret = set_addr_y_NODE_T_from_str_addr(&nB, "::1"); - set_port_y_NODE_T_from_int_port(&nB, 22); - LOG("return of set =%d\n", ret); - push_back_list_y_NODE_T(listNodes, nB); - - //inet_pton(AF_INET6, "::", GET_IN_type_ADDR(&(nA.addr),6)); - ret = set_addr_y_NODE_T_from_str_addr(&nB, "::"); - LOG("return of set =%d\n", ret); - EXPECT_FALSE(NULL == search_node_in_list_y_NODE_T(listNodes, nA)); - - free_all_var_list_y_NODE_T(listNodes); - - -} - - -TEST(import_nodes){ - struct main_list_y_NODE_T * listNodes = create_var_list_y_NODE_T(); - char *file_nodes_name = ".dest/.FILE_NODES"; - if(import_nodes_from_file(file_nodes_name, 1600, listNodes)==-1){ - LOG("something wrong check file %s\n",file_nodes_name); - } - - export_nodes_to_file(".dest/.CPY_file_nodes_name", listNodes); - - - free_all_var_list_y_NODE_T(listNodes); - - - -} - - -TEST(pollThread){ - struct arg_var_ * var = create_arg_var_(NULL); - struct y_socket_t *argS=y_socket_create("1600", 2, 3, var); - - pthread_t pollTh; - pthread_create(&pollTh, NULL, y_socket_poll_fds, (void*)argS); - - - wait_var_set_up_value_not_equal(var, 0); - EXPECT_EQ(var->set_up,1); - /* - char buf[] = "sendto 192.168.1.250 { \"cmd\" : \"get file __exode.txt\" }"; - size_t len_buf = strlen(buf); - - set_cmd_to_socket(buf, len_buf, var); - */ -/* - struct argdst dstarg={ - .port="1600", - .addrStr="::1", - }; - pthread_t cliTh; - pthread_create(&cliTh, NULL, threadFuncSend, (void*)&dstarg); - - pthread_join(cliTh, NULL); -*/ - - pthread_join(pollTh, NULL); - - y_socket_free(argS); - free_arg_var_(var); +#include "y_net_neur_net/y_nnn_manager.h" +#include "y_net_neur_net/y_nnn_screen_manager.h" +TEST(pidof_bash){ + } diff --git a/y_socket_t/Makefile b/y_socket_t/Makefile index fc94055..65683b6 100644 --- a/y_socket_t/Makefile +++ b/y_socket_t/Makefile @@ -1,14 +1,15 @@ #file: y_socket_t/Makefile # lib: -lysocket -PROJECT_LIB=libysocket.so +ROOTPROJECTDIR:=$(realpath ..) +SOCDIR:=$(ROOTPROJECTDIR)/y_socket_t +PROJECT_LIB=$(SOCDIR)/libysocket.so CC=gcc -INCLUDE_DIRS=$(PWD)/include -SOCDIR=$(PWD) -#$(wildcard $(PWD)/**/include) +INCLUDE_DIRS=$(SOCDIR)/include +#$(wildcard $(SOCDIR)/**/include) -YLISTDIR=$(PWD)/../list_t -YWORKDIR=$(PWD)/../y_worker_t -YJSONDIR=$(PWD)/../yjson_t +YLISTDIR=$(ROOTPROJECTDIR)/list_t +YWORKDIR=$(ROOTPROJECTDIR)/y_worker_t +YJSONDIR=$(ROOTPROJECTDIR)/yjson_t INCLUDE=-I$(INCLUDE_DIRS) -I$(YLISTDIR)/src -I$(YWORKDIR)/include -I$(YJSONDIR)/src @@ -16,16 +17,16 @@ CFLAGS=-g -lpthread -Wall -Werror -fpic $(INCLUDE) #"-D DEBUG=1" #LDFLAGS= -YSOCKSRC=$(PWD)/src/y_socket_t/y_socket_t.c +YSOCKSRC=$(SOCDIR)/src/y_socket_t/y_socket_t.c YSOCKSRC_O=$(YSOCKSRC:.c=.o) -YNODESRC=$(PWD)/src/y_socket_t/y_node_t.c +YNODESRC=$(SOCDIR)/src/y_socket_t/y_node_t.c YNODESRC_O=$(YNODESRC:.c=.o) -YY_STRINGSRC=$(PWD)/src/y_socket_t/y_list_var_tool.c +YY_STRINGSRC=$(SOCDIR)/src/y_socket_t/y_list_var_tool.c YY_STRINGSRC_O=$(YY_STRINGSRC:.c=.o) -FILEHANDLERSRC=$(PWD)/src/y_socket_t/y_file_handler.c +FILEHANDLERSRC=$(SOCDIR)/src/y_socket_t/y_file_handler.c YFILEHANDLERSRC_O=$(YFILEHANDLERSRC:.c=.o) YLISTSRC=$(YLISTDIR)/src/list_t/list_t.c @@ -39,9 +40,9 @@ YJSONSRC_O=$(YJSONSRC:.c=.o) all: $(PROJECT_LIB) -TOPTARGETS := all clean +TOPTARGETS= all clean -DEPS:=$(YLISTDIR) $(YWORKDIR) $(YJSONDIR) +DEPS=$(YLISTDIR) $(YWORKDIR) $(YJSONDIR) OBJ=$(YSOCKSRC_O) $(YNODESRC_O) $(YY_STRINGSRC_O) $(YLISTSRC_O) $(WORKSRC_0) $(YTASKSRC_0) $(YFILEHANDLERSRC_O) $(YJSONSRC_O) @@ -53,7 +54,7 @@ $(TOPTARGETS): $(DEPS) $(PROJECT_LIB): $(OBJ) - echo "objects:" $(OBJ) + #echo "objects:" $(OBJ) #$(CC) -shared -o $@ $^ $(INCLUDE) $(LDFLAGS) #$(CC) -shared -o $@ $^ $(LDFLAGS) $(CC) -shared -o $@ $^ $(CFLAGS) diff --git a/y_socket_t/test/Makefile b/y_socket_t/test/Makefile index 3d6d4eb..2c9ba9a 100644 --- a/y_socket_t/test/Makefile +++ b/y_socket_t/test/Makefile @@ -1,15 +1,15 @@ #file: y_socket_t/test/Makefil - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -YTESTDIR=$(PWD)/../../ytest_t -YLISTDIR=$(PWD)/../../list_t -YWORKDIR=$(PWD)/../../y_worker_t -YJSONDIR=$(PWD)/../../yjson_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YLISTDIR=$(ROOTPROJECTDIR)/list_t +YWORKDIR=$(ROOTPROJECTDIR)/y_worker_t +YJSONDIR=$(ROOTPROJECTDIR)/yjson_t -ROOT_DIR=$(PWD)/.. +ROOT_DIR=$(ROOTPROJECTDIR)/y_socket_t INCLUDE_DIR=$(ROOT_DIR)/include INCLUDE=-I$(INCLUDE_DIR) -I$(YTESTDIR)/include_ytest/include -I$(YLISTDIR)/src -I$(YWORKDIR)/include -I$(YJSONDIR)/src CFLAGS=-Wall -Werror -fpic $(INCLUDE) @@ -74,7 +74,7 @@ $(LIB_YSOCK): $(ROOT_DIR) $(EXEC): $(EXECSRC) $(OBJ) $(LIB_YTEST) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -.PHONY: all clean mrproper +.PHONY: all clean mrproper $(YTESTDIR) $(ROOT_DIR) clean: rm -f $(OBJ) diff --git a/y_worker_t/Makefile b/y_worker_t/Makefile index 88431f0..5e4ed1e 100644 --- a/y_worker_t/Makefile +++ b/y_worker_t/Makefile @@ -1,12 +1,16 @@ +#file: y_worker_t/Makefile + # lib: -lyworker +ROOTPROJECTDIR:=$(realpath ..) +YWORKERDIR=$(ROOTPROJECTDIR)/y_worker_t + PROJECT_LIB=libyworker.so CC=gcc -INCLUDE_DIRS=$(PWD)/include -SOCDIR=$(PWD) +INCLUDE_DIRS=$(YWORKERDIR)/include #$(wildcard $(PWD)/**/include) -TOOLDIR=$(PWD)/../ytools_t -YLISTDIR=$(PWD)/../list_t +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t +YLISTDIR=$(ROOTPROJECTDIR)/list_t INCLUDE=-I$(INCLUDE_DIRS) -I$(YLISTDIR)/src -I$(TOOLDIR)/include diff --git a/y_worker_t/test/Makefile b/y_worker_t/test/Makefile index 2cf363d..ed80449 100644 --- a/y_worker_t/test/Makefile +++ b/y_worker_t/test/Makefile @@ -1,13 +1,13 @@ +# file: y_worker_t/test/Makefile - - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -YTESTDIR=$(PWD)/../../ytest_t -YLISTDIR=$(PWD)/../../list_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +YLISTDIR=$(ROOTPROJECTDIR)/list_t -ROOT_DIR=$(PWD)/.. +ROOT_DIR=$(ROOTPROJECTDIR)/y_worker_t INCLUDE_DIR=$(ROOT_DIR)/include CFLAGS=-I$(INCLUDE_DIR) -I$(YTESTDIR)/include_ytest/include -I$(YLISTDIR)/src LDFLAGS=-L$(YTESTDIR) -lytest -lpthread -lm -lOpenCL -Wall -Werror @@ -42,7 +42,7 @@ OBJ=$(YWORKSRC_O) $(YTASKSRC_O) $(YLISTSRC_O) LIB_YTEST=$(YTESTDIR)/libytest.so -LIB_YWORK=$(PWD)/../libyworker.so +LIB_YWORK=$(ROOT_DIR)/libyworker.so $(TOPTARGETS): $(DEPS) diff --git a/yjson_t/Makefile b/yjson_t/Makefile index 014afd8..49a88f3 100644 --- a/yjson_t/Makefile +++ b/yjson_t/Makefile @@ -1,17 +1,18 @@ - +# file: yjson_t/Makefile +ROOTPROJECTDIR:=$(realpath ..) CC=gcc -TOOLDIR=$(PWD)/../ytools_t +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t #SRC_DIR=$(ROOT_DIR)/src #SRC=$(wildcard */*/*.c) #HEADS=$(OBJS:.o=.h) -LISTDIR=$(PWD)/../list_t +LISTDIR=$(ROOTPROJECTDIR)/list_t LISTSRC=$(LISTDIR)/src/list_t/list_t.c LISTSRC_O=$(LISTSRC:.c=.o) -YSOCKETDIR=$(PWD)/../y_socket_t/ +YSOCKETDIR=$(ROOTPROJECTDIR)/y_socket_t/ YSTRINGLISTSRC=$(YSOCKETDIR)/src/y_socket_t/y_list_var_tool.c YSTRINGLISTSRC_O=$(YSOCKETSRC:.c=.o) diff --git a/yjson_t/test/Makefile b/yjson_t/test/Makefile index 80f0d69..494e899 100644 --- a/yjson_t/test/Makefile +++ b/yjson_t/test/Makefile @@ -1,16 +1,16 @@ +# file: yjson_t/test/Makefile - - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t -LISTDIR=$(PWD)/../../list_t -YSOCKETDIR=$(PWD)/../../y_socket_t +ROOT_DIR=$(ROOTPROJECTDIR)/yjson_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +LISTDIR=$(ROOTPROJECTDIR)/list_t +YSOCKETDIR=$(ROOTPROJECTDIR)/y_socket_t INCLUDE_LIST=$(LISTDIR)/src -INCLUDE_DIR=$(PWD)/../src +INCLUDE_DIR=$(ROOT_DIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(INCLUDE_LIST) -I$(YTESTDIR)/include_ytest/include -I$(YSOCKETDIR)/include LDFLAGS=-L$(YTESTDIR) -lytest @@ -25,7 +25,7 @@ EXEC=launch_$(NAME_TEST)_m LISTSRC_O=$(LISTDIR)/src/list_t/list_t.o -JSONDIR=$(PWD)/.. +JSONDIR=$(ROOT_DIR) JSONSRC=$(JSONDIR)/src/json_t/json_t.c JSONSRC_O=$(JSONDIR)/src/json_t/json_t.o YSTRINGLIST_O=$(YSOCKETDIR)/src/y_socket_t/y_list_var_tool.o diff --git a/ypermutation_t/Makefile b/ypermutation_t/Makefile index 6490281..1652f40 100644 --- a/ypermutation_t/Makefile +++ b/ypermutation_t/Makefile @@ -1,6 +1,9 @@ +# file : ypermutation_t/Makefile + +ROOTPROJECTDIR:=$(realpath ..) CC=gcc -TOOLDIR=$(PWD)/../ytools_t +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t INCLUDE_DIR=$(TOOLDIR)/include CFLAGS=-I$(INCLUDE_DIR) -I./src diff --git a/ypermutation_t/test/Makefile b/ypermutation_t/test/Makefile index 542ca11..636deb5 100644 --- a/ypermutation_t/test/Makefile +++ b/ypermutation_t/test/Makefile @@ -1,13 +1,13 @@ - - +# file: ypermutation_t/test/Makefile +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) -YTESTDIR=$(PWD)/../../ytest_t +ROOT_DIR=$(ROOTPROJECTDIR)/ypermutation_t +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t -INCLUDE_DIR=$(PWD)/../src +INCLUDE_DIR=$(ROOT_DIR)/src CFLAGS=-I$(INCLUDE_DIR) -I$(YTESTDIR)/include_ytest/include LDFLAGS=-L$(YTESTDIR) -lytest @@ -19,7 +19,7 @@ TEST_DIR=$(PWD) EXECSRC=$(NAME_TEST).c EXEC=launch_$(NAME_TEST)_m -PERMDIR=$(PWD)/.. +PERMDIR=$(ROOT_DIR) PERMSRC_O=$(PERMDIR)/src/permutation_t/permutation_t.o diff --git a/ytest_t/Makefile b/ytest_t/Makefile index cc89216..294aae4 100644 --- a/ytest_t/Makefile +++ b/ytest_t/Makefile @@ -1,25 +1,27 @@ # lib: -lytest -PROJECT_LIB=libytest.so +ROOTPROJECTDIR:=$(realpath ..) +YTESTDIR=$(ROOTPROJECTDIR)/ytest_t +PROJECT_LIB=$(YTESTDIR)/libytest.so CC=gcc -INCLUDE_DIRS=$(PWD) -#$(wildcard $(PWD)/**/include) -TOOLDIR=$(PWD)/../ytools_t -BARPDIR=$(PWD)/../ybar_progress +INCLUDE_DIRS=$(YTESTDIR) +#$(wildcard $(YTESTDIR)/**/include) +TOOLDIR=$(ROOTPROJECTDIR)/ytools_t +BARPDIR=$(ROOTPROJECTDIR)/ybar_progress TOOL_O=$(TOOLDIR)/src/tools_t/tools_t.o BARP_O=$(BARPDIR)/src/bar_progress/bar_progress.o -INCLUDE=-I$(PWD)/yftest/include -I$(PWD)/yfmock/include -I$(TOOLDIR)/include -I$(BARPDIR)/include +INCLUDE=-I$(YTESTDIR)/yftest/include -I$(YTESTDIR)/yfmock/include -I$(TOOLDIR)/include -I$(BARPDIR)/include CFLAGS=-g -lpthread -Wall -Werror -fpic $(INCLUDE) #"-D DEBUG=1" #LDFLAGS= -TOPTARGETS := all clean #update_headers +TOPTARGETS= all clean #update_headers #SRC=$(wildcard y*/src/**/**/*.c) SRC=$(wildcard y*/*/*/*.c) OBJ=$(SRC:.c=.o) $(TOOL_O) $(BARP_O) -SUBDIRS :=$(wildcard y*) $(TOOLDIR) $(BARPDIR) +SUBDIRS=$(wildcard y*) $(TOOLDIR) $(BARPDIR) export diff --git a/ytest_t/libytest.so b/ytest_t/libytest.so index e8e0835..adfe403 100755 Binary files a/ytest_t/libytest.so and b/ytest_t/libytest.so differ diff --git a/ytest_t/test/Makefile b/ytest_t/test/Makefile index 3d8c270..355c114 100644 --- a/ytest_t/test/Makefile +++ b/ytest_t/test/Makefile @@ -1,38 +1,52 @@ - +ROOTPROJECTDIR:=$(realpath ../..) NAME_TEST=is_good CC=gcc -ROOT_DIR=$(PWD) +ROOT_DIR=$(ROOTPROJECTDIR)/ytest_t INCLUDE_DIR=$(ROOT_DIR)/src -CFLAGS=-I$(INCLUDE_DIR) -I../include_ytest/include -LDFLAGS=-L$(PWD)/.. -lytest +CFLAGS=-Wall -Werror -fpic -I$(INCLUDE_DIR) -I$(ROOT_DIR)/include_ytest/include +LDFLAGS=-L$(ROOT_DIR) -lytest -lpthread -lm + #SRC_DIR=$(ROOT_DIR)/src #SRC=$(wildcard */*/*.c) -SRC=$(wildcard **/**/*.c) +SRC=$(wildcard $(ROOT_DIR)/**/src/**/*.c) -#OBJ=$(SRC:.c=.o) #HEADS=$(OBJS:.o=.h) TEST_DIR=$(PWD) EXECSRC=$(NAME_TEST).c EXEC=launch_$(NAME_TEST)_m -LIB_YTEST=$(PWD)/../libytest.so +LIB_YTEST=$(ROOT_DIR)/libytest.so + +OBJ=$(SRC:.c=.o) + +TOPTARGETS := all clean all: $(EXEC) $(LIB_YTEST) -$(EXEC): $(EXECSRC) $(OBJ) +$(LIB_YTEST): $(ROOT_DIR) + +$(EXEC): $(EXECSRC) $(OBJ) $(LIB_YTEST) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -.PHONY: clean mrproper +DEPS=$(ROOT_DIR) + +$(TOPTARGETS): $(DEPS) + +$(DEPS): + $(MAKE) -C $@ $(MAKECMDGOALS) + + +.PHONY: clean mrproper $(ROOT_DIR) clean: rm -f $(OBJ) mrproper: clean - rm -f $(EXEC) + rm -f $(EXEC) $(LIB_YTEST) run: $(EXEC) $(EXEC) -h diff --git a/ytest_t/test/is_good.c b/ytest_t/test/is_good.c index 78066e4..f168f64 100644 --- a/ytest_t/test/is_good.c +++ b/ytest_t/test/is_good.c @@ -49,10 +49,11 @@ TEST(double_equal){ ASSERT_EQ_TYPE_DOUBLE(1.0000000100000002,b); } -TEST(){ +TEST(unsigned){ unsigned char c = 'a'; - debug_print("another test, a = %c\n",c); + LOG("another test, a = %c\n",c); + EXPECT_EQ('a',c); ASSERT_FALSE(true); ASSERT_TRUE(true); ASSERT_TRUE(true);