From a782f0d914488f9c5f305b9e5cdfb542432b0c39 Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Sat, 14 Jan 2023 19:27:18 +0900
Subject: [PATCH] WIP: anaconda on linux

---
 docker/Dockerfile          | 34 ++++++++++++----------------------
 server/misc/log_control.py | 10 +++++-----
 server/requirements.txt    | 12 ++++++------
 start2.sh                  |  4 ++--
 4 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4d8da8d2..d76179a3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,32 +5,22 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update 
 RUN apt-get install -y python3-pip git
 
-RUN pip install torch torchvision torchaudio
-RUN pip install Cython==0.29.32
-RUN pip install numpy==1.22.4 
-RUN pip install scipy==1.9.0
-RUN pip install librosa==0.9.2
-RUN pip install phonemizer==3.2.1
-RUN pip install Unidecode==1.3.4
-RUN pip install resampy==0.4.0
+RUN pip install torch==1.13.1
+RUN pip install numpy==1.24.1
+RUN pip install Unidecode==1.3.6
+RUN pip install python-socketio==5.7.2
 
-RUN pip install tqdm==4.64.0
-RUN pip install retry==0.9.2
-RUN pip install psutil==5.9.1
-RUN pip install python-socketio==5.7.1
-RUN pip install matplotlib==3.5.3
-
-RUN pip install fastapi==0.85.0
+RUN pip install fastapi==0.89.1
 RUN pip install python-multipart==0.0.5
-RUN pip install uvicorn==0.18.3
+RUN pip install uvicorn==0.20.0
 RUN pip install websockets==10.4
 RUN pip install pyOpenSSL==23.0.0
 RUN pip install onnxruntime-gpu==1.13.1
 
-RUN git clone --depth 1 https://github.com/isletennos/MMVC_Trainer.git -b v1.3.2.2
-WORKDIR /MMVC_Trainer/monotonic_align
-RUN python3 setup.py build_ext --inplace
- 
+RUN git clone https://github.com/isletennos/MMVC_Client.git
+RUN cd MMVC_Client && git checkout 04f3fec4fd82dea6657026ec4e1cd80fb29a415c && cd -
+
+
 WORKDIR /
 ADD dummy /
 
@@ -50,8 +40,8 @@ RUN apt-get update \
 ### Copy from base
 COPY --from=base --chmod=777 /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
 COPY --from=base --chmod=777 /voice-changer /voice-changer
-COPY --from=base --chmod=777 /MMVC_Trainer /voice-changer/server/MMVC_Trainer
-RUN chmod 0777 /voice-changer/server/MMVC_Trainer
+COPY --from=base --chmod=777 /MMVC_Client /voice-changer/server/MMVC_Client
+RUN chmod 0777 /voice-changer/server/MMVC_Client
 RUN chmod 0777 /voice-changer/server
 
 ADD /setup.sh  /voice-changer/server
diff --git a/server/misc/log_control.py b/server/misc/log_control.py
index 1ad6edc4..e692fbdb 100644
--- a/server/misc/log_control.py
+++ b/server/misc/log_control.py
@@ -2,12 +2,12 @@ import logging
 
 # logging.getLogger('numba').setLevel(logging.WARNING)
 
-# class UvicornSuppressFilter(logging.Filter):
-#     def filter(self, record):
-#         return False
+class UvicornSuppressFilter(logging.Filter):
+    def filter(self, record):
+        return False
 
-# logger = logging.getLogger("uvicorn.error")
-# logger.addFilter(UvicornSuppressFilter())
+logger = logging.getLogger("uvicorn.error")
+logger.addFilter(UvicornSuppressFilter())
 
 # logger.propagate = False
 
diff --git a/server/requirements.txt b/server/requirements.txt
index fc744cfd..4b1d8d2e 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -1,9 +1,9 @@
-fastapi==0.88.0
-numpy==1.23.5
-pyOpenSSL==22.1.0
-python-multipart==0.0.5
+torch==1.13.1
+numpy==1.24.1
 python-socketio==5.7.2
-torch==1.13.0
+fastapi==0.89.1
+python-multipart==0.0.5
 uvicorn==0.20.0
 websockets==10.4
-onnxruntime==1.13.1
+pyOpenSSL==23.0.0
+onnxruntime-gpu==1.13.1
diff --git a/start2.sh b/start2.sh
index 62d62c6d..78077042 100644
--- a/start2.sh
+++ b/start2.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -eu
 
-DOCKER_IMAGE=dannadori/voice-changer:20230114_185803
-# DOCKER_IMAGE=voice-changer
+#DOCKER_IMAGE=dannadori/voice-changer:20230114_190436
+DOCKER_IMAGE=voice-changer
 
 if [ $# = 0 ]; then
     echo "