Skip to content

GitLab

Unverified Commit 6dba119d authored by Nate Mailhot's avatar Nate Mailhot Committed by GitHub
Browse files

chore: update nixl to 0.9.0 (#5528)

parent e861f619
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 44 deletions
Cargo.lock
View file @ 6dba119d
...@@ -131,7 +131,7 @@ version = "1.1.5" ...@@ -131,7 +131,7 @@ version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
dependencies = [ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
...@@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" ...@@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"once_cell_polyfill", "once_cell_polyfill",
"windows-sys 0.61.2", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
...@@ -703,7 +703,7 @@ dependencies = [ ...@@ -703,7 +703,7 @@ dependencies = [
"bitflags 2.10.0", "bitflags 2.10.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.13.0", "itertools 0.10.5",
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
...@@ -721,7 +721,7 @@ dependencies = [ ...@@ -721,7 +721,7 @@ dependencies = [
"bitflags 2.10.0", "bitflags 2.10.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.13.0", "itertools 0.10.5",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
...@@ -2132,7 +2132,7 @@ dependencies = [ ...@@ -2132,7 +2132,7 @@ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users", "redox_users",
"windows-sys 0.61.2", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
...@@ -2723,7 +2723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -2723,7 +2723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
...@@ -4317,7 +4317,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" ...@@ -4317,7 +4317,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
dependencies = [ dependencies = [
"hermit-abi 0.5.2", "hermit-abi 0.5.2",
"libc", "libc",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
...@@ -4353,15 +4353,6 @@ dependencies = [ ...@@ -4353,15 +4353,6 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "itertools"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.14.0" version = "0.14.0"
...@@ -4389,7 +4380,7 @@ dependencies = [ ...@@ -4389,7 +4380,7 @@ dependencies = [
"portable-atomic", "portable-atomic",
"portable-atomic-util", "portable-atomic-util",
"serde_core", "serde_core",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
...@@ -5696,10 +5687,12 @@ dependencies = [ ...@@ -5696,10 +5687,12 @@ dependencies = [
[[package]] [[package]]
name = "nixl-sys" name = "nixl-sys"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06518de4709489510ec1fa8938f1f510f8c9c1f154b096c3c0913ab2feade9b0" checksum = "1e3d48272133186f64c82a89faff4405b342478a2f015bb35d78550eff2a9961"
dependencies = [ dependencies = [
"anyhow",
"bincode 1.3.3",
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",
"libc", "libc",
...@@ -5789,7 +5782,7 @@ version = "0.50.3" ...@@ -5789,7 +5782,7 @@ version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
...@@ -7888,7 +7881,7 @@ dependencies = [ ...@@ -7888,7 +7881,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
...@@ -9157,7 +9150,7 @@ dependencies = [ ...@@ -9157,7 +9150,7 @@ dependencies = [
"getrandom 0.3.4", "getrandom 0.3.4",
"once_cell", "once_cell",
"rustix", "rustix",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
...@@ -10781,7 +10774,7 @@ version = "0.1.11" ...@@ -10781,7 +10774,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
......
container/build.sh
View file @ 6dba119d
...@@ -140,7 +140,7 @@ SGLANG_RUNTIME_IMAGE_TAG_CU13="v0.5.7-cu130-runtime" ...@@ -140,7 +140,7 @@ SGLANG_RUNTIME_IMAGE_TAG_CU13="v0.5.7-cu130-runtime"
PYTHON_VERSION="3.12" PYTHON_VERSION="3.12"
NIXL_REF=0.8.0 NIXL_REF=0.9.0
NIXL_UCX_REF=1.20.0 NIXL_UCX_REF=1.20.0
NIXL_GDRCOPY_REF=v2.5.1 NIXL_GDRCOPY_REF=v2.5.1
NIXL_LIBFABRIC_REF=v2.3.0 NIXL_LIBFABRIC_REF=v2.3.0
......
container/deps/trtllm/install_nixl.sh
View file @ 6dba119d
...@@ -27,7 +27,7 @@ UCX_VERSION="1.20.0" ...@@ -27,7 +27,7 @@ UCX_VERSION="1.20.0"
UCX_INSTALL_PATH="/usr/local/ucx/" UCX_INSTALL_PATH="/usr/local/ucx/"
CUDA_PATH="/usr/local/cuda" CUDA_PATH="/usr/local/cuda"
NIXL_COMMIT="97c9b5b48e2ed3f1f2539c461c4971a7db8b1197" NIXL_COMMIT="2d475e4ae5bf12f5cfd592631076b089e9c2d983"
UCX_REPO="https://github.com/openucx/ucx.git" UCX_REPO="https://github.com/openucx/ucx.git"
NIXL_REPO="https://github.com/ai-dynamo/nixl.git" NIXL_REPO="https://github.com/ai-dynamo/nixl.git"
......
docs/reference/support-matrix.md
View file @ 6dba119d
...@@ -56,7 +56,7 @@ If you are using a **GPU**, the following GPU models and architectures are suppo ...@@ -56,7 +56,7 @@ If you are using a **GPU**, the following GPU models and architectures are suppo
| :----------------- | :---------- | :------------------------------------ | :----------- | | :----------------- | :---------- | :------------------------------------ | :----------- |
| ai-dynamo | 0.8.0 | >=2.28 | | | ai-dynamo | 0.8.0 | >=2.28 | |
| ai-dynamo-runtime | 0.8.0 | >=2.28 (Python 3.12 has known issues) | | | ai-dynamo-runtime | 0.8.0 | >=2.28 (Python 3.12 has known issues) | |
| NIXL | 0.8.0 | >=2.27 | >=11.8 | | NIXL | 0.9.0 | >=2.27 | >=11.8 |
### Build Dependency ### Build Dependency
...@@ -67,7 +67,7 @@ The following table shows the dependency versions included with each Dynamo rele ...@@ -67,7 +67,7 @@ The following table shows the dependency versions included with each Dynamo rele
| SGLang | 0.5.7 | 0.5.6.post2 | 0.5.3.post4| 0.5.3.post4 | 0.5.3.post4| | SGLang | 0.5.7 | 0.5.6.post2 | 0.5.3.post4| 0.5.3.post4 | 0.5.3.post4|
| TensorRT-LLM | 1.2.0rc6.post1 | 1.2.0rc6.post1 | 1.2.0rc3 | 1.2.0rc3 | 1.2.0rc2 | | TensorRT-LLM | 1.2.0rc6.post1 | 1.2.0rc6.post1 | 1.2.0rc3 | 1.2.0rc3 | 1.2.0rc2 |
| vLLM | 0.13.0 | 0.12.0 | 0.11.0 | 0.11.0 | 0.11.0 | | vLLM | 0.13.0 | 0.12.0 | 0.11.0 | 0.11.0 | 0.11.0 |
| NIXL | 0.8.0 | 0.8.0 | 0.8.0 | 0.8.0 | 0.8.0 | | NIXL | 0.9.0 | 0.8.0 | 0.8.0 | 0.8.0 | 0.8.0 |
> [!Note] > [!Note]
> **main (ToT)** reflects the current development branch. > **main (ToT)** reflects the current development branch.
......
lib/bindings/kvbm/Cargo.lock
View file @ 6dba119d
...@@ -4138,9 +4138,9 @@ dependencies = [ ...@@ -4138,9 +4138,9 @@ dependencies = [
[[package]] [[package]]
name = "nixl-sys" name = "nixl-sys"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06518de4709489510ec1fa8938f1f510f8c9c1f154b096c3c0913ab2feade9b0" checksum = "1e3d48272133186f64c82a89faff4405b342478a2f015bb35d78550eff2a9961"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",
......
lib/bindings/kvbm/pyproject.toml
View file @ 6dba119d
...@@ -26,7 +26,7 @@ license = { text = "Apache-2.0" } ...@@ -26,7 +26,7 @@ license = { text = "Apache-2.0" }
license-files = ["LICENSE"] license-files = ["LICENSE"]
requires-python = ">=3.10" requires-python = ">=3.10"
dependencies = [ dependencies = [
"nixl[cu12]==0.8.0", "nixl[cu12]==0.9.0",
"pydantic>=2.0" "pydantic>=2.0"
] ]
classifiers = [ classifiers = [
...@@ -45,8 +45,8 @@ classifiers = [ ...@@ -45,8 +45,8 @@ classifiers = [
keywords = ["llm", "genai", "inference", "nvidia", "kvcache", "dynamo"] keywords = ["llm", "genai", "inference", "nvidia", "kvcache", "dynamo"]
[project.optional-dependencies] [project.optional-dependencies]
cu12 = ["nixl[cu12]==0.8.0"] cu12 = ["nixl[cu12]==0.9.0"]
cu13 = ["nixl[cu13]==0.8.0"] cu13 = ["nixl[cu13]==0.9.0"]
test = [ test = [
"pytest>=8.3.4", "pytest>=8.3.4",
"pytest-mypy", "pytest-mypy",
......
lib/bindings/python/Cargo.lock
View file @ 6dba119d
...@@ -4176,9 +4176,9 @@ dependencies = [ ...@@ -4176,9 +4176,9 @@ dependencies = [
[[package]] [[package]]
name = "nixl-sys" name = "nixl-sys"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06518de4709489510ec1fa8938f1f510f8c9c1f154b096c3c0913ab2feade9b0" checksum = "1e3d48272133186f64c82a89faff4405b342478a2f015bb35d78550eff2a9961"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",
......
lib/llm/Cargo.toml
View file @ 6dba119d
...@@ -103,7 +103,7 @@ dialoguer = { version = "0.11", default-features = false, features = [ ...@@ -103,7 +103,7 @@ dialoguer = { version = "0.11", default-features = false, features = [
# block_manager # block_manager
aligned-vec = { version = "0.6.4", optional = true } aligned-vec = { version = "0.6.4", optional = true }
nixl-sys = { version = "=0.8.0", optional = true } nixl-sys = { version = "=0.9.0", optional = true }
cudarc = { workspace = true, optional = true } cudarc = { workspace = true, optional = true }
nix = { version = "0.26", optional = true } nix = { version = "0.26", optional = true }
......
lib/llm/src/block_manager/block/transfer/nixl.rs
View file @ 6dba119d
...@@ -31,13 +31,13 @@ where ...@@ -31,13 +31,13 @@ where
src_desc.as_ptr() as usize, src_desc.as_ptr() as usize,
src_desc.size(), src_desc.size(),
src_desc.device_id(), src_desc.device_id(),
)?; );
dst_dl.add_desc( dst_dl.add_desc(
dst_desc.as_ptr() as usize, dst_desc.as_ptr() as usize,
dst_desc.size(), dst_desc.size(),
dst_desc.device_id(), dst_desc.device_id(),
)?; );
} }
Ok(()) Ok(())
...@@ -58,13 +58,13 @@ where ...@@ -58,13 +58,13 @@ where
src_desc.as_ptr() as usize, src_desc.as_ptr() as usize,
src_desc.size(), src_desc.size(),
src_desc.device_id(), src_desc.device_id(),
)?; );
dst_dl.add_desc( dst_dl.add_desc(
dst_desc.as_ptr() as usize, dst_desc.as_ptr() as usize,
dst_desc.size(), dst_desc.size(),
dst_desc.device_id(), dst_desc.device_id(),
)?; );
} }
} }
} }
......
lib/llm/src/block_manager/v2/physical/transfer/executor/nixl.rs
View file @ 6dba119d
...@@ -278,10 +278,10 @@ impl<'a> NixlTransferBuilder<'a, Set, Set, Set, Set, Set> { ...@@ -278,10 +278,10 @@ impl<'a> NixlTransferBuilder<'a, Set, Set, Set, Set, Set> {
} }
// Add to source descriptor list // Add to source descriptor list
src_dl.add_desc(src_region.addr(), src_region.size(), src_device_id)?; src_dl.add_desc(src_region.addr(), src_region.size(), src_device_id);
// Add to destination descriptor list // Add to destination descriptor list
dst_dl.add_desc(dst_region.addr(), dst_region.size(), dst_device_id)?; dst_dl.add_desc(dst_region.addr(), dst_region.size(), dst_device_id);
} }
} }
} }
......
lib/memory/Cargo.toml
View file @ 6dba119d
...@@ -27,7 +27,7 @@ dynamo-config = { workspace = true } ...@@ -27,7 +27,7 @@ dynamo-config = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
cudarc = { workspace = true } cudarc = { workspace = true }
nixl-sys = { version = "0.8" } nixl-sys = { version = "0.9" }
serde = { workspace = true} serde = { workspace = true}
thiserror = { workspace = true } thiserror = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
......
pyproject.toml
View file @ 6dba119d
...@@ -55,14 +55,14 @@ trtllm =[ ...@@ -55,14 +55,14 @@ trtllm =[
vllm = [ vllm = [
"uvloop", "uvloop",
"nixl[cu12]<=0.8.0", "nixl[cu12]<=0.9.0",
"vllm[flashinfer,runai]==0.13.0", "vllm[flashinfer,runai]==0.13.0",
] ]
sglang = [ sglang = [
"uvloop", "uvloop",
"sglang==0.5.7", "sglang==0.5.7",
"nixl[cu12]<=0.8.0", "nixl[cu12]<=0.9.0",
] ]
[project.entry-points.pytest11] [project.entry-points.pytest11]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment