Skip to content

Commit

Permalink
upgrade whisper and add aarch64 requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
baxtree committed Jul 7, 2023
1 parent 5194dab commit c0ad422
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 13 deletions.
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ endif
ifdef PLATFORM
PLATFORM := $(PLATFORM)
else
PLATFORM := linux-x86_64-cp-37-cp37
PLATFORM := linux-x86_64-cp-38-cp38
endif

ifdef PYTHON_TAG
PYTHON_TAG := $(PYTHON_TAG)
else
PYTHON_TAG := py38
endif

SUBALIGNER_VERSION := $(SUBALIGNER_VERSION)
Expand Down Expand Up @@ -153,7 +159,7 @@ test-dist:

dist: clean-dist test-dist
cat requirements-dev.txt | xargs -L 1 .$(PYTHON)/bin/pip install; \
.$(PYTHON)/bin/python setup.py sdist bdist_wheel bdist_egg
.$(PYTHON)/bin/python setup.py sdist bdist_wheel --python-tag=$(PYTHON_TAG)

release:
.$(PYTHON)/bin/twine upload dist/*
Expand Down
6 changes: 1 addition & 5 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ dask = ">=2021.10.0,<2022.1.0"
decorator = "==4.3.0"
distributed = "==1.13.0"
filelock = "<4.0.0"
google-auth = "==1.27.0"
google-auth-oauthlib = "==0.4.2"
google-pasta = "~=0.2"
graphviz = "==0.8.3"
HeapDict = "==1.0.0"
Expand All @@ -61,7 +59,7 @@ mccabe = "==0.6.1"
numba = ">=0.50.0"
numpy = "<1.24.0"
oauthlib = "==3.1.0"
openai-whisper = "==20230124"
openai-whisper = "==20230314"
pbr = "==4.0.2"
pluggy = "==0.13.1"
psutil = "==5.6.7"
Expand All @@ -81,8 +79,6 @@ pystack-debugger = "==0.8.0"
python-dateutil = "==2.7.2"
pytz = "==2018.4"
PyYAML = ">=4.2b1"
requests = "~=2.25.1"
requests-oauthlib = "==1.3.0"
rsa = "==4.7"
scipy = "<=1.8.1"
scikit-learn = ">=0.19.1"
Expand Down
71 changes: 71 additions & 0 deletions requirements-aarch64.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
astor==0.7.1
beautifulsoup4<4.9.0
bleach==3.3.0
cachetools==3.1.1
captionstransformer~=1.2.1
cchardet==2.1.7
certifi==2019.11.28
chardet==3.0.4
click==5.1
cloudpickle~=1.6.0
cycler==0.10.0
Cython~=0.29.22
dask>=2021.10.0,<2022.1.0
decorator==4.3.0
distributed==1.13.0
filelock<4.0.0
google-auth-oauthlib==0.4.2
google-pasta~=0.2
graphviz==0.8.3
HeapDict==1.0.0
h5py<=4.0.0
html5lib==1.0b9
hyperopt==0.2.4
idna==2.8
isort==4.3.4
joblib>=1.2.0
keras~=2.12.0
kiwisolver==1.0.1
lazy-object-proxy==1.4.3
le-pycaption==2.2.0a1
librosa<0.10.0
locket==0.2.0
Markdown==2.6.11
mccabe==0.6.1
networkx>=2.5.1
numba>=0.50.0
numpy<1.24.0
oauthlib==3.1.0
pbr==4.0.2
pluggy==0.13.1
protobuf<4.0
psutil==5.6.7
py==1.10.0
pyasn1==0.4.8
pyasn1-modules==0.2.7
pycountry~=20.7.3
pydot==1.2.4
pydot-ng==1.0.0
pydotplus==2.0.2
pyprof2calltree==1.4.3
pysrt==1.1.1
pysubs2<=1.4.2
pystack-debugger==0.8.0
pytz==2018.4
PyYAML>=4.2b1
rsa==4.7
scipy<=1.8.1
scikit-learn<1.2.0
setuptools>=41.0.0
six~=1.15.0
tblib==1.3.2
tensorflow-macos~=2.12.0
tensorflow-metal~=0.8.0
termcolor==1.1.0
toml==0.10.0
toolz==0.9.0
tornado==5.1.0
urllib3~=1.26.5
Werkzeug>=0.15.3
zict==0.1.3
zipp==0.6.0
2 changes: 1 addition & 1 deletion requirements-llm.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sentencepiece~=0.1.95
torch<1.13.0
transformers<4.27.0
openai-whisper==20230124
openai-whisper==20230314
3 changes: 0 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ dask>=2021.10.0,<2022.1.0
decorator==4.3.0
distributed==1.13.0
filelock<4.0.0
google-auth-oauthlib==0.4.2
google-pasta~=0.2
graphviz==0.8.3
HeapDict==1.0.0
Expand Down Expand Up @@ -53,8 +52,6 @@ pysubs2<=1.4.2
pystack-debugger==0.8.0
pytz==2018.4
PyYAML>=4.2b1
requests<3.0.0
requests-oauthlib==1.3.0
rsa==4.7
scipy<=1.8.1
scikit-learn<1.2.0
Expand Down
12 changes: 11 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-

import os
import platform

from setuptools import setup

Expand All @@ -11,6 +12,13 @@
with open("README.md") as readme_file:
readme = readme_file.read()

if platform.machine() == "arm64":
with open("requirements-aarch64.txt") as requirements_file:
requirements = requirements_file.read().splitlines()[::-1]
else:
with open("requirements.txt") as requirements_file:
requirements = requirements_file.read().splitlines()[::-1]

with open("requirements.txt") as requirements_file:
requirements = requirements_file.read().splitlines()[::-1]

Expand Down Expand Up @@ -52,6 +60,7 @@
long_description=readme + "\n\n",
long_description_content_type='text/markdown',
python_requires=">=3.8",
wheel=True,
package_dir={"subaligner": "subaligner"},
packages=[
"subaligner",
Expand Down Expand Up @@ -92,4 +101,5 @@
"subaligner_convert=subaligner.subaligner_convert.__main__:main",
"subaligner_train=subaligner.subaligner_train.__main__:main",
"subaligner_tune=subaligner.subaligner_tune.__main__:main",
]})
]
})
2 changes: 1 addition & 1 deletion subaligner/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""The semver for the current release."""
__version__ = "0.3.3"
__version__ = "0.3.4"

0 comments on commit c0ad422

Please sign in to comment.