Skip to content

Commit 32ddf55

Browse files
mgoinbfineran
andauthored
Change to requiring the vanilla transformers package (#1302)
* Update datasets to match * Update setup * . * oops * Format * remove deepsparse release install in twitter nlp example test --------- Co-authored-by: Benjamin Fineran <[email protected]>
1 parent 4960048 commit 32ddf55

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

Diff for: setup.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,8 @@ def _parse_requirements_file(file_path):
145145
]
146146
_yolov8_integration_deps = _yolo_integration_deps + ["ultralytics==8.0.124"]
147147
_transformers_integration_deps = [
148-
f"{'nm-transformers' if is_release else 'nm-transformers-nightly'}"
149-
f"~={version_base}",
150-
"datasets<=2.11",
148+
"transformers<4.35",
149+
"datasets<2.13",
151150
"scikit-learn",
152151
"seqeval",
153152
]
@@ -166,7 +165,7 @@ def _parse_requirements_file(file_path):
166165
_clip_deps = [
167166
"open_clip_torch==2.20.0",
168167
"scipy<1.9.2,>=1.8",
169-
f"{'nm-transformers' if is_release else 'nm-transformers-nightly'}",
168+
"transformers<4.35",
170169
]
171170

172171
_torch_deps = ["torch>=1.7.0,<=2.0"]

Diff for: src/deepsparse/transformers/__init__.py

-17
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
# flake8: noqa
2121

22-
import logging as _logging
2322

2423
from deepsparse.analytics import deepsparse_analytics as _analytics
2524

@@ -35,22 +34,6 @@
3534
raise ImportError("Please install deepsparse[transformers] to use this pathway")
3635

3736

38-
_LOGGER = _logging.getLogger(__name__)
39-
40-
41-
def _check_transformers_install():
42-
import transformers as _transformers
43-
44-
if not getattr(_transformers, "NM_INTEGRATED", False):
45-
_LOGGER.warning(
46-
"The neuralmagic fork of transformers may not be installed. It can be "
47-
"installed via `pip install nm_transformers`"
48-
)
49-
50-
51-
_check_transformers_install()
52-
53-
5437
from .helpers import *
5538
from .loaders import *
5639
from .pipelines import *

Diff for: tests/examples/test_twitter_nlp.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ def install_reqs():
2626
"-m",
2727
"pip",
2828
"install",
29-
"-r",
30-
"examples/twitter-nlp/requirements.txt",
29+
"git+https://github.com/twintproject/"
30+
"twint@e7c8a0c764f6879188e5c21e25fb6f1f856a7221#egg=twint",
31+
"rich>=12.2.0",
3132
]
3233
)
3334

0 commit comments

Comments
 (0)