Skip to content

Revert changes for cpu #1676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Devjiu wants to merge 1 commit into from
Closed

Revert changes for cpu #1676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bitsandbytes/nn/modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,9 @@ def to(self, *args, **kwargs):
if device is not None and device.type != "meta" and self.data.device.type == "cpu":
if device.type != "cpu" or self.data.dtype != torch.int8:
return self._quantize(device)
elif self.data.dtype == torch.int8 and device.type in ("cpu", "xpu") and (ipex_cpu or ipex_xpu):
self.CB = self.data
elif self.data.dtype == torch.int8:
if device.type == "cpu" or (device.type == "xpu" and ipex_xpu):
self.CB = self.data

new_param = Int8Params(
super().to(device=device, dtype=dtype, non_blocking=non_blocking),
Expand Down
9 changes: 5 additions & 4 deletions tests/test_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ def test_dynamic_blockwise_quantization(self, device, dtype, nested, blocksize,
abserr = sum(diffs) / len(diffs)
relerr = sum(reldiffs) / len(reldiffs)
if signed:
threshold_abserr = 0.0036 if device in ("cpu", "xpu") and (F.ipex_cpu or F.ipex_xpu) else 0.0035
assert abserr < 0.0036
assert relerr < 0.015
else:
assert abserr < 0.00175 if device in ("cpu", "xpu") and (F.ipex_cpu or F.ipex_xpu) else 0.0023
assert abserr < 0.00175 if (device in "cpu") or (device in "xpu" and F.ipex_xpu) else 0.0023
assert relerr < 0.012
assert A2.dtype == dtype

Expand Down Expand Up @@ -172,8 +171,10 @@ def test_blockwise_cpu_large(self, hidden, blocksize):
@pytest.mark.parametrize("bits", range(2, 9), ids=id_formatter("bits"))
@pytest.mark.parametrize("method", ["linear", "fp8", "dynamic"])
def test_few_bit_quant(self, device, bits, method):
if bits != 8 and (device == "cpu" or (device == "xpu" and F.ipex_xpu)):
pytest.skip("CPU/XPU implementation only supports 8 bits")
if device in "cpu" and bits != 8:
pytest.skip("CPU implementation only supports 8 bits")
if device in "xpu" and bits != 8 and F.ipex_xpu:
pytest.skip("XPU ipex implementation only supports 8 bits")

abserrs = []
relerrs = []
Expand Down