Unverified Commit 4873e617 authored by Samuel Ainsworth's avatar Samuel Ainsworth Committed by GitHub
Browse files

Merge pull request #259744 from GaetanLepage/jax 

python310Packages.{jax,jaxlib,jaxlib-bin}: 0.4.17 -> 0.4.18
parents 6303f02b 02446cf2

pkgs/development/python-modules/jax/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ let 
in

buildPythonPackage rec {

  pname = "jax";

  version = "0.4.17";

  version = "0.4.18";

  pyproject = true;



  disabled = pythonOlder "3.9";
@@ -37,7 +37,7 @@ buildPythonPackage rec { 
    repo = pname;

    # google/jax contains tags for jax and jaxlib. Only use jax tags!

    rev = "refs/tags/${pname}-v${version}";

    hash = "sha256-Lxi/lBBq7VlsT6CgnXPFcwbRU+T8630rBdm693E2jok=";

    hash = "sha256-rDvWHa8jYCAA9iKbWaFUXdE/9L7AepFiNzmqOcc/090=";

  };



  nativeBuildInputs = [

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

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ in 
assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux;



let

  version = "0.4.17";

  version = "0.4.18";



  inherit (python) pythonVersion;
@@ -60,15 +60,15 @@ let 
    {

      "x86_64-linux" = getSrcFromPypi {

        platform = "manylinux2014_x86_64";

        hash = "sha256-Fg/OaLgqeabFImUujdmhCqycANFZnLfhZmca2QmqE54=";

        hash = "sha256-MpNomovvSVx4N6gsowOLksTyEgTK261vSXMGxYqlVOE=";

      };

      "aarch64-darwin" = getSrcFromPypi {

        platform = "macosx_11_0_arm64";

        hash = "sha256-OSx3n5AsQ+Ggr0kVna/++bWvlSq6ABRj+Yz5WlnvF/8=";

        hash = "sha256-if/5O5DQVHFdsLw9O1creZBx5j8ftE7fsWMMX1NjHP0=";

      };

      "x86_64-darwin" = getSrcFromPypi {

        platform = "macosx_10_14_x86_64";

        hash = "sha256-1L4axL8b4a4c2PX02kFKbQ3o3jbPLv/bV1jU1neJYHg=";

        hash = "sha256-4NeHA/0SGdmHXyDGxpK7oJc7dE1meR4LPjzbIwxloqU=";

      };

    };
@@ -77,8 +77,8 @@ let 
  # When upgrading, you can get these hashes from prefetch.sh. See

  # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index.

  gpuSrc = fetchurl {

    url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl";

    hash = "sha256-Ctdlr8mvlMcTnBSiyjEEvle5AGr+o1v6OI7XIqcTENM=";

    url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl";

    hash = "sha256-p6BNvhhRzVDQdpEoIRau5JovC+eDjlW3bXrahtsGvmI=";

  };



in

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

+5 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ let 
  inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl;



  pname = "jaxlib";

  version = "0.4.17";

  version = "0.4.18";



  meta = with lib; {

    description = "JAX is Autograd and XLA, brought together for high-performance machine learning research.";
@@ -151,7 +151,7 @@ let 
      repo = "jax";

      # google/jax contains tags for jax and jaxlib. Only use jaxlib tags!

      rev = "refs/tags/${pname}-v${version}";

      hash = "sha256-Lxi/lBBq7VlsT6CgnXPFcwbRU+T8630rBdm693E2jok=";

      hash = "sha256-rDvWHa8jYCAA9iKbWaFUXdE/9L7AepFiNzmqOcc/090=";

    };



    nativeBuildInputs = [
@@ -264,10 +264,10 @@ let 
      ];



      sha256 = (if cudaSupport then {

        x86_64-linux = "sha256-nRvvFAuP/9D8BWWVPjuZijVtk+F9IrBBHsNc5Daluy4=";

        x86_64-linux = "sha256-0CfGWlwKsUFP1DHUN6+6wX3cHr5x3TE6NbqYlV5me1E=";

      } else {

        x86_64-linux = "sha256-pPIJOELN62GqUuaKpcpaqHu7wbJHiZgtb2PVUPRr1Ek=";

        aarch64-linux = "sha256-Q0PYZkOkUYUHVtSHZDlWitslDZbjNq6yRZv/ZkhTmyc=";

        x86_64-linux = "sha256-sljmyIligXC7d9fdlpqR32xyMR0UslWs04gXJBD8FTA=";

        aarch64-linux = "sha256-eJ4KIkHdcA2EVvyBoNum2cOPcHPFoBOtUTAGufO8FJA=";

      }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}");

    };