Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed docker build. #165

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed docker build. #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
479af55
Fixed docker build.
tlc May 22, 2018
c7c6fc6
Mod scripts for local install on centos and ubuntu.
tlc May 29, 2018
776725a
Fix centos/ubuntu discrimination.
tlc May 29, 2018
6116769
Forgot gfortran.
tlc Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y zlib1g-dev automake autoconf git \
libtool subversion libatlas3-base ffmpeg python-pip \
python-dev wget unzip && \
python-dev wget unzip gfortran python3 && \
apt-get clean

ADD ext /gentle/ext
Expand Down
2 changes: 1 addition & 1 deletion ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ADDLIBS = $(KALDI_BASE)online2/kaldi-online2.a $(KALDI_BASE)ivector/kaldi-ivecto
$(KALDI_BASE)nnet2/kaldi-nnet2.a $(KALDI_BASE)lat/kaldi-lat.a \
$(KALDI_BASE)decoder/kaldi-decoder.a $(KALDI_BASE)cudamatrix/kaldi-cudamatrix.a \
$(KALDI_BASE)feat/kaldi-feat.a $(KALDI_BASE)transform/kaldi-transform.a $(KALDI_BASE)gmm/kaldi-gmm.a \
$(KALDI_BASE)thread/kaldi-thread.a $(KALDI_BASE)hmm/kaldi-hmm.a $(KALDI_BASE)tree/kaldi-tree.a \
$(KALDI_BASE)hmm/kaldi-hmm.a $(KALDI_BASE)tree/kaldi-tree.a \
$(KALDI_BASE)matrix/kaldi-matrix.a $(KALDI_BASE)fstext/kaldi-fstext.a \
$(KALDI_BASE)util/kaldi-util.a $(KALDI_BASE)base/kaldi-base.a

Expand Down
34 changes: 25 additions & 9 deletions install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,36 @@
#!/bin/bash

set -e
set -x

echo "Installing dependencies..."

# Install OS-specific dependencies
if [[ "$OSTYPE" == "linux-gnu" ]]; then
apt-get update -qq
apt-get install -y zlib1g-dev automake autoconf git \
libtool subversion libatlas3-base python-pip \
python-dev wget unzip
apt-get install -y ffmpeg || echo -n "\n\nYou have to install ffmpeg from a PPA or from https://ffmpeg.org before you can run gentle\n\n"
pip install .
elif [[ "$OSTYPE" == "darwin"* ]]; then
brew install ffmpeg libtool automake autoconf wget
if [[ "$OSTYPE" == "darwin"* ]]; then
brew install ffmpeg libtool automake autoconf wget python3

sudo easy_install pip
sudo pip install .
elif [[ "$OSTYPE" == "linux-gnu" ]]; then
ID=$(awk -F= '/^ID=/{gsub(/"/, "", $2); print $2}' /etc/os-release)
if [[ "$ID" == "ubuntu" ]]; then
if [ -f /.dockerenv ]; then
SUDO=
else
SUDO=sudo
fi
$SUDO apt-get update -qq
$SUDO apt-get install -y zlib1g-dev automake autoconf git \
libtool subversion libatlas3-base python-pip \
python-dev wget unzip gfortran python3
$SUDO apt-get install -y ffmpeg || echo -n "\n\nYou have to install ffmpeg from a PPA or from https://ffmpeg.org before you can run gentle\n\n"
$SUDO pip install -e .
elif [[ "$ID" == "centos" ]]; then
sudo yum check-update
sudo yum install -y zlib1g-dev automake autoconf git \
libtool subversion libatlas3-base python-pip \
python-dev wget unzip gcc-gfortran python34 python34-pip
sudo yum install -y ffmpeg || echo -n "\n\nYou have to install ffmpeg from a PPA or from https://ffmpeg.org before you can run gentle\n\n"
sudo pip install -e . # NOT pip3 !!
fi
fi