ci: add torchaudio dep

LutingWang · Dec 15, 2024 · 19fd833 · 19fd833
1 parent 6e56158
commit 19fd833
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -11,6 +11,7 @@ jobs:
           - python: "3.11"
             torch: "2.2.2"
             torchvision: "0.17.2"
+            torchaudio: "2.2.2"
     steps:
       - uses: LutingWang/todd/.github/actions/checkout-todd@main
       - uses: actions/setup-python@master
@@ -19,7 +20,7 @@ jobs:
       - name: Lint
         run: |
           pip install -U setuptools wheel
-          pip install torch==${{ matrix.torch }} torchvision==${{ matrix.torchvision }}
+          pip install torch==${{ matrix.torch }} torchvision==${{ matrix.torchvision }} torchaudio==${{ matrix.torchaudio }}
           pip install git+https://github.com/lvis-dataset/lvis-api.git@lvis_challenge_2021 --no-build-isolation
           pip install .[optional,lint,doc,test]
           mim install mmcv

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,6 +14,7 @@ jobs:
           - python: "3.11"
             torch: "2.2.2"
             torchvision: "0.17.2"
+            torchaudio: "2.2.2"
     steps:
       - uses: LutingWang/todd/.github/actions/checkout-todd@main
         with:
@@ -24,7 +25,7 @@ jobs:
       - name: Test
         run: |
           pip install -U setuptools wheel
-          pip install torch==${{ matrix.torch }} torchvision==${{ matrix.torchvision }}
+          pip install torch==${{ matrix.torch }} torchvision==${{ matrix.torchvision }} torchaudio==${{ matrix.torchaudio }}
           pip install git+https://github.com/lvis-dataset/lvis-api.git@lvis_challenge_2021 --no-build-isolation
           pip install .[optional,test]
           mim install mmcv

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -64,7 +64,7 @@ repos:
       - id: mypy
         exclude: docs
         additional_dependencies:
-          - numpy
+          - numpy<2.0
           - pandas-stubs
           - types-Pillow
           - types-requests

diff --git a/todd/tasks/natural_language_processing/bpe.py b/todd/tasks/natural_language_processing/bpe.py
@@ -15,9 +15,7 @@
 from todd.loggers import logger
 from todd.utils import ArgsKwargs, SerializeMixin
 
-Token = int
-TokenPair = tuple[Token, Token]
-TokenSequence = list[Token]
+from .tokenizers import Token, TokenPair, TokenSequence
 
 T = TypeVar('T', bound=nn.Module)
 

diff --git a/todd/tasks/natural_language_processing/tokenizers/base.py b/todd/tasks/natural_language_processing/tokenizers/base.py
@@ -1,4 +1,7 @@
 __all__ = [
+    'Token',
+    'TokenPair',
+    'TokenSequence',
     'BaseTokenizer',
 ]
 
@@ -9,7 +12,9 @@
 
 from todd.patches.py_ import classproperty
 
-from ..bpe import TokenSequence
+Token = int
+TokenPair = tuple[Token, Token]
+TokenSequence = list[Token]
 
 
 class BaseTokenizer:

diff --git a/todd/tasks/natural_language_processing/tokenizers/clip.py b/todd/tasks/natural_language_processing/tokenizers/clip.py
@@ -11,8 +11,8 @@
 import ftfy
 import regex as re
 
-from ..bpe import BPE, TokenSequence
-from .base import BaseTokenizer
+from ..bpe import BPE
+from .base import BaseTokenizer, TokenSequence
 
 UTF_8 = 'utf-8'