public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122967 from dotlambda/pytorch-pybind11

Browse Source 
python3Packages.pytorch: unvendor pybind11
This commit is contained in:
Daniël de Kok 2021-05-15 17:47:46 +02:00 committed by GitHub
commit b98ccbf1b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/pybind11/default.nix
View File

@ -23,6 +23,14 @@ buildPythonPackage rec {
sha256 = "1lsacpawl2gb5qlh0cawj9swsyfbwhzhwiv6553a7lsigdbadqpy"; sha256 = "1lsacpawl2gb5qlh0cawj9swsyfbwhzhwiv6553a7lsigdbadqpy";
}; };
patches = [
# fix pybind11Config.cmake
(fetchpatch {
url = "https://github.com/pybind/pybind11/commit/d9c4e1047a95f023633a7260af5a633307438941.patch";
sha256 = "0kran295kj31xfs6mfha5ip132zd0pnj2dl36qzgyc1rpnha5gz4";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ catch ]; buildInputs = [ catch ];

3
pkgs/development/python-modules/pytorch/default.nix
View File

@ -6,7 +6,7 @@
cudaArchList ? null, cudaArchList ? null,
# Native build inputs # Native build inputs
cmake, util-linux, linkFarm, symlinkJoin, which, cmake, util-linux, linkFarm, symlinkJoin, which, pybind11,
# Build inputs # Build inputs
numactl, numactl,
@ -216,6 +216,7 @@ in buildPythonPackage rec {
util-linux util-linux
which which
ninja ninja
pybind11
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
buildInputs = [ blas blas.provider ] buildInputs = [ blas blas.provider ]