we should probably just remove crepe

Author: noahgsolomon

rvc/Dockerfile

@@ -1,39 +1,34 @@
 # syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
+
 EXPOSE 7865
 WORKDIR /app
 COPY . .
+
 # Install dependencies to add PPAs
 RUN apt-get update && \
     apt-get install -y -qq ffmpeg aria2 && apt clean && \
     apt-get install -y software-properties-common && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
+
 # Add the deadsnakes PPA to get Python 3.10
 RUN add-apt-repository -y ppa:deadsnakes/ppa
+
 # Install Python 3.10 and pip
 RUN apt-get update && \
     apt-get install -y build-essential python-dev python3-dev python3.10-distutils python3.10-dev python3.10 python3.10-venv curl && \
     apt-get clean && \
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1 && \
     curl https://bootstrap.pypa.io/get-pip.py | python3.10
+
 # Set Python 3.10 as the default
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.10 1
+
 RUN python3 -m pip install --upgrade pip==24.0
-# Install main requirements
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
-# Create a virtual environment for audio-separator with different librosa version
-RUN python3 -m venv /app/venv_separator
-# Install audio-separator in the virtual environment
-RUN /app/venv_separator/bin/pip install --upgrade pip && \
-    /app/venv_separator/bin/pip install onnxruntime-gpu audio-separator==0.30.0
-
-# Create a simple wrapper script for audio-separator
-RUN echo '#!/bin/bash\n/app/venv_separator/bin/audio-separator "$@"' > /usr/local/bin/audio-separator && \
-    chmod +x /usr/local/bin/audio-separator
-
-
 RUN chmod +x /app/scripts/start.sh
 VOLUME [ "/app/opt" ]
 CMD ["/app/scripts/start.sh"]

rvc/requirements.txt

@@ -3,7 +3,7 @@ joblib>=1.1.0
 numba==0.56.4
 numpy==1.23.5
 scipy
-librosa==0.9.1
+librosa>=0.10.0,<0.11.0
 llvmlite==0.39.0
 fairseq==0.12.2
 faiss-cpu==1.7.3
@@ -41,7 +41,6 @@ pyworld==0.3.2
 httpx
 onnxruntime; sys_platform == 'darwin'
 onnxruntime-gpu; sys_platform != 'darwin'
-torchcrepe==0.0.20
 fastapi==0.88
 torchfcpe
 ffmpy==0.3.1
@@ -50,3 +49,4 @@ av
 flask==3.0.2
 requests==2.31.0
 gunicorn>=20.1.0
+audio-separator==0.30.0