From e5db8258e97ccf7b487f09add3d64398cbdf22ad Mon Sep 17 00:00:00 2001
From: Roman Grundkiewicz <rgrundki@ex.ed.ac.uk>
Date: Tue, 31 Jul 2018 10:41:02 +0000
Subject: Update Makefile

---
 Makefile | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ab3c583..cd90b33 100644
--- a/Makefile
+++ b/Makefile
@@ -6,34 +6,29 @@ GIT_MOSES_SCRIPTS=http://github.com/marian-nmt/moses-scripts.git
 GIT_SUBWORD_NMT=http://github.com/rsennrich/subword-nmt.git
 
 BRANCH=master
-CUDA_DIR=/usr/local/cuda-9.2
+CUDA=/usr/local/cuda
 CUDNN=off
 
-CMAKE_FLAGS=-DCUDA_TOOLKIT_ROOT_DIR=$(CUDA_DIR) -DUSE_CUDNN=$(CUDNN)
+CMAKE_FLAGS=-DCUDA_TOOLKIT_ROOT_DIR=$(CUDA) -DUSE_CUDNN=$(CUDNN) -DCMAKE_BUILD_TYPE=Release
 
 PIP_PACKAGES=websocket-client pyyaml
 
-.PHONY: tools/marian install tools models data run
+.PHONY: marian install tools models data run
 .SECONDARY:
 
 
 #####################################################################
 
-install: tools tools/marian models data
-
-run: install
+run: install marian
 	bash ./run_mrt.sh
 
+install: tools models data
+
 tools:
 	git -C $@/moses-scripts pull || git clone $(GIT_MOSES_SCRIPTS) $@/moses-scripts
 	git -C $@/subword-nmt pull || git clone $(GIT_SUBWORD_NMT) $@/subword-nmt
 	pip3 install --user $(PIP_PACKAGES)
 
-tools/marian:
-	git -C $@ pull || git clone $(GIT_MARIAN_DEV) -b $(BRANCH) $@
-	rm -rf $@/build
-	mkdir -p $@/build && cd $@/build && cmake .. -DCOMPILE_EXAMPLES=ON $(CMAKE_FLAGS) && make -j$(THREADS)
-
 models:
 	mkdir -p $@
 	cd $@ && bash ./download-wmt16.sh
@@ -44,3 +39,10 @@ models:
 data:
 	mkdir -p $@
 	cd $@ && bash ./download-data.sh
+
+marian: tools/marian
+tools/marian:
+	git -C $@ pull || git clone $(GIT_MARIAN_DEV) -b $(BRANCH) $@
+	rm -rf $@/build
+	mkdir -p $@/build && cd $@/build && cmake .. -DCOMPILE_EXAMPLES=ON $(CMAKE_FLAGS) && make -j$(THREADS)
+
-- 
cgit v1.2.3