update bin/deploy

bin/deploy

@@ -25,7 +25,7 @@ HF_HOME="/scratch/shareddata/dldata/huggingface-hub-cache/"
 PYANNOTE_CACHE="${HF_HOME}/hub/"
 TORCH_HOME="/scratch/shareddata/speech2text"
 PYANNOTE_CONFIG="/appl/manual_installations/software/speech2text/$VERSION/pyannote/config.yml"
-NUMBA_CACHE="/tmp"
+NUMBA_CACHE_DIR="/tmp"
 MPLCONFIGDIR="/tmp"
 SPEECH2TEXT_MEM="8G"
 SPEECH2TEXT_CPUS_PER_TASK="6"
@@ -37,18 +37,18 @@ SPEECH2TEXT_TMP="/scratch/work/$USER/.speech2text"
 
 SCRIPT="$SCRIPT_DIR"/deploy-data/ood/template/script.sh
 
-sed -i "s/<VERSION>/$VERSION/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT>/$SPEECH2TEXT/g" $SCRIPT
-sed -i "s/<CONDA_ENV>/$CONDA_ENV/g" $SCRIPT
-sed -i "s/<HF_HOME>/$HF_HOME/g" $SCRIPT
-sed -i "s/<PYANNOTE_CACHE>/$PYANNOTE_CACHE/g" $SCRIPT
-sed -i "s/<TORCH_HOME>/$TORCH_HOME/g" $SCRIPT
-sed -i "s/<PYANNOTE_CONFIG>/$PYANNOTE_CONFIG/g" $SCRIPT
-sed -i "s/<NUMBA_CACHE>/$NUMBA_CACHE/g" $SCRIPT
-sed -i "s/<MPLCONFIGDIR>/$MPLCONFIGDIR/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT_MEM>/$SPEECH2TEXT_MEM/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT_CPUS_PER_TASK>/$SPEECH2TEXT_CPUS_PER_TASK/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT_TMP>/$SPEECH2TEXT_TMP/g" $SCRIPT
+sed -i "s|<VERSION>|$VERSION|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT>|$SPEECH2TEXT|g" $SCRIPT
+sed -i "s|<CONDA_ENV>|$CONDA_ENV|g" $SCRIPT
+sed -i "s|<HF_HOME>|$HF_HOME|g" $SCRIPT
+sed -i "s|<PYANNOTE_CACHE>|$PYANNOTE_CACHE|g" $SCRIPT
+sed -i "s|<TORCH_HOME>|$TORCH_HOME|g" $SCRIPT
+sed -i "s|<PYANNOTE_CONFIG>|$PYANNOTE_CONFIG|g" $SCRIPT
+sed -i "s|<NUMBA_CACHE_DIR>|$NUMBA_CACHE_DIR|g" $SCRIPT
+sed -i "s|<MPLCONFIGDIR>|$MPLCONFIGDIR|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT_MEM>|$SPEECH2TEXT_MEM|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT_CPUS_PER_TASK>|$SPEECH2TEXT_CPUS_PER_TASK|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT_TMP>|$SPEECH2TEXT_TMP|g" $SCRIPT
 
 # Copy the Open OnDemand scripts to the system deployment location
 # https://osc.github.io/ood-documentation/release-1.8/app-development/tutorials-interactive-apps/add-jupyter/deploy.html
@@ -59,18 +59,18 @@ sudo cp -r "$SCRIPT_DIR"/deploy-data/ood/ /var/www/ood/apps/sys/speech2text # FI
 
 $SCRIPT="$SCRIPT_DIR"/deploy-data/module/module.lua
 
-sed -i "s/<VERSION>/$VERSION/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT>/$SPEECH2TEXT/g" $SCRIPT
-sed -i "s/<CONDA_ENV>/$CONDA_ENV/g" $SCRIPT
-sed -i "s/<HF_HOME>/$HF_HOME/g" $SCRIPT
-sed -i "s/<PYANNOTE_CACHE>/$PYANNOTE_CACHE/g" $SCRIPT
-sed -i "s/<TORCH_HOME>/$TORCH_HOME/g" $SCRIPT
-sed -i "s/<PYANNOTE_CONFIG>/$PYANNOTE_CONFIG/g" $SCRIPT
-sed -i "s/<NUMBA_CACHE>/$NUMBA_CACHE/g" $SCRIPT
-sed -i "s/<MPLCONFIGDIR>/$MPLCONFIGDIR/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT_MEM>/$SPEECH2TEXT_MEM/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT_CPUS_PER_TASK>/$SPEECH2TEXT_CPUS_PER_TASK/g" $SCRIPT
-sed -i "s/<SPEECH2TEXT_TMP>/$SPEECH2TEXT_TMP/g" $SCRIPT
+sed -i "s|<VERSION>|$VERSION|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT>|$SPEECH2TEXT|g" $SCRIPT
+sed -i "s|<CONDA_ENV>|$CONDA_ENV|g" $SCRIPT
+sed -i "s|<HF_HOME>|$HF_HOME|g" $SCRIPT
+sed -i "s|<PYANNOTE_CACHE>|$PYANNOTE_CACHE|g" $SCRIPT
+sed -i "s|<TORCH_HOME>|$TORCH_HOME|g" $SCRIPT
+sed -i "s|<PYANNOTE_CONFIG>|$PYANNOTE_CONFIG|g" $SCRIPT
+sed -i "s|<NUMBA_CACHE_DIR>|$NUMBA_CACHE_DIR|g" $SCRIPT
+sed -i "s|<MPLCONFIGDIR>|$MPLCONFIGDIR|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT_MEM>|$SPEECH2TEXT_MEM|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT_CPUS_PER_TASK>|$SPEECH2TEXT_CPUS_PER_TASK|g" $SCRIPT
+sed -i "s|<SPEECH2TEXT_TMP>|$SPEECH2TEXT_TMP|g" $SCRIPT
 
 # Copy 
 cp "$SCRIPT" /appl/manual_installations/modules/speech2text/"$VERSION".lua

bin/deploy-data/module/module.lua

@@ -51,7 +51,7 @@ pushenv("PYANNOTE_CACHE", <PYANNOTE_CACHE>)
 pushenv("TORCH_HOME", <TORCH_HOME>)
 pushenv("XDG_CACHE_HOME", <TORCH_HOME>)
 pushenv("PYANNOTE_CONFIG", <PYANNOTE_CONFIG>)
-pushenv("NUMBA_CACHE_DIR", <NUMBA_CACHE>)
+pushenv("NUMBA_CACHE_DIR", <NUMBA_CACHE_DIR>)
 pushenv("MPLCONFIGDIR", <MPLCONFIGDIR>)
 
 pushenv("SPEECH2TEXT_MEM", <SPEECH2TEXT_MEM>)

bin/deploy-data/ood/template/script.sh

@@ -4,7 +4,7 @@ export PATH="/appl/manual_installations/software/speech2text/<VERSION>/env/bin"
 export HF_HOME="<HF_HOME>"
 export PYANNOTE_CACHE="<PYANNOTE_CACHE>"
 export TORCH_HOME="<TORCH_HOME>"
-export XDG_CACHE_HOME="<XDG_CACHE_HOME>"
+export XDG_CACHE_HOME="<TORCH_HOME>"
 export PYANNOTE_CONFIG="<PYANNOTE_CONFIG>"
 export NUMBA_CACHE_DIR="<NUMBA_CACHE_DIR>"
 export MPLCONFIGDIR="<MPLCONFIGDIR>"