Skip to content

Commit 11140b2

Browse files
committed
Merge branch 'transformers_future' into transformers_4_49
2 parents 74ee9e6 + 4527647 commit 11140b2

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

conftest.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,11 @@ def pytest_sessionstart(session):
114114
device = "gaudi2" if os.environ["GAUDI2_CI"] == "1" else "gaudi1"
115115
# Try to automatically detect it
116116
else:
117-
import habana_frameworks.torch.hpu as torch_hpu
117+
from optimum.habana.utils import get_device_name
118118

119-
name = torch_hpu.get_device_name().strip()
120-
if not name:
121-
raise RuntimeError("Expected a Gaudi device but did not detect one.")
122-
device = name.split()[-1].lower()
119+
device = get_device_name()
123120

124-
# torch_hpu.get_device_name() returns GAUDI for G1
121+
# optimum.habana.utils.get_device_name() returns `gaudi` for G1
125122
if "gaudi" == device:
126123
# use "gaudi1" since this is used in tests, baselines, etc.
127124
device = "gaudi1"
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
datasets
1+
datasets <= 2.19.2
22
peft
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
datasets
1+
datasets <= 2.19.2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
datasets
1+
datasets <= 2.19.2
22
peft

0 commit comments

Comments
 (0)