Changeset 37658 for gs3-extensions

Timestamp:

2023-04-13T13:45:45+12:00 (13 months ago)

Author:

davidb

Message:

Tweaks after testing

Location:

gs3-extensions/structured-audio/trunk

Files:

• TEST-DIARIZATION.sh (modified) (1 diff)
• _config.bash (modified) (2 diffs)
• bin/script/diarization.py.in (modified) (2 diffs)

gs3-extensions/structured-audio/trunk/TEST-DIARIZATION.sh

@@ -3 +3 @@
 source ./_config.bash
 
-test_audio_filename=${1:-test-audio/tst00.wav}
+test_audio_ifilename=${1:-test-audio/tst00.wav}
+test_csv_ofilename=${test_audio_ifilename%.*}.csv
 
-test_dir=${test_audio_filename%/*}
-test_file=${test_audio_filename##*/}
+./bin/script/diarization.py $test_audio_ifilename $test_csv_ofilename
 
-./bin/script/diarization.py $test_audio_filename test-audio/tst00.csv
 
+echo ""
+echo "Diarization output file:"
+echo "    $test_csv_ofilename"
+echo ""

gs3-extensions/structured-audio/trunk/_config.bash

@@ -16 +16 @@
     echo ""
     echo "Warning: Environment variable PYTHON3_HOME not set"
-elif [ "$PYTHON3_HOME" != "$GSDL3_EXTCLI_HOME/selfcontained-python3" ] ; then
-    echo ""
-    echo "Warning: Environment variable PYTHON3_HOME is set, but is not the "
-    echo "         directory \$GSDL3_EXTCLI_HOME/selfcontained-python3:"
-    echo "           $GSDL3_EXTCLI_HOME/selfcontained-python3"
+else
+    PYTHON3_PARENT_HOME=${PYTHON3_HOME%/*}
+    if [ "$PYTHON3_PARENT_HOME" != "$GSDL3_EXTCLI_HOME/selfcontained-python3" ] ; then
+    echo ""
+    echo "Warning: Environment variable PYTHON3_HOME is set, but its immediate parent directory "
+    echo "         is not the directory \$GSDL3_EXTCLI_HOME/selfcontained-python3:"
+    echo "           $GSDL3_EXTCLI_HOME/selfcontained-python3"
+    fi
 fi
 
@@ -32 +35 @@
 fi
 
+echo ""
 echo "Changing the value of \$HOME to:"
 echo "  $HOME"
-echo "So pip installed packages (which can consume significant disk space)"
+echo ""
+echo "This is so pip installed packages (which can consume significant disk space)"
 echo "are stored in the same area as the Greenstone installation, rather"
 echo "than the user's home"

gs3-extensions/structured-audio/trunk/bin/script/diarization.py.in

@@ -1 +1 @@
 #!/usr/bin/env python3
+
 from pyannote.audio import Pipeline
 from pathlib import Path
@@ -6 +7 @@
 # remove available graphic cards to trigger cpu default
 os.environ["CUDA_VISIBLE_DEVICES"] = "" 
+
+if os.environ["GSDL3_EXTCLI_HOME"] is not None and os.environ["GSDL3_EXTCLI_HOME"] != "":
+    os.environ["HOME"]=os.path.join(os.environ["GSDL3_EXTCLI_HOME"],"python3-user-home")
+    print("Setting HOME=%s for pyannote models" % os.environ["HOME"])
+                         
 
 from huggingface_hub import HfApi