Unverified Commit 8e573554 authored by Samuel Ainsworth's avatar Samuel Ainsworth Committed by GitHub
Browse files

Merge pull request #288738 from samuela/samuela/jaxlib-bin 

python3Packages.jaxlib-bin: use `autoAddOpenGLRunpathHook`
parents ceef74d1 54611541

pkgs/development/python-modules/jaxlib/bin.nix

+2 −5
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#   * https://github.com/google/jax/issues/5723#issuecomment-913038780



{ absl-py

, addOpenGLRunpath

, autoPatchelfHook

, buildPythonPackage

, config
@@ -33,7 +32,7 @@ 
}:



let

  inherit (cudaPackagesGoogle) cudatoolkit cudnn cudaVersion;

  inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudatoolkit cudnn cudaVersion;



  version = "0.4.24";
@@ -181,7 +180,7 @@ buildPythonPackage { 
  # Prebuilt wheels are dynamically linked against things that nix can't find.

  # Run `autoPatchelfHook` to automagically fix them.

  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]

    ++ lib.optionals cudaSupport [ addOpenGLRunpath ];

    ++ lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ];

  # Dynamic link dependencies

  buildInputs = [ stdenv.cc.cc.lib ];
@@ -197,8 +196,6 @@ buildPythonPackage { 
  preInstallCheck = lib.optional cudaSupport ''

    shopt -s globstar



    addOpenGLRunpath $out/**/*.so



    for file in $out/**/*.so; do

      rpath=$(patchelf --print-rpath $file)

      # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to