Skip to content

Commit 09fe546

Browse files
authored
Revert "add VLLM to nix packages :) (#464)"
This reverts commit b8e1464.
1 parent b8e1464 commit 09fe546

File tree

12 files changed

+188
-223
lines changed

12 files changed

+188
-223
lines changed

Cargo.lock

Lines changed: 32 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ indicatif = "0.17.5"
7676
tokenizers = { version = "0.20.0", default-features = false, features = [
7777
"onig",
7878
] }
79-
tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
80-
torch-sys = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
81-
pyo3-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
79+
tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "11d1ca2ef6dbd3f1e5b0986fab0a90fbb6734496" }
80+
torch-sys = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "11d1ca2ef6dbd3f1e5b0986fab0a90fbb6734496" }
81+
pyo3-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "11d1ca2ef6dbd3f1e5b0986fab0a90fbb6734496" }
8282
#tch = { path = "../tch-rs" }
8383
#torch-sys = { path = "../tch-rs/torch-sys" }
8484
#pyo3-tch = { path = "../tch-rs/pyo3-tch" }

flake.lock

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/nixpkgs.nix

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,9 @@ in
1515
overlays = lib.optionals cudaSupported [ inputs.nix-gl-host.overlays.default ] ++ [
1616
inputs.rust-overlay.overlays.default
1717
(final: prev: {
18-
# temporary fix until https://github.com/NixOS/nixpkgs/pull/471394 is merged
19-
# that lets us use `torch` instead of `torch-bin`
20-
cudaPackages = prev.cudaPackages // {
21-
cudnn = prev.cudaPackages.cudnn.overrideAttrs (old: {
22-
patchelfFlagsArray = (old.patchelfFlagsArray or [ ]) ++ [
23-
"--set-rpath"
24-
"${prev.lib.getLib prev.cudaPackages.cuda_nvrtc}/lib:\$ORIGIN"
25-
];
26-
});
27-
};
28-
29-
# provide packages for uv2pip to include
3018
python312Packages = prev.python312Packages.override {
3119
overrides = pyfinal: pyprev: {
20+
torch = pyfinal.torch-bin;
3221
flash-attn = pyfinal.callPackage ../python/flash-attn.nix { };
3322
liger-kernel = pyfinal.callPackage ../python/liger-kernel.nix { };
3423
torchtitan = pyfinal.callPackage ../python/torchtitan.nix { };

psyche-book/book.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[book]
22
authors = ["Nous Research"]
33
language = "en"
4+
multilingual = false
45
src = "src"
56
title = "Psyche"
67

0 commit comments

Comments
 (0)