scripts now automatically download the models, and small fixes

Author: jgroschwitz

downloaded_models/README.txt

@@ -0,0 +1 @@
+When a script (e.g. scripts/predict.sh) automatically downloads a trained model, that model gets stored here.

scripts/predict.sh

@@ -3,7 +3,7 @@
 # TODO make this file safe for spaces in filenames
 
 # default file paths
-defaultmodel="example/full_model.tar.gz"
+defaultmodel="downloaded_models/full_model.tar.gz"
 jar="am-tools-all.jar"
 
 # Documenting parameters:
@@ -60,8 +60,7 @@ if [ -f "$model" ]; then
 else
     if [ "$model" = "$defaultmodel" ]; then
         echo "model not found at default model path. Downloading it!"
-        # TODO replace this with code that downloads the model from the internet
-        cp /local/mlinde/am-parser/models/bert_all2/model.tar.gz "$defaultmodel"
+        wget -O "$defaultmodel" https://coli-saar-data.s3.eu-central-1.amazonaws.com/full_model.tar.gz
     else
         echo "model not found at $model. Please check the -m parameter"
     fi
@@ -71,8 +70,7 @@ if [ -f "$jar" ]; then
     echo "jar file found at $jar"
 else
     echo "jar file not found at $jar, downloading it!"
-    # TODO replace this with code that downloads the jar file from the internet
-    cp /proj/irtg.shadow/tools/am-tools-all.jar "$jar"
+    wget -O "$jar" https://coli-saar-data.s3.eu-central-1.amazonaws.com/am-tools.jar
 fi
 
 
@@ -106,7 +104,6 @@ if [ "$type" = "DM" ] || [ "$type" = "PAS" ] || [ "$type" = "PSD" ]; then
     java -cp $jar de.saar.coli.amrtagging.formalisms.sdp.tools.PrepareFinalTestData -c $input -o $output -p $prefix
 else
     if [ "$type" = "EDS" ]; then
-        # TODO fix this part
          java -cp $jar de.saar.coli.amrtagging.formalisms.eds.tools.PrepareTestData -c $input -o $output -p $prefix
     fi
 fi

scripts/predict_from_raw_text.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# TODO make this file safe for spaces in filenames
+
 # default file paths
-defaultmodel="example/raw_text_model.tar.gz"
+defaultmodel="downloaded_models/raw_text_model.tar.gz"
 jar="am-tools-all.jar"
 
 # Documenting parameters:
@@ -58,8 +60,7 @@ if [ -f "$model" ]; then
 else
     if [ "$model" = "$defaultmodel" ]; then
         echo "model not found at default model path. Downloading it!"
-        # TODO replace this with code that downloads the model from the internet
-        cp /local/mlinde/am-parser/models/mtl_bert_minimum/model.tar.gz "$defaultmodel"
+        wget -O "$defaultmodel" https://coli-saar-data.s3.eu-central-1.amazonaws.com/raw_text_model.tar.gz
     else
         echo "model not found at $model. Please check the -m parameter"
     fi
@@ -69,8 +70,7 @@ if [ -f "$jar" ]; then
     echo "jar file found at $jar"
 else
     echo "jar file not found at $jar, downloading it!"
-    # TODO replace this with code that downloads the jar file from the internet
-    cp /proj/irtg.shadow/tools/am-tools-all.jar "$jar"
+    wget -O "$jar" https://coli-saar-data.s3.eu-central-1.amazonaws.com/am-tools.jar
 fi