Fix fixes also compilation problem in issue
@@ -15,9 +15,9 @@ MMT_HOME := $(realpath $(VENDOR_DIR)/..)
MMT_BUILD_DIR := $(MMT_HOME)/build
MMT_INSTALL_RES := $(MMT_BUILD_DIR)/res
-all: __moses_install __rocksdb_install __ilm_install __sapt_install __paoding_install
+all: __moses_install __rocksdb_install __paoding_install
-clean: __moses_clean __rocksdb_clean __ilm_clean __sapt_clean
+clean: __moses_clean __rocksdb_clean
res: __res_init __paoding_res __opennlp_res
@@ -40,53 +40,21 @@ __moses_install: __moses
@cd $(MOSES_BUILD_DIR); make install
@echo "SUCCESS (Moses)"
-__moses: __ilm_install __sapt_install
+__moses: __rocksdb_install __moses_dependencies
@echo "Building Moses..."
@mkdir -p $(MOSES_BUILD_DIR)
@cd $(MOSES_BUILD_DIR); cmake $(MOSES_HOME) -DMMT_ROOT=$(MMT_HOME) -DROCKSDB_ROOT=$(MMT_BUILD_DIR) -DUSE_MMTILM=1 -DMMTILM_ROOT=$(MMT_BUILD_DIR) -DUSE_SAPT=1 -DSAPT_ROOT=$(MMT_BUILD_DIR) -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(MMT_BUILD_DIR) -Wno-dev
@cd $(MOSES_BUILD_DIR); make -j$(NPROCS)
@echo "SUCCESS (Moses)"
+__moses_dependencies:
+ @echo "Making Moses dependencies..."
+ @cd $(MMT_HOME)/src/; mvn install -pl interpolated-lm,suffixarray-phrasetable --also-make
+ @echo "SUCCESS (Moses Dependencies)"
+
__moses_clean:
rm -rf $(MOSES_BUILD_DIR)
-# ==========================================
-# MODULE: SAPT (under MMT)
-# ==========================================
-
-__sapt_install: __sapt
- @echo "Installing SAPT..."
- @cd $(MMT_HOME)/src/; mvn install -pl suffixarray-phrasetable -am
- @echo "SUCCESS (SAPT)"
-
-__sapt: __rocksdb_install
- @echo "Building SAPT..."
- @cd $(MMT_HOME)/src/; mvn verify -pl suffixarray-phrasetable -am
- @echo "SUCCESS (SAPT)"
-
-__sapt_clean:
- @cd $(SAPT_HOME); mvn clean
-
-
-# ==========================================
-# MODULE: InterpolatedLM (under MMT)
-# ==========================================
-
-ILM_HOME := $(MMT_HOME)/src/interpolated-lm
-
-__ilm_install: __ilm
- @echo "Installing InterpolatedLM..."
- @cd $(MMT_HOME)/src/; mvn install -pl interpolated-lm -am
- @echo "SUCCESS (InterpolatedLM)"
-
-__ilm: __rocksdb_install
- @echo "Building InterpolatedLM..."
- @cd $(MMT_HOME)/src/; mvn verify -pl interpolated-lm -am
- @echo "SUCCESS (InterpolatedLM)"
-
-__ilm_clean:
- @cd $(ILM_HOME); mvn clean
-
# ==========================================
# MODULE: Paoding Analysis
