diff options
| author | cloudygoose <[email protected]> | 2015-06-03 10:29:41 +0800 |
|---|---|---|
| committer | cloudygoose <[email protected]> | 2015-06-03 10:29:41 +0800 |
| commit | bf01fd6cea42def51becb6ea866d4fd335e45842 (patch) | |
| tree | 09d12e50e3a6156c7e0cd7412b22fa4b61189495 /Makefile | |
| parent | 6984519cbb659aac0b0b323de93d5a90aa2049b7 (diff) | |
| parent | bb56a806e0636a0b20117b1644701d63e2bfaefb (diff) | |
...
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -7,7 +7,9 @@ OBJS := nerv.o luaT.o common.o \ LIBS := libnerv.so LUA_LIBS := matrix/init.lua io/init.lua nerv.lua \ pl/utils.lua pl/compat.lua \ - layer/init.lua layer/affine.lua layer/sigmoid.lua layer/softmax_ce.lua + layer/init.lua layer/affine.lua layer/sigmoid.lua layer/softmax_ce.lua \ + layer/window.lua layer/bias.lua \ + nn/init.lua nn/layer_repo.lua nn/param_repo.lua nn/layer_dag.lua INCLUDE := -I build/luajit-2.0/include/luajit-2.0/ -DLUA_USE_APICHECK CUDA_BASE := /usr/local/cuda-6.5 CUDA_INCLUDE := -I $(CUDA_BASE)/include/ @@ -17,7 +19,7 @@ CFLAGS := -Wall -Wextra OBJ_DIR := $(BUILD_DIR)/objs LUA_DIR := $(BUILD_DIR)/lua LIB_DIR := $(BUILD_DIR)/lib -SUBDIR := matrix io layer examples pl +SUBDIR := matrix io layer examples pl nn NVCC := $(CUDA_BASE)/bin/nvcc NVCC_FLAGS := -Xcompiler -fPIC,-Wall,-Wextra |