From d3278c9cebcf444eff55b447cf28bb69160ca02d Mon Sep 17 00:00:00 2001 From: Sukhmeet Khalar Date: Sun, 31 Dec 2023 13:25:33 -0500 Subject: [PATCH] Fix for linux installation - Updated numpy version to 1.24 or higher - Removed Dora references - Update README --- README.md | 6 +++++- demucs/pretrained.py | 4 +--- install_packages.sh | 5 ++++- requirements.txt | 3 +-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b958b95..1cc82d5 100644 --- a/README.md +++ b/README.md @@ -164,8 +164,12 @@ sudo apt update && sudo apt upgrade sudo apt-get update sudo apt install ffmpeg sudo apt install python3-pip +sudo apt install python3-venv sudo apt-get -y install python3-tk -pip3 install -r requirements.txt +cd /path/to/UVR +python3 -m venv ./venv +source ./venv/bin/activate +SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True pip3 install -r requirements.txt python3 UVR.py ``` diff --git a/demucs/pretrained.py b/demucs/pretrained.py index 25aa685..2777160 100644 --- a/demucs/pretrained.py +++ b/demucs/pretrained.py @@ -10,8 +10,6 @@ import logging from pathlib import Path import typing as tp -#from dora.log import fatal - import logging from diffq import DiffQuantizer @@ -177,4 +175,4 @@ def tasnet(pretrained=True, extra=False): if extra: name = 'tasnet_extra' _load_state(name, model) - return model \ No newline at end of file + return model diff --git a/install_packages.sh b/install_packages.sh index 6419399..4023409 100644 --- a/install_packages.sh +++ b/install_packages.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Workaround for SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL +export SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True + while read package; do pip install "$package" -done < requirements.txt +done < requirements.txt \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 49c235c..13cc988 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,5 +38,4 @@ onnxruntime-gpu onnx2pytorch SoundFile==0.11.0; sys_platform != 'darwin' PySoundFile==0.9.0.post1; sys_platform == 'darwin' -Dora==0.0.3 -numpy==1.23.5 +numpy >= 1.24