naming conventions, etc

kellymarchisio · Mar 3, 2023 · 922d7af · 922d7af
1 parent a973456
commit 922d7af
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/eval.sh b/eval.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-###############################################################################
-###
-### Vecmap map embeddings.
-###
-###     -- Kelly Marchisio, Feb 2022.
+#############################################################################
+#
+# Vecmap map embeddings.
+#
+#     -- Kelly Marchisio, Feb 2022.
 
 . ./local-settings.sh
 

diff --git a/local-settings.sh b/local-settings.sh
@@ -12,7 +12,6 @@ export TMP=$DIR/tmp
 export MOSES_SCRIPTS=$DIR/third_party/mosesdecoder/scripts
 export VECMAP=$DIR/third_party/vecmap_fork
 export WORD2VEC=$DIR/third_party/word2vec/word2vec
-export ISOSTUDY_SCRIPTS=$DIR/third_party/iso_study_fork/scripts
 
 echo 'TEMPDIR is: ' $TEMPDIR
 set -e
diff --git a/map-baseline-diffembs.sh b/map-baseline-diffembs.sh
@@ -12,11 +12,11 @@ SRC_EMBS=exps/baseline/$src_stage/$SRC/embs.out
 TRG_EMBS=exps/baseline/$ref_stage/$TRG/embs.out
 MAPPED_OUTDIR=exps/baseline/$src_stage/$ref_stage/$SRC-$TRG/$eval_on_test
 
-SEEDS=data/dicts/MUSE/$SRC-$TRG/train/$SRC-$TRG.0-5000.txt
+SEEDS=data/dicts/$SRC-$TRG/train/$SRC-$TRG.0-5000.txt
 if [[ -z "$eval_on_test" ]]; then
-	TEST=data/dicts/MUSE/$SRC-$TRG/dev/$SRC-$TRG.6501-8000.txt
+	TEST=data/dicts/$SRC-$TRG/dev/$SRC-$TRG.6501-8000.txt
 elif [[ $eval_on_test == test ]]; then
-	TEST=data/dicts/MUSE/$SRC-$TRG/test/$SRC-$TRG.5000-6500.txt
+	TEST=data/dicts/$SRC-$TRG/test/$SRC-$TRG.5000-6500.txt
 else
 	echo Please specify "test" to eval on test set, or nothing to eval on dev.
 	exit

diff --git a/map-baseline.sh b/map-baseline.sh
@@ -10,11 +10,11 @@ SRC_EMBS=exps/baseline/$stage/$SRC/embs.out
 TRG_EMBS=exps/baseline/$stage/$TRG/embs.out
 MAPPED_OUTDIR=exps/baseline/$stage/$SRC-$TRG/$eval_on_test
 
-SEEDS=data/dicts/MUSE/$SRC-$TRG/train/$SRC-$TRG.0-5000.txt
+SEEDS=data/dicts/$SRC-$TRG/train/$SRC-$TRG.0-5000.txt
 if [[ -z "$eval_on_test" ]]; then
-	TEST=data/dicts/MUSE/$SRC-$TRG/dev/$SRC-$TRG.6501-8000.txt
+	TEST=data/dicts/$SRC-$TRG/dev/$SRC-$TRG.6501-8000.txt
 elif [[ $eval_on_test == test ]]; then
-	TEST=data/dicts/MUSE/$SRC-$TRG/test/$SRC-$TRG.5000-6500.txt
+	TEST=data/dicts/$SRC-$TRG/test/$SRC-$TRG.5000-6500.txt
 else
 	echo Please specify "test" to eval on test set, or nothing to eval on dev.
 	exit

diff --git a/run-isovec-eval.sh b/run-isovec-eval.sh
@@ -13,17 +13,17 @@ eval_on_test=$5
 # by Kelly Marchisio, Apr/May 2022.
 ###############################################################################
 
-EXP_NAME=real-isovec
+EXP_NAME=isovec
 OUTDIR=exps/$EXP_NAME/$stage/$trial_num/$LNG-$REF_LNG
-SEEDS=data/dicts/MUSE/$LNG-$REF_LNG/train/$LNG-$REF_LNG.0-5000.txt
+SEEDS=data/dicts/$LNG-$REF_LNG/train/$LNG-$REF_LNG.0-5000.txt
 MAPPED_OUTDIR=$OUTDIR/mapped
 REF_EMBS=$DIR/exps/baseline/10/$REF_LNG/embs.out
 mkdir -p $MAPPED_OUTDIR
 
 if [[ -z "$eval_on_test" ]]; then
-	TEST=data/dicts/MUSE/$LNG-$REF_LNG/dev/$LNG-$REF_LNG.6501-8000.txt
+	TEST=data/dicts/$LNG-$REF_LNG/dev/$LNG-$REF_LNG.6501-8000.txt
 elif [[ $eval_on_test == test ]]; then
-	TEST=data/dicts/MUSE/$LNG-$REF_LNG/test/$LNG-$REF_LNG.5000-6500.txt
+	TEST=data/dicts/$LNG-$REF_LNG/test/$LNG-$REF_LNG.5000-6500.txt
 else
 	echo Please specify "test" to eval on test set, or nothing to eval on dev.
 	exit

diff --git a/run-isovec.sh b/run-isovec.sh
@@ -15,8 +15,8 @@ trial_num=$4
 
 EXP_NAME=isovec
 OUTDIR=exps/$EXP_NAME/$stage/$trial_num/$LNG-$REF_LNG
-SEEDS=data/dicts/MUSE/$LNG-$REF_LNG/train/$LNG-$REF_LNG.0-5000.txt
-TEST=data/dicts/MUSE/$LNG-$REF_LNG/dev/$LNG-$REF_LNG.6501-8000.txt
+SEEDS=data/dicts/$LNG-$REF_LNG/train/$LNG-$REF_LNG.0-5000.txt
+TEST=data/dicts/$LNG-$REF_LNG/dev/$LNG-$REF_LNG.6501-8000.txt
 MAPPED_OUTDIR=$OUTDIR/mapped
 mkdir -p $OUTDIR