From 5e407d74130accfbbf94d2cabcb03fc126a89410 Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Wed, 24 Jun 2015 22:48:24 +0800
Subject: separate non-Lua part of matrix code to a dedicated dir

---
 nerv/Makefile | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'nerv/Makefile')

diff --git a/nerv/Makefile b/nerv/Makefile
index 4008453..06a439a 100644
--- a/nerv/Makefile
+++ b/nerv/Makefile
@@ -1,58 +1,65 @@
 .PHONY: build install clean
 SHELL := /bin/bash
 BUILD_DIR := $(CURDIR)/build
-OBJS := nerv.o lib/luaT/luaT.o lib/io/chunk_file.o common.o \
-		matrix/mmatrix.o matrix/cumatrix.o matrix/init.o matrix/cukernel.o \
+LIB_PATH := $(LUA_BINDIR)/../lib
+OBJ_DIR := $(BUILD_DIR)/objs
+CORE_OBJS := common.o lib/io/chunk_file.o lib/matrix/mmatrix.o lib/matrix/cumatrix.o lib/matrix/cukernel.o
+NERV_OBJS := nerv.o \
+		matrix/mmatrix.o matrix/cumatrix.o matrix/init.o \
 		io/init.o io/chunk_file.o \
 		examples/oop_example.o
-LIBS := libnerv.so
+LUAT_OBJS := lib/luaT/luaT.o
+CORE_OBJS := $(addprefix $(OBJ_DIR)/,$(CORE_OBJS))
+NERV_OBJS := $(addprefix $(OBJ_DIR)/,$(NERV_OBJS))
+LUAT_OBJS := $(addprefix $(OBJ_DIR)/,$(LUAT_OBJS))
+OBJS := $(CORE_OBJS) $(NERV_OBJS) $(LUAT_OBJS)
+LIBS := $(INST_LIBDIR)/libnerv.so $(LIB_PATH)/libnervcore.so $(LIB_PATH)/libluaT.so
 LUA_LIBS := matrix/init.lua io/init.lua init.lua \
 			layer/init.lua layer/affine.lua layer/sigmoid.lua layer/softmax_ce.lua \
 			layer/window.lua layer/bias.lua layer/combiner.lua layer/mse.lua \
 			nn/init.lua nn/layer_repo.lua nn/param_repo.lua nn/layer_dag.lua \
 			io/sgd_buffer.lua
 INCLUDE := -I $(LUA_INCDIR) -DLUA_USE_APICHECK
-CUDA_BASE := /usr/local/cuda-6.5
-#CUDA_BASE := /usr/local/cuda-5.0
+#CUDA_BASE := /usr/local/cuda-6.5
+CUDA_BASE := /usr/local/cuda-5.0
 CUDA_INCLUDE := -I $(CUDA_BASE)/include/
 INCLUDE += $(CUDA_INCLUDE)
 LDFLAGS := -L$(CUDA_BASE)/lib64/  -Wl,-rpath=$(CUDA_BASE)/lib64/ -lcudart -lcublas
 CFLAGS := -Wall -Wextra -O2
-OBJ_DIR := $(BUILD_DIR)/objs
-SUBDIR := matrix io layer examples nn lib/io lib/luaT
+SUBDIR := matrix io layer examples nn lib/io lib/luaT lib/matrix
 NVCC := $(CUDA_BASE)/bin/nvcc
 NVCC_FLAGS := -Xcompiler -fPIC,-Wall,-Wextra
 
 LUA_DIR = $(INST_LUADIR)/nerv
-OBJS := $(addprefix $(OBJ_DIR)/,$(OBJS))
 OBJ_SUBDIR := $(addprefix $(OBJ_DIR)/,$(SUBDIR))
 LUA_SUBDIR := $(addprefix $(LUA_DIR)/,$(SUBDIR))
-LIBS := $(addprefix $(INST_LIBDIR)/,$(LIBS))
 LUA_LIBS := $(addprefix $(LUA_DIR)/,$(LUA_LIBS))
 
 build: $(OBJ_DIR) $(OBJ_SUBDIR) $(OBJS)
+
 $(OBJ_DIR) $(LUA_DIR) $(OBJ_SUBDIR) $(LUA_SUBDIR):
 	-mkdir -p $@
 $(OBJ_DIR)/%.o: %.c $(patsubst /%.o,/%.c,$@)
 	gcc -c -o $@ $< $(INCLUDE) -fPIC $(CFLAGS)
-$(OBJ_DIR)/matrix/cukernel.o: matrix/cukernel.cu
+$(OBJ_DIR)/lib/matrix/cukernel.o: lib/matrix/cukernel.cu
 	$(NVCC) -c -o $@ $< $(INCLUDE) $(NVCC_FLAGS)
 $(LUA_DIR)/%.lua: %.lua
 	cp $< $@
 #$(OBJ_DIR)/luaT.o:
 #	gcc -c -o $@ luaT/luaT.c $(INCLUDE) -fPIC
-$(LIBS): $(OBJS)
-	gcc -shared -o $@ $(OBJS) $(LDFLAGS)
+$(LIB_PATH)/libnervcore.so: $(CORE_OBJS)
+	gcc -shared -o $@ $^ $(LDFLAGS)
+$(LIB_PATH)/libluaT.so: $(LUAT_OBJS)
+	gcc -shared -o $@ $^ $(LDFLAGS)
+$(INST_LIBDIR)/libnerv.so: $(NERV_OBJS) $(LIB_PATH)/libnervcore.so $(LIB_PATH)/libluaT.so
+	gcc -shared -o $@ $(NERV_OBJS) $(LDFLAGS) -Wl,-rpath=$(LIB_PATH) -L$(LIB_PATH) -lnervcore -lluaT
 
 $(OBJ_DIR)/matrix/cumatrix.o: matrix/generic/cumatrix.c matrix/generic/matrix.c matrix/generic/cukernel.cu
 $(OBJ_DIR)/matrix/mmatrix.o: matrix/generic/mmatrix.c matrix/generic/matrix.c
-$(OBJ_DIR)/matrix/cukernel.o: matrix/generic/cukernel.cu
-
-.PHONY: speech
 
-speech:
-	-mkdir -p build/objs/speech/tnet_io
-	$(MAKE) -C speech/ BUILD_DIR=$(BUILD_DIR) LIB_DIR=$(LIB_DIR) OBJ_DIR=$(CURDIR)/build/objs/speech/ LUA_DIR=$(LUA_DIR)
+$(OBJ_DIR)/lib/matrix/cumatrix.o: lib/matrix/generic/cumatrix.c lib/matrix/generic/matrix.c lib/matrix/generic/cukernel.cu
+$(OBJ_DIR)/lib/matrix/mmatrix.o: lib/matrix/generic/mmatrix.c lib/matrix/generic/matrix.c
+$(OBJ_DIR)/lib/matrix/cukernel.o: lib/matrix/generic/cukernel.cu
 
 clean:
 	-rm -rf $(OBJ_DIR)
-- 
cgit v1.2.3