From 2f49f6164506fee3f62236b19de5320323d2d9d8 Mon Sep 17 00:00:00 2001
From: erew123 <35898566+erew123@users.noreply.github.com>
Date: Thu, 4 Apr 2024 10:16:30 +0100
Subject: [PATCH] Add files via upload

---
 Dockerfile              | 22 +++++++++----------
 docker-compose-cuda.yml | 40 +++++++++++++++++-----------------
 docker-compose.yml      | 26 +++++++++++-----------
 dockerconfig.json       | 48 ++++++++++++++++++++---------------------
 launch.sh               |  8 +++----
 nvidia.Dockerfile       | 36 +++++++++++++++----------------
 6 files changed, 89 insertions(+), 91 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a4da795..130c47d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-FROM ubuntu:22.04
-ENV HOST 0.0.0.0
-RUN apt-get update && apt-get upgrade -y \
-    && apt-get install -y git build-essential portaudio19-dev \
-    python3 python3-pip gcc wget \
-    && ln -s /usr/bin/python3 /usr/bin/python
-WORKDIR /app
-COPY . .
-RUN pip install --no-cache-dir -r requirements_other.txt
-EXPOSE 7851
-RUN chmod +x launch.sh
+FROM ubuntu:22.04
+ENV HOST 0.0.0.0
+RUN apt-get update && apt-get upgrade -y \
+    && apt-get install -y git build-essential portaudio19-dev \
+    python3 python3-pip gcc wget \
+    && ln -s /usr/bin/python3 /usr/bin/python
+WORKDIR /app
+COPY . .
+RUN pip install --no-cache-dir -r system/requirements/requirements_standalone.txt
+EXPOSE 7851
+RUN chmod +x launch.sh
 ENTRYPOINT ["sh", "-c", "./launch.sh"]
\ No newline at end of file
diff --git a/docker-compose-cuda.yml b/docker-compose-cuda.yml
index 7532ca8..75228d5 100644
--- a/docker-compose-cuda.yml
+++ b/docker-compose-cuda.yml
@@ -1,20 +1,20 @@
-version: '3.8'
-services:
-  alltalk-tts:
-    image: erew123/alltalk_tts:cuda
-    restart: unless-stopped
-    ports:
-      - "7851:7851"
-    volumes:
-      - ./outputs:/app/outputs/
-      - ./models:/app/models/
-      - ./voices:/app/voices/
-      - ./finetune/put-voice-samples-in-here:/app/finetune/put-voice-samples-in-here
-      - ./dockerconfig.json:/app/confignew.json
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities: [ gpu ]
+version: '3.8'
+services:
+  alltalk-tts:
+    image: erew123/alltalk_tts:cuda
+    restart: unless-stopped
+    ports:
+      - "7851:7851"
+    volumes:
+      - ./outputs:/app/outputs/
+      - ./models:/app/models/
+      - ./voices:/app/voices/
+      - ./finetune/put-voice-samples-in-here:/app/finetune/put-voice-samples-in-here
+      - ./dockerconfig.json:/app/confignew.json
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [ gpu ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 7310a37..4bb3247 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
-version: '3.8'
-services:
-  alltalk-tts:
-    image: erew123/alltalk_tts:cpu
-    restart: unless-stopped
-    ports:
-      - "7851:7851"
-    volumes:
-      - ./outputs:/app/outputs/
-      - ./models:/app/models/
-      - ./voices:/app/voices/
-      - ./finetune/put-voice-samples-in-here:/app/finetune/put-voice-samples-in-here
-      - ./dockerconfig.json:/app/confignew.json
+version: '3.8'
+services:
+  alltalk-tts:
+    image: erew123/alltalk_tts:cpu
+    restart: unless-stopped
+    ports:
+      - "7851:7851"
+    volumes:
+      - ./outputs:/app/outputs/
+      - ./models:/app/models/
+      - ./voices:/app/voices/
+      - ./finetune/put-voice-samples-in-here:/app/finetune/put-voice-samples-in-here
+      - ./dockerconfig.json:/app/confignew.json
diff --git a/dockerconfig.json b/dockerconfig.json
index 039a973..d1d179d 100644
--- a/dockerconfig.json
+++ b/dockerconfig.json
@@ -1,25 +1,25 @@
-{
-    "activate": true,
-    "autoplay": true,
-    "branding": "AllTalk ",
-    "narrator_enabled": false,
-    "deepspeed_activate": true,
-    "delete_output_wavs": "Disabled",
-    "ip_address": "127.0.0.1",
-    "language": "English",
-    "low_vram": false,
-    "local_temperature": "0.7",
-    "local_repetition_penalty": "10.0",
-    "tts_model_loaded": true,
-    "tts_model_name": "tts_models/multilingual/multi-dataset/xtts_v2",
-    "narrator_voice": "female_01.wav",
-    "output_folder_wav": "extensions/alltalk_tts/outputs/",
-    "output_folder_wav_standalone": "outputs/",
-    "port_number": "7851",
-    "remove_trailing_dots": false,
-    "show_text": true,
-    "tts_method_api_local": false,
-    "tts_method_api_tts": false,
-    "tts_method_xtts_local": true,
-    "voice": "female_01.wav"
+{
+    "activate": true,
+    "autoplay": true,
+    "branding": "AllTalk ",
+    "narrator_enabled": false,
+    "deepspeed_activate": true,
+    "delete_output_wavs": "Disabled",
+    "ip_address": "127.0.0.1",
+    "language": "English",
+    "low_vram": false,
+    "local_temperature": "0.7",
+    "local_repetition_penalty": "10.0",
+    "tts_model_loaded": true,
+    "tts_model_name": "tts_models/multilingual/multi-dataset/xtts_v2",
+    "narrator_voice": "female_01.wav",
+    "output_folder_wav": "extensions/alltalk_tts/outputs/",
+    "output_folder_wav_standalone": "outputs/",
+    "port_number": "7851",
+    "remove_trailing_dots": false,
+    "show_text": true,
+    "tts_method_api_local": false,
+    "tts_method_api_tts": false,
+    "tts_method_xtts_local": true,
+    "voice": "female_01.wav"
 }
\ No newline at end of file
diff --git a/launch.sh b/launch.sh
index 97708c3..6ee5172 100644
--- a/launch.sh
+++ b/launch.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-python modeldownload.py
-uvicorn tts_server:app --host 0.0.0.0 --port 7851 --workers 1 --proxy-headers &
-sleep 5
+#!/bin/sh
+python modeldownload.py
+uvicorn tts_server:app --host 0.0.0.0 --port 7851 --workers 1 --proxy-headers &
+sleep 5
 python script.py
\ No newline at end of file
diff --git a/nvidia.Dockerfile b/nvidia.Dockerfile
index 475674a..80230ef 100644
--- a/nvidia.Dockerfile
+++ b/nvidia.Dockerfile
@@ -1,20 +1,18 @@
-FROM nvidia/cuda:12.1.1-devel-ubuntu22.04
-ENV HOST 0.0.0.0
-RUN apt-get update && apt-get upgrade -y \
-    && apt-get install -y git build-essential portaudio19-dev \
-    python3 python3-pip gcc wget \
-    ocl-icd-opencl-dev opencl-headers clinfo \
-    libclblast-dev libopenblas-dev \
-    && mkdir -p /etc/OpenCL/vendors && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd \
-    && ln -s /usr/bin/python3 /usr/bin/python
-WORKDIR /app
-COPY . .
-ENV CUDA_DOCKER_ARCH=all
-
-RUN pip install --no-cache-dir -r requirements_nvidia.txt && \
-    pip install --no-cache-dir -r requirements_finetune.txt && \
-    pip install --no-cache-dir -r requirements_other.txt && \
-    pip install --no-cache-dir deepspeed
-EXPOSE 7851
-RUN chmod +x launch.sh
+FROM nvidia/cuda:12.1.1-devel-ubuntu22.04
+ENV HOST 0.0.0.0
+RUN apt-get update && apt-get upgrade -y \
+    && apt-get install -y git build-essential portaudio19-dev \
+    python3 python3-pip gcc wget \
+    ocl-icd-opencl-dev opencl-headers clinfo \
+    libclblast-dev libopenblas-dev \
+    && mkdir -p /etc/OpenCL/vendors && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd \
+    && ln -s /usr/bin/python3 /usr/bin/python
+WORKDIR /app
+COPY . .
+ENV CUDA_DOCKER_ARCH=all
+
+RUN pip install --no-cache-dir -r system/requirements/requirements_standalone.txt && \
+    pip install --no-cache-dir deepspeed
+EXPOSE 7851
+RUN chmod +x launch.sh
 ENTRYPOINT ["sh", "-c", "./launch.sh"]
\ No newline at end of file