Skip to content

Commit

Permalink
upgrade libtorch and cutlass
Browse files Browse the repository at this point in the history
  • Loading branch information
guocuimi committed Feb 7, 2025
1 parent 7044f66 commit 156971f
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
build_wheel:
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python: ["3.9", "3.10", "3.11", "3.12"]
cuda: ["11.8", "12.1", "12.4"]
torch: ["2.4.1", "2.5.1"]
exclude: # torch 2.5.1 dropped support for python 3.8
torch: ["2.4.1", "2.5.1", "2.6.0"]
include:
- python: "3.8"
torch: "2.5.1"
torch: "2.4.1"
runs-on: [self-hosted, linux, release]
env:
PYTHON_VERSION: ${{ matrix.python }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
matrix:
python: ["3.12"]
cuda: ["12.4"]
torch: ["2.5.1"]
torch: ["2.6.0"]
runs-on: [self-hosted, linux, build]
env:
PYTHON_VERSION: ${{ matrix.python }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
python: ["3.9", "3.10", "3.11", "3.12"]
cuda: ["12.4"]
torch: ["2.5.1"]
torch: ["2.6.0"]
runs-on: [self-hosted, linux, release]
env:
PYTHON_VERSION: ${{ matrix.python }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
python: ["3.9", "3.10", "3.11", "3.12"]
cuda: ["12.4"]
torch: ["2.5.1"]
torch: ["2.6.0"]
runs-on: [self-hosted, linux, release]
env:
PYTHON_VERSION: ${{ matrix.python }}
Expand Down
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,25 +196,25 @@ if (DEFINED ENV{LIBTORCH_ROOT})
else()
include(FetchContent)
if (CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.4)
# download libtorch 2.5.1 with cuda 12.4 from pytorch.org
# download libtorch 2.6.0 with cuda 12.4 from pytorch.org
if (USE_CXX11_ABI)
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu124.zip")
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcu124.zip")
else()
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-shared-with-deps-2.5.1%2Bcu124.zip")
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu124/libtorch-shared-with-deps-2.6.0%2Bcu124.zip")
endif()
elseif(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.1)
# download libtorch 2.5.1 with cuda 12.1 from pytorch.org
# download libtorch 2.6.0 with cuda 12.1 from pytorch.org
if (USE_CXX11_ABI)
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu121.zip")
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcu121.zip")
else()
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-shared-with-deps-2.5.1%2Bcu121.zip")
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu121/libtorch-shared-with-deps-2.6.0%2Bcu121.zip")
endif()
elseif(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 11.8)
# download libtorch 2.5.1 with cuda 11.8 from pytorch.org
# download libtorch 2.6.0 with cuda 11.8 from pytorch.org
if (USE_CXX11_ABI)
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu118.zip")
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcu118.zip")
else()
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-shared-with-deps-2.5.1%2Bcu118.zip")
set(LIBTORCH_URL "https://download.pytorch.org/libtorch/cu118/libtorch-shared-with-deps-2.6.0%2Bcu118.zip")
endif()
else()
# error out if cuda version is not supported
Expand All @@ -234,7 +234,7 @@ else()
FetchContent_MakeAvailable(libtorch)

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

# check if USE_CXX11_ABI is set correctly
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ScaleLLM is currently undergoing active development. We are fully committed to c

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

Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ScaleLLM is available as a Python Wheel package on `PyPI <https://pypi.org/proje

.. code-block:: bash
# Install ScaleLLM with CUDA 12.4 and Pytorch 2.5.1
# Install ScaleLLM with CUDA 12.4 and Pytorch 2.6.0
$ pip install -U scalellm
Expand Down
18 changes: 18 additions & 0 deletions docs/source/quick_start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ If you want to install ScaleLLM with different versions of CUDA and PyTorch, you

.. tabs::

.. tab:: PyTorch 2.6.0

.. code-block:: bash
$ pip install -U scalellm -i https://whl.vectorch.com/cu124/torch2.6.0/
.. tab:: PyTorch 2.5.1

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

.. tabs::

.. tab:: PyTorch 2.6.0

.. code-block:: bash
$ pip install -U scalellm -i https://whl.vectorch.com/cu121/torch2.6.0/
.. tab:: PyTorch 2.5.1

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

.. tabs::

.. tab:: PyTorch 2.6.0

.. code-block:: bash
$ pip install -U scalellm -i https://whl.vectorch.com/cu118/torch2.6.0/
.. tab:: PyTorch 2.5.1

.. code-block:: bash
Expand Down

0 comments on commit 156971f

Please sign in to comment.