Merge pull request #261578 from Madouura/pr/rocm

rocmPackages: 5.7.0 -> 5.7.1
2023-10-22 01:01:40 +02:00
parent 18618c9940 6f3f5b64f2
commit 4e461fd2d7
47 changed files with 65 additions and 69 deletions
@@ -95,8 +95,7 @@ let

    paths = with rocmPackages; [
      rocm-core clr rccl miopen miopengemm rocrand rocblas
-      rocsparse hipsparse rocthrust rocprim hipcub
-      roctracer # Unfree at the moment due to hsa-amd-aqlprofile hard dependency in rocprofiler
+      rocsparse hipsparse rocthrust rocprim hipcub roctracer
      rocfft rocsolver hipfft hipsolver hipblas
      rocminfo rocm-thunk rocm-comgr rocm-device-libs
      rocm-runtime clr.icd hipify
@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "clang-ocl";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
@@ -35,7 +35,7 @@ let
  ];
 in stdenv.mkDerivation (finalAttrs: {
  pname = "clr";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -46,7 +46,7 @@ in stdenv.mkDerivation (finalAttrs: {
    owner = "ROCm-Developer-Tools";
    repo = "clr";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-C+rFW/7kf35rz0sQTI2+iY5RhZZQY07fc5a+e6cB5OQ=";
+    hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw=";
  };

  nativeBuildInputs = [
@@ -144,6 +144,8 @@ in stdenv.mkDerivation (finalAttrs: {
      name = finalAttrs.pname;
      owner = finalAttrs.src.owner;
      repo = finalAttrs.src.repo;
+      page = "tags?per_page=1";
+      filter = ".[0].name | split(\"-\") | .[1]";
    };

    impureTests = {
@@ -15,7 +15,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "composable_kernel";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -111,8 +111,7 @@ in rec {

  # Needs GCC
  roctracer = callPackage ./roctracer {
-    inherit rocmUpdateScript rocm-device-libs rocm-runtime rocprofiler clr;
-    inherit (llvm) clang;
+    inherit rocmUpdateScript rocm-device-libs rocm-runtime clr;
  };

  # Needs GCC
@@ -8,7 +8,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "half";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCmSoftwarePlatform";
@@ -6,7 +6,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hip-common";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
@@ -18,7 +18,7 @@
 # Can also use cuBLAS
 stdenv.mkDerivation (finalAttrs: {
  pname = "hipblas";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -8,7 +8,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hipcc";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
@@ -16,7 +16,7 @@
 # CUB can also be used as a backend instead of rocPRIM.
 stdenv.mkDerivation (finalAttrs: {
  pname = "hipcub";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -21,7 +21,7 @@
 # Can also use cuFFT
 stdenv.mkDerivation (finalAttrs: {
  pname = "hipfft";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hipfort";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCmSoftwarePlatform";
@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hipify";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
@@ -18,7 +18,7 @@
 # Can also use cuSOLVER
 stdenv.mkDerivation (finalAttrs: {
  pname = "hipsolver";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCmSoftwarePlatform";
    repo = "hipSOLVER";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-I9Xjkilo+baeM1CRXjLAbj/vrg8r5/E2yEImhHGSyf8=";
+    hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc=";
  };

  nativeBuildInputs = [
@@ -18,7 +18,7 @@
 # This can also use cuSPARSE as a backend instead of rocSPARSE
 stdenv.mkDerivation (finalAttrs: {
  pname = "hipsparse";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -53,7 +53,7 @@ let
  llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild;
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-llvm-${targetName}";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -70,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: {
    owner = "RadeonOpenCompute";
    repo = "llvm-project";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-oJIXALwxo130jl8b6yCFw+a2kMBlny5/0ubiqF6MOWY=";
+    hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8=";
  };

  nativeBuildInputs = [
@@ -49,7 +49,7 @@ let
  };
 in stdenv.mkDerivation (finalAttrs: {
  pname = "migraphx";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: {
    owner = "ROCmSoftwarePlatform";
    repo = "AMDMIGraphX";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-7yL7Zn5I8GUPIAgB7tVLZI7OEHLv0E4FcLVx9xMfsNY=";
+    hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ=";
  };

  nativeBuildInputs = [
@@ -35,7 +35,7 @@
 }:

 let
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCmSoftwarePlatform";
@@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
    else "cpu"
  );

-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "GPUOpen-ProfessionalCompute-Libraries";
    repo = "MIVisionX";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-Z7UIqJWuSD+/FoZ1VIbITp4R/bwaqFCQqsL8CRW73Ek=";
+    hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U=";
  };

  nativeBuildInputs = [
@@ -16,7 +16,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rccl";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCmSoftwarePlatform";
    repo = "rccl";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-Abrwmsjnkx9JVTrARP/BM965g+R10lY+XPwthy/SG0k=";
+    hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8=";
  };

  nativeBuildInputs = [
@@ -41,7 +41,7 @@ let
  };
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rdc";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -21,7 +21,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocalution";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -73,7 +73,7 @@ let
  fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; };
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocblas";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -38,7 +38,7 @@ let
  };
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocdbgapi";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -19,7 +19,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocfft";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCmSoftwarePlatform";
@@ -15,7 +15,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocgdb";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
@@ -7,7 +7,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-cmake";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
    name = finalAttrs.pname;
    owner = finalAttrs.src.owner;
    repo = finalAttrs.src.repo;
-    page = "releases?per_page=2";
-    filter = ".[1].tag_name | split(\"-\") | .[1]";
  };

  meta = with lib; {
@@ -15,7 +15,7 @@ let
    else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-comgr";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
@@ -14,13 +14,13 @@ let
    else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-device-libs";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
    repo = "ROCm-Device-Libs";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-f6/LAhJ2mBDO1/JloHvl7MJyDo3WutbXd4IDknA9nzM=";
+    hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU=";
  };

  patches = [ ./cmake.patch ];
@@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "rocm-docs-core";
-  version = "0.25.0";
+  version = "0.26.0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
    repo = "rocm-docs-core";
    rev = "v${version}";
-    hash = "sha256-kOsoIK0vaPT60hGr960s5vc0eloSr5CECtd8Dy24YuM=";
+    hash = "sha256-Mr6/Ne6P+TapoCqN7xkKMNse3fTaIAvvLmMl0kVg7Vs=";
  };

  buildInputs = [ setuptools ];
@@ -16,7 +16,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-runtime";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-smi";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
    repo = "rocm_smi_lib";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-swCRO4PBMBJ6fO2bLq/xxFZIYw2IgiFB490wsU8Wm2o=";
+    hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU=";
  };

  patches = [ ./cmake.patch ];
@@ -10,7 +10,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocm-thunk";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
@@ -18,7 +18,7 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "5.7.0";
+  version = "5.7.1";
  pname = "rocminfo";

  src = fetchFromGitHub {
@@ -32,7 +32,7 @@ let
    else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "rocmlir${suffix}";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocprim";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -33,13 +33,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocprofiler";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
    repo = "rocprofiler";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-ue/2uiLbhOv/5XY4cIJuZ8DUMRhniYgxolq9xMwO1FY=";
+    hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y=";
  };

  nativeBuildInputs = [
@@ -11,7 +11,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocr-debug-agent";
-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "ROCm-Developer-Tools";
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocrand";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCmSoftwarePlatform";
    repo = "rocRAND";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-cFH38fLD8tk6V9JERcqHokuwKemdDgHCZ75bZNEqmdY=";
+    hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY=";
    fetchSubmodules = true; # For inline hipRAND
  };

@@ -18,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocsolver";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -19,7 +19,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocsparse";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocthrust";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCmSoftwarePlatform";
    repo = "rocThrust";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-i0XCtJth8caVQT5oUgsxWXNzcePa02Gb7AQsthYTOv8=";
+    hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc=";
  };

  nativeBuildInputs = [
@@ -3,14 +3,13 @@
 , fetchFromGitHub
 , rocmUpdateScript
 , cmake
-, clang
 , clr
 , rocm-device-libs
-, rocprofiler
 , libxml2
 , doxygen
 , graphviz
 , gcc-unwrapped
+, libbacktrace
 , rocm-runtime
 , python3Packages
 , buildDocs ? false # Nothing seems to be generated, so not making the output
@@ -19,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "roctracer";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -38,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
-    clang
    clr
  ] ++ lib.optionals buildDocs [
    doxygen
@@ -46,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    rocprofiler
    libxml2
+    libbacktrace
    python3Packages.python
    python3Packages.cppheaderparser
  ];
@@ -18,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocwmma";
-  version = "5.7.0";
+  version = "5.7.1";

  outputs = [
    "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCmSoftwarePlatform";
    repo = "rocWMMA";
    rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-/EuBBSjhlMwJfsqYvRb9oCNC0hNkEa1JH1KUDLMSs08=";
+    hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs=";
  };

  patches = lib.optionals (buildTests || buildBenchmarks) [
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
    else "cpu"
  );

-  version = "5.7.0";
+  version = "5.7.1";

  src = fetchFromGitHub {
    owner = "GPUOpen-ProfessionalCompute-Libraries";
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "tensile";
-  version = "5.7.0";
+  version = "5.7.1";
  format = "pyproject";

  src = fetchFromGitHub {
@@ -5,8 +5,8 @@
 { name ? ""
 , owner ? ""
 , repo ? ""
-, page ? "releases?per_page=1"
-, filter ? ".[0].tag_name | split(\"-\") | .[1]"
+, page ? "releases/latest"
+, filter ? ".tag_name | split(\"-\") | .[1]"
 }:

 let