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

Merge pull request #103120 from danieldk/libtorch-bin-cmake-fix-lib-paths

Browse Source 
libtorch-bin: fix CMake library paths for split outputs
This commit is contained in:
Daniël de Kok 2020-11-10 12:10:38 +01:00 committed by GitHub
commit da115b4c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/science/math/libtorch/bin.nix
View File

@ -45,6 +45,14 @@ in stdenv.mkDerivation {
# We do not care about Java support... # We do not care about Java support...
rm -f $out/lib/lib*jni* 2> /dev/null || true 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 postFixup = let

1
pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt
View File

@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 3.0)
find_package(Torch REQUIRED) find_package(Torch REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
add_executable(test test.cpp) add_executable(test test.cpp)