aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--nerv/Makefile4
m---------speech0
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bfcd56f..cc0c32e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all clean install luajit luarocks speech
SHELL := /bin/bash
PREFIX := $(CURDIR)/install/
-all: luajit luarocks
+all: luajit luarocks install
luajit:
PREFIX=$(PREFIX) ./tools/build_luajit.sh
luarocks:
@@ -10,3 +10,5 @@ install:
cd nerv; $(PREFIX)/bin/luarocks make
speech:
cd speech/htk_io; $(PREFIX)/bin/luarocks make
+clean:
+ rm -r $(CURDIR)/install
diff --git a/nerv/Makefile b/nerv/Makefile
index 224cc8a..7b75522 100644
--- a/nerv/Makefile
+++ b/nerv/Makefile
@@ -36,8 +36,8 @@ LUA_LIBS := matrix/init.lua io/init.lua init.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)
diff --git a/speech b/speech
-Subproject 08e33afa533af1f026ac271446a0c873fe0bb5c
+Subproject 32eac093cc431849a92e5a2297c5fe646fd6055