Update: change gunicorn workers, fix absolute path, add GPU docker version

.github/workflows/docker-latest.yml

@@ -30,8 +30,20 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
+          file: ./Dockerfile
           push: true
           platforms: 'linux/amd64,linux/arm64'
-          tags: ${{ vars.DOCKER_REPO_NAME }}:latest
+          tags: artrajz/vits-simple-api:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile_GPU
+          push: true
+          platforms: 'linux/amd64,linux/arm64'
+          tags: artrajz/vits-simple-api-gpu:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max

Dockerfile_GPU

@@ -0,0 +1,39 @@
+FROM python:3.10.11-slim-bullseye
+
+RUN mkdir -p /app
+WORKDIR /app
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt install build-essential -yq && \
+    apt install espeak-ng -yq && \
+    apt install cmake -yq && \
+    apt install -y wget -yq && \
+    apt-get clean && \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install MarkupSafe==2.1.2 numpy==1.23.3 cython six==1.16.0
+
+RUN wget https://raw.githubusercontent.com/Artrajz/archived/main/openjtalk/openjtalk-0.3.0.dev2.tar.gz && \
+    tar -zxvf openjtalk-0.3.0.dev2.tar.gz && \
+    cd openjtalk-0.3.0.dev2 && \
+    rm -rf ./pyopenjtalk/open_jtalk_dic_utf_8-1.11 && \
+    python setup.py install && \
+    cd ../ && \
+    rm -f openjtalk-0.3.0.dev2.tar.gz && \
+    rm -rf openjtalk-0.3.0.dev2
+
+RUN pip install torch --index-url https://download.pytorch.org/whl/cu117
+
+COPY requirements.txt /app
+RUN pip install -r requirements.txt
+
+RUN pip install gunicorn
+
+COPY . /app
+
+EXPOSE 23456
+
+CMD ["gunicorn", "-c", "gunicorn_config.py", "app:app"]

config.py

@@ -12,7 +12,7 @@ DEBUG = False
 PORT = 23456
 
 # Absolute path of vits-simple-api
-ABS_PATH = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])))
+ABS_PATH = os.path.dirname(os.path.realpath(__file__))
 
 # Upload path
 UPLOAD_FOLDER = ABS_PATH + "/upload"

gunicorn_config.py

@@ -1,4 +1,4 @@
 import multiprocessing
 
 bind = "0.0.0.0:23456"
-workers = multiprocessing.cpu_count() * 2 + 1
+workers = multiprocessing.cpu_count()

text/mandarin.py

@@ -1,5 +1,4 @@
-import os
-import sys
+import config
 import re
 from pypinyin import lazy_pinyin, BOPOMOFO
 import jieba
@@ -7,7 +6,7 @@ import cn2an
 import logging
 
 logging.getLogger('jieba').setLevel(logging.WARNING)
-jieba.set_dictionary(os.path.dirname(os.path.realpath(sys.argv[0])) + '/jieba/dict.txt')
+jieba.set_dictionary(config.ABS_PATH + '/jieba/dict.txt')
 jieba.initialize()
 
 # List of (Latin alphabet, bopomofo) pairs: