updated PYTHONPATH setting

ZeyuChen · Mar 8, 2018 · 4fe2811 · 4fe2811
1 parent a1ded3b
commit 4fe2811
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/egs/ami/asr1/path.sh b/egs/ami/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/an4/asr1/path.sh b/egs/an4/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/chime4/asr1/path.sh b/egs/chime4/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/csj/asr1/path.sh b/egs/csj/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$MAIN_ROOT/tools/nkf/nkf-2.1.4/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/fisher_swbd/asr1/path.sh b/egs/fisher_swbd/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/hkust/asr1/path.sh b/egs/hkust/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/librispeech/asr1/path.sh b/egs/librispeech/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/swbd/asr1/path.sh b/egs/swbd/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/tedlium/asr1/path.sh b/egs/tedlium/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/voxforge/asr1/path.sh b/egs/voxforge/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/egs/wsj/asr1/path.sh b/egs/wsj/asr1/path.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 export PATH=$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$MAIN_ROOT/tools/chainer_ctc/ext/warp-ctc/build
 source $MAIN_ROOT/tools/venv/bin/activate
-export PYTHONPATH=$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
+export PYTHONPATH=$SPNET_ROOT/lm/:$SPNET_ROOT/asr/:$SPNET_ROOT/nets/:$SPNET_ROOT/utils/:$SPNET_ROOT/bin/:$PYTHONPATH
 
 export OMP_NUM_THREADS=1
 if [[ $(hostname -f) == *.clsp.jhu.edu ]] ; then

diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [tool:pytest]
 addopts = --verbose
 testpaths = test
-python_paths = src/nets src/utils src/bin src/asr
+python_paths = src/nets src/utils src/bin src/asr src/lm
 
 [flake8]
 ignore = H102

diff --git a/test/test_lm.py b/test/test_lm.py
@@ -1,8 +1,8 @@
 import chainer
 import torch
 
-import lm_train
-import lm_train_th
+import lm_chainer
+import lm_pytorch
 
 
 def transfer_lstm(ch_lstm, th_lstm):
@@ -17,8 +17,8 @@ def transfer_lstm(ch_lstm, th_lstm):
 
 
 def transfer_lm(ch_rnnlm, th_rnnlm):
-    assert isinstance(ch_rnnlm, lm_train.RNNLM)
-    assert isinstance(th_rnnlm, lm_train_th.RNNLM)
+    assert isinstance(ch_rnnlm, lm_chainer.RNNLM)
+    assert isinstance(th_rnnlm, lm_pytorch.RNNLM)
     th_rnnlm.embed.weight.data = torch.from_numpy(ch_rnnlm.embed.W.data)
     transfer_lstm(ch_rnnlm.l1, th_rnnlm.l1)
     transfer_lstm(ch_rnnlm.l2, th_rnnlm.l2)
@@ -30,8 +30,8 @@ def test_lm():
     n_vocab = 3
     n_units = 2
     batchsize = 5
-    rnnlm_ch = lm_train.ClassifierWithState(lm_train.RNNLM(n_vocab, n_units))
-    rnnlm_th = lm_train_th.ClassifierWithState(lm_train_th.RNNLM(n_vocab, n_units))
+    rnnlm_ch = lm_chainer.ClassifierWithState(lm_chainer.RNNLM(n_vocab, n_units))
+    rnnlm_th = lm_pytorch.ClassifierWithState(lm_pytorch.RNNLM(n_vocab, n_units))
     transfer_lm(rnnlm_ch.predictor, rnnlm_th.predictor)
     import numpy
     # test transfer function