From 59f73c0a258e35c9d2ce35abc1fef2d413cf04f2 Mon Sep 17 00:00:00 2001 From: Bakhti4u Date: Fri, 2 Apr 2021 17:45:17 +0200 Subject: [PATCH] Modded the bash and requirements --- requirements.txt | 3 --- setup.py | 2 +- setup.sh | 41 ----------------------------------------- 3 files changed, 1 insertion(+), 45 deletions(-) diff --git a/requirements.txt b/requirements.txt index 38f303f..1f21e56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,9 +34,6 @@ scipy==1.2.1 six==1.12.0 sonopy==0.1.2 speechpy-fast==2.4 -tensorboard==1.13.1 -tensorflow==1.13.1 -tensorflow-estimator==1.13.0 termcolor==1.1.0 tqdm==4.31.1 typing==3.6.6 diff --git a/setup.py b/setup.py index 44b22d9..3944393 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ setup( }, install_requires=[ 'numpy', - 'tensorflow-gpu==2.2.0', + 'tensorflow==2.3.1', 'sonopy', 'pyaudio', 'h5py', diff --git a/setup.sh b/setup.sh index 1c8a6a0..c40c392 100755 --- a/setup.sh +++ b/setup.sh @@ -13,51 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -is_command() { hash "$1" 2>/dev/null; } -apt_is_locked() { fuser /var/lib/dpkg/lock >/dev/null 2>&1; } -wait_for_apt() { - if apt_is_locked; then - echo "Waiting to obtain dpkg lock file..." - while apt_is_locked; do echo .; sleep 0.5; done - fi -} -has_piwheels() { cat /etc/pip.conf 2>/dev/null | grep -qF 'piwheels'; } -install_piwheels() { - echo "Installing piwheels..." - echo " -[global] -extra-index-url=https://www.piwheels.org/simple -" | sudo tee -a /etc/pip.conf -} - ############################################# set -e; cd "$(dirname "$0")" # Script Start # ############################################# -VENV=${VENV-$(pwd)/.venv} - -os=$(uname -s) -if [ "$os" = "Linux" ]; then - if is_command apt-get; then - wait_for_apt - sudo apt-get install -y python3-pip curl libopenblas-dev python3-scipy cython libhdf5-dev python3-h5py portaudio19-dev swig libpulse-dev libatlas-base-dev - fi -elif [ "$os" = "Darwin" ]; then - if is_command brew; then - brew install portaudio - fi -fi - -if [ ! -x "$VENV/bin/python" ]; then python3 -m venv "$VENV" --without-pip; fi -source "$VENV/bin/activate" -if [ ! -x "$VENV/bin/pip" ]; then curl https://bootstrap.pypa.io/get-pip.py | python; fi - -arch="$(python -c 'import platform; print(platform.machine())')" - -if [ "$arch" = "armv7l" ] && ! has_piwheels; then - install_piwheels -fi - pip install -e runner/ pip install -e . pip install pocketsphinx # Optional, for comparison