From ecc2c3bec6a60a3f2bc8bfb40dcce82d040be21b Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sun, 30 May 2021 04:55:49 -0400
Subject: [PATCH] I installed my own requirements.txt somehow not realizing it
 was there

what
---
 .gitignore                        |  1 +
 Dockerfile                        | 14 ++++++++++++++
 models/tacotron2/requirements.txt | 16 +++++++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b768de628d..a81f2dfe7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 __pycache__/
 _ignored_schema.rs
 models/Wav2Lip/python/
+models/tacotron2/python/
 production_database_secret_connect.sh
 secrets.toml
 secrets.yaml
diff --git a/Dockerfile b/Dockerfile
index 3be99a7629..b14fda1445 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,14 @@ FROM nvidia/cuda:10.1-devel-ubuntu18.04 as pybuild-base
 
 # NB: https://github.com/NVIDIA/nvidia-docker/issues/864#issuecomment-439848887
 # NB: We do not install ffmpeg, since the version is 3.8.* series and we need 4.2.*
+#
+# NB(2021-05-30): We need to install `cython3` for building modern Tacotron 2
+# dependencies (ie. protoc) on old Ubuntu
 RUN apt-get update \
     && apt-get install -y \
         build-essential \
         curl \
+        cython3 \
         g++-7 \
         gcc-7 \
         git \
@@ -57,6 +61,16 @@ RUN python3.6 -m venv python
 RUN . python/bin/activate \
   && pip install --upgrade pip \
   && pip install -r requirements.txt
+  && deactivate
+
+COPY models/tacotron2 ./models/tacotron2
+WORKDIR models/tacotron2
+
+RUN python3.6 -m venv python
+RUN . python/bin/activate \
+  && pip install --upgrade pip \
+  && pip install -r requirements.txt
+  && deactivate
 
 # ==================== Rust Build Base ====================
 
diff --git a/models/tacotron2/requirements.txt b/models/tacotron2/requirements.txt
index 9b23dca725..6eb9914bb1 100644
--- a/models/tacotron2/requirements.txt
+++ b/models/tacotron2/requirements.txt
@@ -1,8 +1,14 @@
-matplotlib==2.1.0
-tensorflow==1.15.2
-numpy==1.13.3
-inflect==0.2.5
+#numpy
+scipy
+matplotlib
 librosa==0.6.0
-scipy==1.0.0
+tensorflow
+tensorboardX
+inflect==0.2.5
 Unidecode==1.0.22
 pillow
+jupyter
+
+# Note: numpy@latest doesn't build in Python<3.7, and numba causes it
+numba==0.46.0
+numpy==1.14.3