Unverified Commit d9a5323e authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

Merge pull request #203412 from Madouura/pr/rocm-misc

parents 115fc628 30a6bef0

pkgs/development/compilers/hip/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru.updateScript = writeScript "update.sh" ''

    #!/usr/bin/env nix-shell

    #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github

    version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"

    version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"

    current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)"

    if [[ "$version" != "$current_version" ]]; then

      tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")"
@@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { 
      echo hip already up-to-date

    fi



    version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"

    version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"

    current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)"

    if [[ "$version" != "$current_version" ]]; then

      tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")"

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    #!/usr/bin/env nix-shell

    #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github



    version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

    version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

    current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)"

    if [[ "$version" != "$current_version" ]]; then

      tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")"

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

+6 −6
Original line number Diff line number Diff line
@@ -10,13 +10,12 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "clang-ocl";

  rocmVersion = "5.3.3";

  version = finalAttrs.rocmVersion;

  version = "5.3.3";



  src = fetchFromGitHub {

    owner = "RadeonOpenCompute";

    repo = "clang-ocl";

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

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

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

  };
@@ -38,8 +37,9 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru.updateScript = writeScript "update.sh" ''

    #!/usr/bin/env nix-shell

    #!nix-shell -i bash -p curl jq common-updater-scripts

    rocmVersion="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

    update-source-version clang-ocl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion

    version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \

      -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

    update-source-version clang-ocl "$version" --ignore-same-hash

  '';



  meta = with lib; {
@@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://github.com/RadeonOpenCompute/clang-ocl";

    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

    broken = finalAttrs.rocmVersion != clang.version;

    broken = finalAttrs.version != clang.version;

  };

})

pkgs/development/libraries/composable_kernel/default.nix

+8 −11
Original line number Diff line number Diff line
@@ -5,19 +5,12 @@ 
, rocm-cmake

, hip

, openmp

, gtest ? null

, gtest

, buildTests ? false

, buildExamples ? false

, gpuTargets ? null # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ]

, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ]

}:



assert buildTests -> gtest != null;



# Several tests seem to either not compile or have a race condition

# Undefined reference to symbol '_ZTIN7testing4TestE'

# Try removing this next update

assert buildTests == false;



stdenv.mkDerivation (finalAttrs: {

  pname = "composable_kernel";

  version = "unstable-2022-11-19";
@@ -54,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { 
  cmakeFlags = [

    "-DCMAKE_C_COMPILER=hipcc"

    "-DCMAKE_CXX_COMPILER=hipcc"

  ] ++ lib.optionals (gpuTargets != null) [

    "-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"

  ] ++ lib.optionals (gpuTargets != [ ]) [

    "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"

  ];



  # No flags to build selectively it seems...
@@ -89,5 +82,9 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";

    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

    # Several tests seem to either not compile or have a race condition

    # Undefined reference to symbol '_ZTIN7testing4TestE'

    # Try removing this next update

    broken = buildTests;

  };

})

pkgs/development/libraries/hipcub/default.nix

+8 −15
Original line number Diff line number Diff line
@@ -9,21 +9,16 @@ 
, rocm-comgr

, rocprim

, hip

, gtest ? null

, gbenchmark ? null

, gtest

, gbenchmark

, buildTests ? false

, buildBenchmarks ? false

}:



assert buildTests -> gtest != null;

assert buildBenchmarks -> gbenchmark != null;



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

stdenv.mkDerivation (finalAttrs: {

  pname = "hipcub";

  repoVersion = "2.12.0";

  rocmVersion = "5.3.3";

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

  version = "5.3.3";



  outputs = [

    "out"
@@ -36,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromGitHub {

    owner = "ROCmSoftwarePlatform";

    repo = "hipCUB";

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

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

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

  };
@@ -84,11 +79,9 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru.updateScript = writeScript "update.sh" ''

    #!/usr/bin/env nix-shell

    #!nix-shell -i bash -p curl jq common-updater-scripts

    json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1")"

    repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"

    rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

    update-source-version hipcub "$repoVersion" --ignore-same-hash --version-key=repoVersion

    update-source-version hipcub "$rocmVersion" --ignore-same-hash --version-key=rocmVersion

    version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \

      -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

    update-source-version hipcub "$version" --ignore-same-hash

  '';



  meta = with lib; {
@@ -96,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB";

    license = with licenses; [ bsd3 ];

    maintainers = teams.rocm.members;

    broken = finalAttrs.rocmVersion != hip.version;

    broken = finalAttrs.version != hip.version;

  };

})