This commit is contained in:
unknown
2025-12-15 09:22:59 -08:00
parent 86fd68c610
commit 9693443a18
7 changed files with 16 additions and 11 deletions

View File

@@ -30,7 +30,7 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends --allow-change-held-packages \
gcc g++ make python3-dev pkg-config curl git wget bash xz-utils \
libegl1 libopengl0 libgl1 libxcb1 libx11-6 libxcb-cursor0 libxcb-render0 libxcb-shm0 libxcb-xfixes0 \
cmake fontconfig libfreetype6 libgomp1 libfontconfig1 libsndfile1 || true
cmake fontconfig libfreetype6 libgomp1 libfontconfig1 libsndfile1
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable && \
export PATH="/root/.cargo/bin:${PATH}" && \
@@ -39,10 +39,9 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable && \
RUN apt-get update && \
apt-get install -y --no-install-recommends --allow-change-held-packages \
${DOCKER_PROGRAMS_STR} \
tesseract-ocr-${ISO3_LANG} || true
tesseract-ocr-${ISO3_LANG}
RUN pip install --upgrade pip setuptools wheel && \
./ebook2audiobook.sh --script_mode build_docker --docker_device "${DOCKER_DEVICE_STR}"
RUN /ebook2audiobook.sh --script_mode build_docker --docker_device "${DOCKER_DEVICE_STR}"
RUN case "${DEVICE_TAG}" in \
jetson51) \

View File

@@ -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 --progress-bar on --disable-pip-version-check --use-pep517 -r "%SCRIPT_DIR%\requirements.txt"
python -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on --disable-pip-version-check -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"

View File

@@ -1,3 +1,5 @@
setuptools
wheel
packaging
tqdm
torchvggish

View File

@@ -620,7 +620,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 --progress-bar on --disable-pip-version-check -r "$SCRIPT_DIR/requirements.txt" || exit 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 unidic download || exit 1
echo "[ebook2audiobook] Installation completed."
return 0

View File

@@ -733,22 +733,22 @@ 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', torch_pkg, torchaudio_pkg])
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', 'uninstall', '-y', 'scikit-learn'])
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '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'])
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', torch_pkg, torchaudio_pkg])
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])
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', torch_pkg, torchaudio_pkg])
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])
if device_info['name'] == 'cuda':
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', 'deepspeed'])
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', 'deepspeed'])
#msg = 'Relaunching app...'
#print(msg)
#os.execv(sys.executable, [sys.executable] + sys.argv)

View File

@@ -17,6 +17,8 @@ authors = [
{ name = "Drew Thomasson" }
]
dependencies = [
"setuptools",
"wheel",
"packaging",
"tqdm",
"torchvggish",

View File

@@ -1,3 +1,5 @@
setuptools
wheel
packaging
tqdm
torchvggish