Changeset 36132


Ignore:
Timestamp:
2022-04-07T16:47:09+12:00 (3 months ago)
Author:
davidb
Message:

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

Location:
gs3-extensions/structured-audio/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • gs3-extensions/structured-audio/trunk/CREATE-VENV-PYTHON3.sh

    r36131 r36132  
    11#!/bin/bash
    2 
    3 #source ./devel.bash
    42
    53source ./setup.bash
     
    2018echo "*   source \"$GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python3/bin/activate\""
    2119echo "*"
    22 echo "* Then install the following Python modules with:"
    23 echo "*   pip install six sklearn matplotlib"
     20echo "* Then install the following Python module(s) with:"
     21echo "*   pip install pyannote"
    2422echo "****"
    2523
  • gs3-extensions/structured-audio/trunk/SETUP-TOP-LEVEL.sh

    r36131 r36132  
    11
    2 _full_pyver_=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
     2_full_pyver_=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)')
    33_majorminor_pyver_=${_full_pyver_%.*}
    44
     
    2020        echo "! Then: " >&2
    2121    fi
    22     echo "!   pip install $1" >&2
     22
     23    if [ "$1" = "pyannote" ] ; then
     24        echo "! pip install https://github.com/pyannote/pyannote-audio/archive/develop.zip" >&2
     25    else
     26        echo "!   pip install $1" >&2
     27    fi
     28   
     29    echo "!" >&2
    2330    echo "!!!!" >&2
    2431   
     
    2936function check_pip_installed_all()
    3037{
    31     for pkg in pyannote ; do
     38    for pkg in wheel pyannote speechbrain ; do
    3239    check_pip_installed $pkg
    3340    if [ $? != 0 ] ; then
     
    3744}
    3845
    39 
    40 check_pip_installed_all
    41 
    42 if [ $? != 0 ] ; then
    43     return 1
    44 fi
    4546
    4647if [ "x$VIRTUAL_ENV" = "x" ] ; then
     
    5354
    5455    source $GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python3/bin/activate
     56
    5557fi
    5658
     59
     60check_pip_installed_all
     61   
     62if [ $? != 0 ] ; then
     63    return 1
     64fi   
  • gs3-extensions/structured-audio/trunk/devel.bash

    r36131 r36132  
    11#!/bin/bash
    22
    3 _full_pyver_=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
     3_full_pyver_=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)')
    44_pyver_=${_full_pyver_%%.*}
    55
    6 #_pyver_=${1-3} # default to Python v3
    7 
    8 #if [ "x$1" = "x" ] ; then
    9 #    echo "" >&2
    10 #    echo "Usage: source ${BASH_SOURCE} 2|3" >&2
    11 #    echo "  where '2' specifies Python v2 is to be used" >&2
    12 #    echo "  where '3' specifies Python v3 is to be used" >&2
    13 #    echo "" >&2
    14 #    return 1
    15 #fi
    16 
    17 
     6if [ "x$_pyver_" = "x" ]  ; then
     7    echo "" >&2
     8    echo "Failed to establish the full version of python" >&2
     9    echo "Defaulting to version 3" >&2
     10    _pyver_=3
     11fi
     12   
    1813
    1914if [ "x$GEXT_STRUCTURED_AUDIO" = "x" ] ; then
     
    4338    # return 1
    4439
    45 elif  [ "x$VIRTUAL_ENV" = "x" ] ; then
    46     # It exists, but it hasn't been activated
    47     echo ""
    48     echo "****"
    49     echo "* Warning: To run"
    50     echo "*   ./CASCADE-MAKE.sh"
    51     echo "*"
    52     echo "* You first need to activate Python v$_pyver_ Virtual Env:"
    53     echo "*   source $GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python$_pyver_/bin/activate"
    54     echo "*"
    55     echo "* So you have a version of the python scripting language under user control"
    56     echo "* where the 'essentia' build can be installed as a site-package"
    57     echo "****"
    58     echo ""
    5940elif [ "$VIRTUAL_ENV" != "$GEXT_STRUCTURED_AUDIO_INSTALLED/virtualenv-python$_pyver_" ] ; then
    6041    # A python virtual env is in play, but not the one for Python v$_pyver_ in this extension's area
Note: See TracChangeset for help on using the changeset viewer.