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

cudatoolkit: Multiple output improvements

Browse Source 
* Add a "lib" output containing (for the moment) only libOpenCL. This
  reduces the closure size of opensubdiv and blender by about 2 GiB.

* Add a "doc" output (about ~200 MiB).

* Remove the "sdk" output since it was worse than useless: all of the
  "sdk" output was also included in "out", so it actually increased
  disk space usage.

* Run patchelf on ELF binaries only.
This commit is contained in:
Eelco Dolstra 2017-02-28 00:11:22 +01:00
parent b5c619cbfe
commit c2d4b14637
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/compilers/cudatoolkit/default.nix
View File

@ -22,7 +22,7 @@ let
} }
else throw "cudatoolkit does not support platform ${stdenv.system}"; else throw "cudatoolkit does not support platform ${stdenv.system}";
outputs = [ "out" "sdk" ]; outputs = [ "out" "lib" "doc" ];
buildInputs = [ perl ]; buildInputs = [ perl ];
@ -43,24 +43,35 @@ let
''; '';
buildPhase = '' buildPhase = ''
find . -type f -executable -exec patchelf \ chmod -R u+w .
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ while IFS= read -r -d ''$'\0' i; do
'{}' \; || true if ! isELF "$i"; then continue; fi
find . -type f -exec patchelf \ echo "patching $i..."
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \ if [[ ! $i =~ \.so ]]; then
--force-rpath \ patchelf \
'{}' \; || true --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
fi
if [[ $i =~ libOpenCL ]]; then
rpath2=
else
rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
fi
patchelf --set-rpath $rpath2 --force-rpath $i
done < <(find . -type f -print0)
''; '';
installPhase = '' installPhase = ''
mkdir $out $sdk mkdir $out
perl ./install-linux.pl --prefix="$out" perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
# let's remove the 32-bit libraries, they confuse the lib64->lib mover # let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib rm -rf $out/lib
# Remove some cruft.
rm $out/bin/uninstall*
# Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
if [ -d "$out"/cuda-samples ]; then if [ -d "$out"/cuda-samples ]; then
mv "$out"/cuda-samples "$out"/samples mv "$out"/cuda-samples "$out"/samples
@ -73,6 +84,11 @@ let
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
# Move some libraries to the lib output so that programs that
# depend on them don't pull in this entire monstrosity.
mkdir -p $lib/lib
mv -v $out/lib64/libOpenCL* $lib/lib/
'' + lib.optionalString (lib.versionOlder version "8.0") '' '' + lib.optionalString (lib.versionOlder version "8.0") ''
# Hack to fix building against recent Glibc/GCC. # Hack to fix building against recent Glibc/GCC.
echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook