fix conflict

Author: aluminumbox

README.md

@@ -63,7 +63,7 @@ git submodule update --init --recursive
 - Create Conda env:
 
 ``` sh
-conda create -n cosyvoice python=3.10
+conda create -n cosyvoice -y python=3.10
 conda activate cosyvoice
 # pynini is required by WeTextProcessing, use conda to install it as it can be executed on all platform.
 conda install -y -c conda-forge pynini==2.1.5

cosyvoice/utils/file_utils.py

@@ -40,7 +40,7 @@ def read_json_lists(list_file):
 
 
 def load_wav(wav, target_sr):
-    speech, sample_rate = torchaudio.load(wav)
+    speech, sample_rate = torchaudio.load(wav, backend='soundfile')
     speech = speech.mean(dim=0, keepdim=True)
     if sample_rate != target_sr:
         assert sample_rate > target_sr, 'wav sample rate {} must be greater than {}'.format(sample_rate, target_sr)

requirements.txt

@@ -34,6 +34,6 @@ torchaudio==2.3.1
 transformers==4.40.1
 uvicorn==0.30.0
 wget==3.2
-fastapi==0.111.0
+fastapi==0.115.6
 fastapi-cli==0.0.4
 WeTextProcessing==1.0.3