Unverified Commit 4e461fd2 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #261578 from Madouura/pr/rocm

rocmPackages: 5.7.0 -> 5.7.1
parents 18618c99 6f3f5b64
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@

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

  src = fetchFromGitHub {
    owner = "RadeonOpenCompute";
+4 −2
Original line number Diff line number Diff line
@@ -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 = {
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@

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

  outputs = [
    "out"
+1 −2
Original line number Diff line number Diff line
@@ -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
Loading