From cb86682cde345b4ffff25be3b49aaed1ff6228a5 Mon Sep 17 00:00:00 2001
From: Roman Grundkiewicz <rgrundki@exseed.ed.ac.uk>
Date: Tue, 26 Sep 2017 20:27:54 +0000
Subject: Move marian-dev to tools

---
 Makefile | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bbd423e..c90ced5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,26 @@
-
 THREADS=16
 
-GIT_MARIAN=http://github.com/marian-nmt/marian-dev.git
+GIT_MARIAN_DEV=http://github.com/marian-nmt/marian-dev.git
+GIT_MARIAN=http://github.com/marian-nmt/marian.git
 GIT_MOSES_SCRIPTS=http://github.com/marian-nmt/moses-scripts.git
 GIT_SUBWORD_NMT=http://github.com/rsennrich/subword-nmt.git
 
-URL_MODELS=
-
-.PHONY: marian install
+.PHONY: tools/marian-dev tools/marian install
 .SECONDARY:
 
 
-install: marian/build/marian tools
+#####################################################################
 
-tools:
-	mkdir -p $@
-	cd $@ && git clone $(GIT_MOSES_SCRIPTS)
-	cd $@ && git clone $(GIT_SUBWORD_NMT)
+install: tools models
+
+tools: tools/marian
+	git -C $@/moses-scripts pull || git clone $(GIT_MOSES_SCRIPTS) $@/moses-scripts
+	git -C $@/subword-nmt pull || git clone $(GIT_SUBWORD_NMT) $@/subword-nmt
+
+tools/marian:
+	git -C $@ pull || git clone $(GIT_MARIAN_DEV) $@
+	mkdir -p $@/build && cd $@/build && cmake .. -DCOMPILE_EXAMPLES=ON -DUSE_CUDNN=ON && make -j$(THREADS)
 
 models:
 	mkdir -p $@
 	cd $@ && bash download_wmt16.sh
-
-#####################################################################
-
-marian/build/marian: marian
-	mkdir -p $</build && cd $</build && cmake .. -DCOMPILE_EXAMPLES=ON -DUSE_CUDNN=ON && make -j$(THREADS)
-
-marian:
-	git -C $@ pull || git clone $(GIT_MARIAN) $@
-- 
cgit v1.2.3