pyrox.dev
lol
Merge pull request #248176 from bcdarwin/update-bitsandbytes
python310Packages.bitsandbytes: 0.38.0 -> 0.41.0
authored by
Franz Pletz
and committed by
GitHub
a52cccf7
6574d902
+8
-6
pkgs/development/python-modules/bitsandbytes/default.nix
+8
-6
pkgs/development/python-modules/bitsandbytes/default.nix
···
5
5
, pythonOlder
6
6
, pytestCheckHook
7
7
, setuptools
8
+
, wheel
8
9
, torch
9
10
, einops
10
11
, lion-pytorch
···
14
15
15
16
let
16
17
pname = "bitsandbytes";
17
-
version = "0.38.0";
18
+
version = "0.41.0";
18
19
19
20
inherit (torch) cudaCapabilities cudaPackages cudaSupport;
20
21
inherit (cudaPackages) backendStdenv cudaVersion;
···
53
54
owner = "TimDettmers";
54
55
repo = pname;
55
56
rev = "refs/tags/${version}";
56
-
hash = "sha256-gGlbzTDvZNo4MhcYzLvWuB2ec7q+Qt5/LtTbJ0Rc+Kk=";
57
+
hash = "sha256-e6SK2ylITookO6bhpfdRp/V4y2S9rk6Lo1PD3xXrcmM=";
57
58
};
58
59
59
60
postPatch = ''
60
61
substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib"
61
62
substituteInPlace bitsandbytes/cuda_setup/main.py \
62
-
--replace "binary_path = package_dir / binary_name" \
63
-
"binary_path = Path('$out/${python.sitePackages}/${pname}')/binary_name"
63
+
--replace "binary_path = package_dir / self.binary_name" \
64
+
"binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name"
64
65
'' + lib.optionalString torch.cudaSupport ''
65
66
substituteInPlace bitsandbytes/cuda_setup/main.py \
66
67
--replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib"
···
75
76
else
76
77
''make CUDA_VERSION=CPU cpuonly'';
77
78
78
-
nativeBuildInputs = [ setuptools ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ];
79
+
nativeBuildInputs = [ setuptools wheel ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ];
79
80
buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ];
80
81
81
82
propagatedBuildInputs = [
83
+
scipy
82
84
torch
83
85
];
84
86
85
87
doCheck = false; # tests require CUDA and also GPU access
86
-
nativeCheckInputs = [ pytestCheckHook einops lion-pytorch scipy ];
88
+
nativeCheckInputs = [ pytestCheckHook einops lion-pytorch ];
87
89
88
90
pythonImportsCheck = [
89
91
"bitsandbytes"