Changeset 36132

Timestamp:

2022-04-07T16:47:09+12:00 (2 years ago)

Author:

davidb

Message:

Changes as a result of testing on Linux machine in the DL lab

Location:

gs3-extensions/structured-audio/trunk

Files:

• CREATE-VENV-PYTHON3.sh (modified) (2 diffs)
• SETUP-TOP-LEVEL.sh (modified) (5 diffs)
• devel.bash (modified) (2 diffs)

gs3-extensions/structured-audio/trunk/CREATE-VENV-PYTHON3.sh

@@ -1 +1 @@
 #!/bin/bash
-
-#source ./devel.bash 
 
 source ./setup.bash
@@ -20 +18 @@
 echo "*   source \"$GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python3/bin/activate\""
 echo "*"
-echo "* Then install the following Python modules with:"
-echo "*   pip install six sklearn matplotlib"
+echo "* Then install the following Python module(s) with:"
+echo "*   pip install pyannote"
 echo "****"
 

gs3-extensions/structured-audio/trunk/SETUP-TOP-LEVEL.sh

@@ -1 +1 @@
 
-_full_pyver_=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
+_full_pyver_=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)')
 _majorminor_pyver_=${_full_pyver_%.*}
 
@@ -20 +20 @@
         echo "! Then: " >&2
     fi
-    echo "!   pip install $1" >&2
+
+    if [ "$1" = "pyannote" ] ; then
+        echo "! pip install https://github.com/pyannote/pyannote-audio/archive/develop.zip" >&2
+    else
+        echo "!   pip install $1" >&2
+    fi
+    
+    echo "!" >&2
     echo "!!!!" >&2
     
@@ -29 +36 @@
 function check_pip_installed_all()
 {
-    for pkg in pyannote ; do
+    for pkg in wheel pyannote speechbrain ; do
     check_pip_installed $pkg
     if [ $? != 0 ] ; then
@@ -37 +44 @@
 }
 
-
-check_pip_installed_all
-
-if [ $? != 0 ] ; then
-    return 1
-fi
 
 if [ "x$VIRTUAL_ENV" = "x" ] ; then
@@ -53 +54 @@
 
     source $GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python3/bin/activate
+
 fi
 
+
+check_pip_installed_all
+    
+if [ $? != 0 ] ; then
+    return 1
+fi    

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

@@ -1 +1 @@
 #!/bin/bash
 
-_full_pyver_=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
+_full_pyver_=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)')
 _pyver_=${_full_pyver_%%.*}
 
-#_pyver_=${1-3} # default to Python v3
-
-#if [ "x$1" = "x" ] ; then
-#    echo "" >&2
-#    echo "Usage: source ${BASH_SOURCE} 2|3" >&2
-#    echo "  where '2' specifies Python v2 is to be used" >&2
-#    echo "  where '3' specifies Python v3 is to be used" >&2
-#    echo "" >&2
-#    return 1
-#fi
-
-
+if [ "x$_pyver_" = "x" ]  ; then
+    echo "" >&2
+    echo "Failed to establish the full version of python" >&2
+    echo "Defaulting to version 3" >&2
+    _pyver_=3
+fi
+    
 
 if [ "x$GEXT_STRUCTURED_AUDIO" = "x" ] ; then
@@ -43 +38 @@
     # return 1
 
-elif  [ "x$VIRTUAL_ENV" = "x" ] ; then
-    # It exists, but it hasn't been activated 
-    echo ""
-    echo "****"
-    echo "* Warning: To run"
-    echo "*   ./CASCADE-MAKE.sh"
-    echo "*"
-    echo "* You first need to activate Python v$_pyver_ Virtual Env:"
-    echo "*   source $GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python$_pyver_/bin/activate"
-    echo "*"
-    echo "* So you have a version of the python scripting language under user control"
-    echo "* where the 'essentia' build can be installed as a site-package" 
-    echo "****"
-    echo ""
 elif [ "$VIRTUAL_ENV" != "$GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python$_pyver_" ] ; then
     # A python virtual env is in play, but not the one for Python v$_pyver_ in this extension's area