Skip to content

Commit 532f638

Browse files
authored
upgrade libtorch to 2.6.0 and cutlass to 3.8.0 (#398)
1 parent 7044f66 commit 532f638

File tree

10 files changed

+42
-22
lines changed

10 files changed

+42
-22
lines changed

.github/workflows/build_wheel.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ jobs:
2222
build_wheel:
2323
strategy:
2424
matrix:
25-
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
25+
python: ["3.9", "3.10", "3.11", "3.12"]
2626
cuda: ["11.8", "12.1", "12.4"]
27-
torch: ["2.4.1", "2.5.1"]
28-
exclude: # torch 2.5.1 dropped support for python 3.8
29-
- python: "3.8"
30-
torch: "2.5.1"
27+
torch: ["2.4.1", "2.5.1", "2.6.0"]
3128
runs-on: [self-hosted, linux, release]
3229
env:
3330
PYTHON_VERSION: ${{ matrix.python }}

.github/workflows/package_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
matrix:
4141
python: ["3.12"]
4242
cuda: ["12.4"]
43-
torch: ["2.5.1"]
43+
torch: ["2.6.0"]
4444
runs-on: [self-hosted, linux, build]
4545
env:
4646
PYTHON_VERSION: ${{ matrix.python }}

.github/workflows/publish_wheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
python: ["3.9", "3.10", "3.11", "3.12"]
2525
cuda: ["12.4"]
26-
torch: ["2.5.1"]
26+
torch: ["2.6.0"]
2727
runs-on: [self-hosted, linux, release]
2828
env:
2929
PYTHON_VERSION: ${{ matrix.python }}

.github/workflows/release_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
python: ["3.9", "3.10", "3.11", "3.12"]
2323
cuda: ["12.4"]
24-
torch: ["2.5.1"]
24+
torch: ["2.6.0"]
2525
runs-on: [self-hosted, linux, release]
2626
env:
2727
PYTHON_VERSION: ${{ matrix.python }}

CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,25 +196,25 @@ if (DEFINED ENV{LIBTORCH_ROOT})
196196
else()
197197
include(FetchContent)
198198
if (CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.4)
199-
# download libtorch 2.5.1 with cuda 12.4 from pytorch.org
199+
# download libtorch 2.6.0 with cuda 12.4 from pytorch.org
200200
if (USE_CXX11_ABI)
201-
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu124.zip")
201+
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcu124.zip")
202202
else()
203-
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-shared-with-deps-2.5.1%2Bcu124.zip")
203+
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-shared-with-deps-2.6.0%2Bcu124.zip")
204204
endif()
205205
elseif(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.1)
206-
# download libtorch 2.5.1 with cuda 12.1 from pytorch.org
206+
# download libtorch 2.6.0 with cuda 12.1 from pytorch.org
207207
if (USE_CXX11_ABI)
208-
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu121.zip")
208+
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcu121.zip")
209209
else()
210-
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-shared-with-deps-2.5.1%2Bcu121.zip")
210+
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-shared-with-deps-2.6.0%2Bcu121.zip")
211211
endif()
212212
elseif(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 11.8)
213-
# download libtorch 2.5.1 with cuda 11.8 from pytorch.org
213+
# download libtorch 2.6.0 with cuda 11.8 from pytorch.org
214214
if (USE_CXX11_ABI)
215-
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu118.zip")
215+
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcu118.zip")
216216
else()
217-
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-shared-with-deps-2.5.1%2Bcu118.zip")
217+
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-shared-with-deps-2.6.0%2Bcu118.zip")
218218
endif()
219219
else()
220220
# error out if cuda version is not supported
@@ -234,7 +234,7 @@ else()
234234
FetchContent_MakeAvailable(libtorch)
235235

236236
find_package(Torch REQUIRED PATHS ${libtorch_SOURCE_DIR} NO_DEFAULT_PATH)
237-
message(STATUS "Downloading and using libtorch 2.5.1 for cuda ${CUDA_VERSION} at ${libtorch_SOURCE_DIR}")
237+
message(STATUS "Downloading and using libtorch 2.6.0 for cuda ${CUDA_VERSION} at ${libtorch_SOURCE_DIR}")
238238
endif()
239239

240240
# check if USE_CXX11_ABI is set correctly

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ScaleLLM is currently undergoing active development. We are fully committed to c
5555

5656
ScaleLLM is available as a Python Wheel package on PyPI. You can install it using pip:
5757
```bash
58-
# Install scalellm with CUDA 12.4 and Pytorch 2.5.1
58+
# Install scalellm with CUDA 12.4 and Pytorch 2.6.0
5959
pip install -U scalellm
6060
```
6161

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ScaleLLM is available as a Python Wheel package on `PyPI <https://pypi.org/proje
1212

1313
.. code-block:: bash
1414
15-
# Install ScaleLLM with CUDA 12.4 and Pytorch 2.5.1
15+
# Install ScaleLLM with CUDA 12.4 and Pytorch 2.6.0
1616
$ pip install -U scalellm
1717
1818

docs/source/quick_start.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ If you want to install ScaleLLM with different versions of CUDA and PyTorch, you
2525

2626
.. tabs::
2727

28+
.. tab:: PyTorch 2.6.0
29+
30+
.. code-block:: bash
31+
32+
$ pip install -U scalellm -i https://whl.vectorch.com/cu124/torch2.6.0/
33+
2834
.. tab:: PyTorch 2.5.1
2935

3036
.. code-block:: bash
@@ -41,6 +47,12 @@ If you want to install ScaleLLM with different versions of CUDA and PyTorch, you
4147

4248
.. tabs::
4349

50+
.. tab:: PyTorch 2.6.0
51+
52+
.. code-block:: bash
53+
54+
$ pip install -U scalellm -i https://whl.vectorch.com/cu121/torch2.6.0/
55+
4456
.. tab:: PyTorch 2.5.1
4557

4658
.. code-block:: bash
@@ -57,6 +69,12 @@ If you want to install ScaleLLM with different versions of CUDA and PyTorch, you
5769

5870
.. tabs::
5971

72+
.. tab:: PyTorch 2.6.0
73+
74+
.. code-block:: bash
75+
76+
$ pip install -U scalellm -i https://whl.vectorch.com/cu118/torch2.6.0/
77+
6078
.. tab:: PyTorch 2.5.1
6179

6280
.. code-block:: bash

scalellm/downloader.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ def convert_pickle_to_safetensors(path):
1616
continue
1717

1818
# load the model
19-
model = torch.load(file_path, map_location="cpu")
19+
try:
20+
model = torch.load(file_path, map_location="cpu")
21+
except Exception as e:
22+
print(f"Error loading {filename}: {e}")
23+
continue
24+
2025
if hasattr(model, "state_dict"):
2126
state_dict = model.state_dict()
2227
else:

third_party/cutlass

Submodule cutlass updated 303 files

0 commit comments

Comments
 (0)