mirror of
https://github.com/DrewThomasson/ebook2audiobook.git
synced 2026-01-08 21:38:12 -05:00
...
This commit is contained in:
@@ -432,7 +432,7 @@ exit /b 0
|
||||
echo [ebook2audiobook] Installing dependencies...
|
||||
python -m pip cache purge >nul 2>&1
|
||||
python -m pip install --upgrade pip >nul 2>&1
|
||||
python -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on --disable-pip-version-check -r "%SCRIPT_DIR%\requirements.txt"
|
||||
python -m pip install --upgrade --no-cache-dir -r "%SCRIPT_DIR%\requirements.txt"
|
||||
if errorlevel 1 goto :failed
|
||||
for /f "tokens=2 delims=: " %%A in ('pip show torch 2^>nul ^| findstr /b /c:"Version"') do (
|
||||
set "torch_ver=%%A"
|
||||
|
||||
@@ -626,7 +626,7 @@ function install_python_packages {
|
||||
echo "[ebook2audiobook] Installing dependencies..."
|
||||
python3 -m pip cache purge > /dev/null 2>&1
|
||||
python3 -m pip install --upgrade pip > /dev/null 2>&1
|
||||
python3 -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on --disable-pip-version-check -r "$SCRIPT_DIR/requirements.txt" || exit 1
|
||||
python3 -m pip install --upgrade --no-cache-dir -r "$SCRIPT_DIR/requirements.txt" || exit 1
|
||||
python3 -m unidic download || exit 1
|
||||
echo "[ebook2audiobook] Installation completed."
|
||||
return 0
|
||||
|
||||
@@ -677,7 +677,7 @@ class DeviceInstaller():
|
||||
with tqdm(total = len(packages), desc = 'Installation 0.00%', bar_format = '{desc}: {n_fmt}/{total_fmt} ', unit = 'step') as t:
|
||||
for package in tqdm(missing_packages, desc = 'Installing', unit = 'pkg'):
|
||||
try:
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', package])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', package])
|
||||
t.update(1)
|
||||
except subprocess.CalledProcessError as e:
|
||||
error = f'Failed to install {package}: {e}'
|
||||
@@ -733,22 +733,23 @@ class DeviceInstaller():
|
||||
tag_py = f'cp{py_major}{py_minor}-cp{py_major}{py_minor}'
|
||||
torch_pkg = f"{url}/v{toolkit_version}/torch-{jetson_torch_version_base[tag]}%2B{tag}-{tag_py}-{os_env}_{arch}.whl"
|
||||
torchaudio_pkg = f"{url}/v{toolkit_version}/torchaudio-{jetson_torch_version_base[tag]}%2B{tag}-{tag_py}-{os_env}_{arch}.whl"
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', torch_pkg, torchaudio_pkg])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', torch_pkg])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', torchaudio_pkg])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'uninstall', '-y', 'scikit-learn'])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', 'scikit-learn'])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', 'scikit-learn'])
|
||||
elif device_info['name'] == devices['MPS']['proc']:
|
||||
torch_tag_py = f'cp{default_py_major}{default_py_minor}-none'
|
||||
torchaudio_tag_py = f'cp{default_py_major}{default_py_minor}-cp{default_py_major}{default_py_minor}'
|
||||
torch_pkg = f'{url}/cpu/torch-{torch_version_base}-{torch_tag_py}-{os_env}_{arch}.whl'
|
||||
torchaudio_pkg = f'{url}/cpu/torchaudio-{torch_version_base}-{torchaudio_tag_py}-{os_env}_{arch}.whl'
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', torch_pkg, torchaudio_pkg])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', torch_pkg, torchaudio_pkg])
|
||||
else:
|
||||
tag_py = f'cp{default_py_major}{default_py_minor}-cp{default_py_major}{default_py_minor}'
|
||||
torch_pkg = f'{url}/{tag}/torch-{torch_version_base}%2B{tag}-{tag_py}-{os_env}_{arch}.whl'
|
||||
torchaudio_pkg = f'{url}/{tag}/torchaudio-{torch_version_base}%2B{tag}-{tag_py}-{os_env}_{arch}.whl'
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', torch_pkg, torchaudio_pkg])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', torch_pkg, torchaudio_pkg])
|
||||
if device_info['name'] == 'cuda':
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', 'deepspeed'])
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', 'deepspeed'])
|
||||
#msg = 'Relaunching app...'
|
||||
#print(msg)
|
||||
#os.execv(sys.executable, [sys.executable] + sys.argv)
|
||||
|
||||
Reference in New Issue
Block a user