From 9df05033dadffbd1642e7362751f604f53be3cd4 Mon Sep 17 00:00:00 2001 From: "Schmieder, Jacob" Date: Fri, 27 Sep 2024 13:22:12 +0000 Subject: [PATCH 1/3] align minimal torch version --- environment.yml | 256 ----------------------------------------------- pyproject.toml | 2 +- requirements.txt | 2 +- 3 files changed, 2 insertions(+), 258 deletions(-) delete mode 100644 environment.yml diff --git a/environment.yml b/environment.yml deleted file mode 100644 index 7913480..0000000 --- a/environment.yml +++ /dev/null @@ -1,256 +0,0 @@ -channels: - - pytorch - - defaults -dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=5.1=1_gnu - - blas=1.0=mkl - - brotlipy=0.7.0=py39h27cfd23_1003 - - bzip2=1.0.8=h7b6447c_0 - - ca-certificates=2023.05.30=h06a4308_0 - - certifi=2023.5.7=py39h06a4308_0 - - cffi=1.15.1=py39h5eee18b_3 - - cryptography=39.0.1=py39h9ce1e76_2 - - cudatoolkit=11.3.1=h2bc3f7f_2 - - ffmpeg=4.2.2=h20bf706_0 - - flit-core=3.8.0=py39h06a4308_0 - - freetype=2.12.1=h4a9f257_0 - - giflib=5.2.1=h5eee18b_3 - - gmp=6.2.1=h295c915_3 - - gnutls=3.6.15=he1e5248_0 - - idna=3.4=py39h06a4308_0 - - intel-openmp=2021.4.0=h06a4308_3561 - - jpeg=9e=h5eee18b_1 - - lame=3.100=h7b6447c_0 - - lcms2=2.12=h3be6417_0 - - ld_impl_linux-64=2.38=h1181459_1 - - lerc=3.0=h295c915_0 - - libdeflate=1.17=h5eee18b_0 - - libffi=3.4.2=h6a678d5_6 - - libgcc-ng=11.2.0=h1234567_1 - - libgomp=11.2.0=h1234567_1 - - libidn2=2.3.2=h7f8727e_0 - - libopus=1.3.1=h7b6447c_0 - - libpng=1.6.39=h5eee18b_0 - - libstdcxx-ng=11.2.0=h1234567_1 - - libtasn1=4.16.0=h27cfd23_0 - - libtiff=4.5.0=h6a678d5_2 - - libunistring=0.9.10=h27cfd23_0 - - libuv=1.44.2=h5eee18b_0 - - libvpx=1.7.0=h439df22_0 - - libwebp=1.2.4=h11a3e52_1 - - libwebp-base=1.2.4=h5eee18b_1 - - lz4-c=1.9.4=h6a678d5_0 - - mkl=2021.4.0=h06a4308_640 - - mkl-service=2.4.0=py39h7f8727e_0 - - mkl_fft=1.3.1=py39hd3c417c_0 - - mkl_random=1.2.2=py39h51133e4_0 - - ncurses=6.4=h6a678d5_0 - - nettle=3.7.3=hbbd107a_1 - - numpy=1.23.5=py39h14f4228_0 - - numpy-base=1.23.5=py39h31eccc5_0 - - openh264=2.1.1=h4ff587b_0 - - openssl=3.0.9=h7f8727e_0 - - pillow=9.4.0=py39h6a678d5_0 - - pip=23.0.1=py39h06a4308_0 - - pycparser=2.21=pyhd3eb1b0_0 - - pyopenssl=23.0.0=py39h06a4308_0 - - pysocks=1.7.1=py39h06a4308_0 - - python=3.9.16=h955ad1f_3 - - pytorch=1.11.0=py3.9_cuda11.3_cudnn8.2.0_0 - - pytorch-mutex=1.0=cuda - - readline=8.2=h5eee18b_0 - - requests=2.28.1=py39h06a4308_1 - - setuptools=65.6.3=py39h06a4308_0 - - six=1.16.0=pyhd3eb1b0_1 - - sqlite=3.41.2=h5eee18b_0 - - tk=8.6.12=h1ccaba5_0 - - torchaudio=0.11.0=py39_cu113 - - torchvision=0.12.0=py39_cu113 - - tzdata=2023c=h04d1e81_0 - - wheel=0.38.4=py39h06a4308_0 - - x264=1!157.20191217=h7b6447c_0 - - xz=5.4.2=h5eee18b_0 - - zlib=1.2.13=h5eee18b_0 - - zstd=1.5.4=hc292b87_0 - - pip: - - absl-py==1.3.0 - - aiofiles==23.1.0 - - aiohttp==3.8.3 - - aiosignal==1.3.1 - - alembic==1.9.1 - - altair==5.0.1 - - annotated-types==0.5.0 - - ansi2html==1.8.0 - - antlr4-python3-runtime==4.9.3 - - anyio==3.7.1 - - appdirs==1.4.4 - - asteroid-filterbanks==0.4.0 - - async-timeout==4.0.2 - - attrs==22.2.0 - - audioread==3.0.0 - - autopage==0.5.1 - - backports-cached-property==1.0.2 - - cachetools==5.2.0 - - charset-normalizer==2.1.1 - - click==8.1.3 - - cliff==4.1.0 - - cmaes==0.9.0 - - cmake==3.26.4 - - cmd2==2.4.2 - - colorama==0.4.6 - - colorlog==6.7.0 - - commonmark==0.9.1 - - contourpy==1.0.6 - - cycler==0.11.0 - - dash==2.12.1 - - dash-core-components==2.0.0 - - dash-html-components==2.0.0 - - dash-table==5.0.0 - - decorator==4.4.2 - - docopt==0.6.2 - - einops==0.3.2 - - exceptiongroup==1.1.1 - - fastapi==0.100.0 - - ffmpeg-python==0.2.0 - - ffmpy==0.3.0 - - filelock==3.8.0 - - flask==2.2.5 - - fonttools==4.38.0 - - frozenlist==1.3.3 - - fsspec==2022.11.0 - - future==0.18.2 - - google-auth==2.15.0 - - google-auth-oauthlib==0.4.6 - - gradio==3.36.1 - - gradio-client==0.2.7 - - greenlet==2.0.1 - - grpcio==1.51.1 - - h11==0.14.0 - - hmmlearn==0.2.8 - - httpcore==0.17.3 - - httpx==0.24.1 - - huggingface-hub==0.16.4 - - humanize==4.7.0 - - hyperpyyaml==1.1.0 - - imageio==2.23.0 - - imageio-ffmpeg==0.4.7 - - importlib-metadata==4.13.0 - - importlib-resources==5.12.0 - - iniconfig==2.0.0 - - itsdangerous==2.1.2 - - jinja2==3.1.2 - - joblib==1.2.0 - - jsonschema==4.18.0 - - jsonschema-specifications==2023.6.1 - - julius==0.2.7 - - kiwisolver==1.4.4 - - librosa==0.9.2 - - linkify-it-py==2.0.2 - - lit==16.0.5.post0 - - llvmlite==0.39.1 - - mako==1.2.4 - - markdown==3.4.1 - - markdown-it-py==2.2.0 - - markupsafe==2.1.1 - - matplotlib==3.7.1 - - mdit-py-plugins==0.3.3 - - mdurl==0.1.2 - - more-itertools==9.0.0 - - moviepy==1.0.3 - - mpmath==1.2.1 - - multidict==6.0.4 - - nest-asyncio==1.5.7 - - networkx==2.8.8 - - numba==0.56.4 - - oauthlib==3.2.2 - - omegaconf==2.3.0 - - openai-whisper==20230314 - - optuna==3.0.5 - - orjson==3.9.2 - - packaging==21.3 - - pandas==1.5.2 - - pbr==5.11.0 - - plotly==5.15.0 - - pluggy==1.0.0 - - pooch==1.6.0 - - prettytable==3.5.0 - - primepy==1.3 - - proglog==0.1.10 - - protobuf==3.20.1 - - pyannote-audio==2.1.1 - - pyannote-core==4.5 - - pyannote-database==4.1.3 - - pyannote-metrics==3.2.1 - - pyannote-pipeline==2.3 - - pyasn1==0.4.8 - - pyasn1-modules==0.2.8 - - pydantic==2.0.2 - - pydantic-core==2.1.2 - - pydeprecate==0.3.2 - - pydub==0.25.1 - - pygments==2.13.0 - - pyparsing==3.0.9 - - pyperclip==1.8.2 - - pytest==7.3.1 - - python-dateutil==2.8.2 - - python-multipart==0.0.6 - - pytorch-lightning==1.6.5 - - pytorch-metric-learning==1.6.3 - - pytz==2022.7 - - pyyaml==6.0 - - qtfaststart==1.8 - - referencing==0.29.1 - - regex==2022.10.31 - - requests-oauthlib==1.3.1 - - resampy==0.4.2 - - retrying==1.3.4 - - rich==12.6.0 - - rpds-py==0.8.10 - - rsa==4.9 - - ruamel-yaml==0.17.21 - - ruamel-yaml-clib==0.2.7 - - ruff==0.0.272 - - scikit-learn==1.2.0 - - scipy==1.8.1 - - semantic-version==2.10.0 - - semver==2.13.0 - - sentencepiece==0.1.97 - - setuptools-rust==1.5.2 - - shellingham==1.5.0 - - simplejson==3.18.0 - - singledispatchmethod==1.0 - - sniffio==1.3.0 - - sortedcontainers==2.4.0 - - soundfile==0.10.3.post1 - - speechbrain==0.5.14 - - sqlalchemy==1.4.45 - - starlette==0.27.0 - - stevedore==4.1.1 - - sympy==1.11.1 - - tabulate==0.9.0 - - tenacity==8.2.2 - - tensorboard==2.11.0 - - tensorboard-data-server==0.6.1 - - tensorboard-plugin-wit==1.8.1 - - threadpoolctl==3.1.0 - - tiktoken==0.3.1 - - tokenizers==0.13.2 - - tomli==2.0.1 - - toolz==0.12.0 - - torch-audiomentations==0.11.0 - - torch-pitch-shift==1.2.2 - - torchmetrics==0.11.0 - - tqdm==4.64.1 - - transformers==4.24.0 - - triton==2.0.0 - - typer==0.7.0 - - typing-extensions==4.7.1 - - uc-micro-py==1.0.2 - - urllib3==1.26.12 - - uvicorn==0.22.0 - - wcwidth==0.2.5 - - websockets==11.0.3 - - werkzeug==2.2.2 - - yarl==1.8.2 - - zipp==3.11.0 diff --git a/pyproject.toml b/pyproject.toml index e82881d..5d7b584 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ numpy = "^1.26.4" openai-whisper = "^20231117" faster-whisper = "^1.0.3" "pyannote.audio" = "^3.3.1" -torch = "^2.3.0" +torch = "^2.1.2" [tool.poetry.group.dev.dependencies] pytest = "^8.1.1" diff --git a/requirements.txt b/requirements.txt index 6e95c81..8786d84 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ pyannote.database~=5.0.1 pyannote.metrics~=3.2.1 pyannote.pipeline~=3.0.1 -torch>=2.0.0 +torchaudio>=2.1.2 From b07f593fab7ee7ef54d349640563b3005d051133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:58:32 +0000 Subject: [PATCH 2/3] Bump openai-whisper from 20231117 to 20240930 Bumps [openai-whisper](https://github.com/openai/whisper) from 20231117 to 20240930. - [Release notes](https://github.com/openai/whisper/releases) - [Changelog](https://github.com/openai/whisper/blob/main/CHANGELOG.md) - [Commits](https://github.com/openai/whisper/compare/v20231117...v20240930) --- updated-dependencies: - dependency-name: openai-whisper dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8c46bdb..6aabcd1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ exclude =[ python = "^3.9" tqdm = "^4.66.4" numpy = "^1.26.4" -openai-whisper = "^20231117" +openai-whisper = ">=20231117,<20240931" whisperx = "^3.1.3" "pyannote.audio" = "^3.1.1" torch = "^2.3.0" From fa1dad69d1427e5d4389bfab2a9aac6ee073a909 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:00:49 +0000 Subject: [PATCH 3/3] Update sphinx-rtd-theme requirement from ^2.0.0 to >=2,<4 Updates the requirements on [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) to permit the latest version. - [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst) - [Commits](https://github.com/readthedocs/sphinx_rtd_theme/compare/2.0.0...3.0.0) --- updated-dependencies: - dependency-name: sphinx-rtd-theme dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8c46bdb..6a667d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ format-jinja = """ [tool.poetry.group.docs.dependencies] sphinx = "^7.3.7" -sphinx-rtd-theme = "^2.0.0" +sphinx-rtd-theme = ">=2,<4" markdown-it-py = {version = "~3.0.0", extras = ["plugins"]} myst-parser = "^3.0.1" mdit-py-plugins = "^0.4.1"