diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 3ae462705868..7c78f61af694 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -12,9 +12,9 @@ }: let - version = "1.6.0"; + version = "1.7.0"; device = if cudaSupport then "cuda" else "cpu"; - srcs = import ./binary-hashes.nix; + srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; in stdenv.mkDerivation { inherit version; @@ -45,6 +45,14 @@ in stdenv.mkDerivation { # We do not care about Java support... rm -f $out/lib/lib*jni* 2> /dev/null || true + + # Fix up library paths for split outputs + substituteInPlace $dev/share/cmake/Torch/TorchConfig.cmake \ + --replace \''${TORCH_INSTALL_PREFIX}/lib "$out/lib" \ + + substituteInPlace \ + $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \ + --replace \''${_IMPORT_PREFIX}/lib "$out/lib" \ ''; postFixup = let @@ -100,7 +108,7 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { }; meta = with stdenv.lib; { description = "C++ API of the PyTorch machine learning framework"; |