Skip to content

Commit d5df4c6

Browse files
Merge branch 'main' into customop-refactoring
2 parents 04e1bc6 + 86b6c37 commit d5df4c6

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

.github/workflows/python-package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
os: [ubuntu-latest, windows-latest]
6565
arch: [x86_64, aarch64]
6666
cuda_version:
67-
["11.7.1", "11.8.0", "12.0.1", "12.1.1", "12.2.2", "12.3.2", "12.4.1", "12.5.1", "12.6.2"]
67+
["11.7.1", "11.8.0", "12.0.1", "12.1.1", "12.2.2", "12.3.2", "12.4.1", "12.5.1", "12.6.3", "12.8.0"]
6868
exclude:
6969
- os: windows-latest # This probably requires arm64 Windows agents
7070
arch: aarch64
@@ -76,9 +76,9 @@ jobs:
7676
# Linux: We use Docker to build cross platform Cuda (aarch64 is built in emulation)
7777
- name: Set up Docker multiarch
7878
if: startsWith(matrix.os, 'ubuntu')
79-
uses: docker/setup-qemu-action@v2
79+
uses: docker/setup-qemu-action@v3
8080
# Windows: We install Cuda on the agent (slow)
81-
- uses: Jimver/[email protected].19
81+
- uses: Jimver/[email protected].21
8282
if: startsWith(matrix.os, 'windows')
8383
id: cuda-toolkit
8484
with:

bitsandbytes/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
"optim.optimizer.MockArgs": False,
2222
}
2323

24-
__version__ = "0.45.1"
24+
__version__ = "0.45.3.dev0"
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
import importlib
1+
import functools
22

33

4+
@functools.lru_cache(None)
45
def is_triton_available():
5-
return importlib.util.find_spec("triton") is not None
6+
try:
7+
# torch>=2.2.0
8+
from torch.utils._triton import has_triton, has_triton_package
9+
10+
return has_triton_package() and has_triton()
11+
except ImportError:
12+
from torch._inductor.utils import has_triton
13+
14+
return has_triton()

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ classifiers = [
4242
"Topic :: Scientific/Engineering :: Artificial Intelligence"
4343
]
4444
dependencies = [
45-
"torch~=2.0",
45+
"torch>=2.0,<3",
4646
"numpy>=1.17"
4747
]
4848

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ def has_ext_modules(self):
1212
return True
1313

1414

15-
setup(version="0.45.1", packages=find_packages(), distclass=BinaryDistribution)
15+
setup(version="0.45.3.dev0", packages=find_packages(), distclass=BinaryDistribution)

0 commit comments

Comments
 (0)