Unverified Commit 6bb3a9ba authored by Madoura's avatar Madoura
Browse files

rocm-related: use finalAttrs 

hip: use finalAttrs

rocm-llvm: use finalAttrs

clang-ocl: use finalAttrs

composable_kernel: use finalAttrs

hipcub: use finalAttrs

hipsparse: use finalAttrs

miopengemm: use finalAttrs

rccl: use finalAttrs

rocblas: use finalAttrs

rocclr: use finalAttrs

rocfft: use finalAttrs

rocm-comgr: use finalAttrs

rocm-device-libs: use finalAttrs

rocm-opencl-runtime: use finalAttrs

rocm-runtime: use finalAttrs

rocm-thunk: use finalAttrs

rocmlir: use finalAttrs

rocprim: use finalAttrs

rocsparse: use finalAttrs

rocthrust: use finalAttrs

rocm-cmake: use finalAttrs

rocminfo: use finalAttrs

rocm-smi: use finalAttrs
parent 0190a12a

pkgs/development/compilers/hip/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ 
}:



let

  hip = stdenv.mkDerivation rec {

  hip = stdenv.mkDerivation (finalAttrs: {

    pname = "hip";

    version = "5.3.3";



    src = fetchFromGitHub {

      owner = "ROCm-Developer-Tools";

      repo = "HIP";

      rev = "rocm-${version}";

      rev = "rocm-${finalAttrs.version}";

      hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE=";

    };
@@ -106,16 +106,16 @@ let 
      maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;

      platforms = platforms.linux;

    };

  };

  });

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "hip";

  version = "5.3.3";



  src = fetchFromGitHub {

    owner = "ROCm-Developer-Tools";

    repo = "hipamd";

    rev = "rocm-${version}";

    rev = "rocm-${finalAttrs.version}";

    hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4=";

  };
@@ -203,4 +203,4 @@ stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;

    platforms = platforms.linux;

  };

}
 
})

pkgs/development/compilers/llvm/rocm/llvm.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ let 
    if stdenv.isx86_64 then "X86"

    else if stdenv.isAarch64 then "AArch64"

    else throw "Unsupported ROCm LLVM platform";

in stdenv.mkDerivation rec {

in stdenv.mkDerivation (finalAttrs: {

  inherit src version;



  pname = "rocm-llvm";
@@ -88,4 +88,4 @@ in stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;

    platforms = platforms.linux;

  };

}
 
})

pkgs/development/libraries/clang-ocl/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -8,15 +8,15 @@ 
, clang

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "clang-ocl";

  rocmVersion = "5.3.3";

  version = rocmVersion;

  version = finalAttrs.rocmVersion;



  src = fetchFromGitHub {

    owner = "RadeonOpenCompute";

    repo = "clang-ocl";

    rev = "rocm-${rocmVersion}";

    rev = "rocm-${finalAttrs.rocmVersion}";

    hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0=";

  };
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/RadeonOpenCompute/clang-ocl";

    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

    broken = rocmVersion != clang.version;

    broken = finalAttrs.rocmVersion != clang.version;

  };

}
 
})

pkgs/development/libraries/composable_kernel/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ assert buildTests -> gtest != null; 
# Try removing this next update

assert buildTests == false;



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "composable_kernel";

  version = "unstable-2022-11-19";
@@ -90,4 +90,4 @@ stdenv.mkDerivation rec { 
    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

  };

}
 
})

pkgs/development/libraries/hipcub/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ assert buildTests -> gtest != null; 
assert buildBenchmarks -> gbenchmark != null;



# CUB can also be used as a backend instead of rocPRIM.

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "hipcub";

  repoVersion = "2.12.0";

  rocmVersion = "5.3.3";

  version = "${repoVersion}-${rocmVersion}";

  version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";



  outputs = [

    "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "ROCmSoftwarePlatform";

    repo = "hipCUB";

    rev = "rocm-${rocmVersion}";

    rev = "rocm-${finalAttrs.rocmVersion}";

    hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g=";

  };
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB";

    license = with licenses; [ bsd3 ];

    maintainers = teams.rocm.members;

    broken = rocmVersion != hip.version;

    broken = finalAttrs.rocmVersion != hip.version;

  };

}
 
})