Unverified Commit 30a6bef0 authored by Madoura's avatar Madoura
Browse files

rocm-related: deprecate rocmVersion and repoVersion 

clang-ocl: deprecate rocmVersion and repoVersion

hipcub: deprecate rocmVersion and repoVersion

hipsparse: deprecate rocmVersion and repoVersion

miopen: deprecate rocmVersion and repoVersion

miopengemm: deprecate rocmVersion and repoVersion

rccl: deprecate rocmVersion and repoVersion

rocblas: deprecate rocmVersion and repoVersion

rocfft: deprecate rocmVersion and repoVersion

rocmlir: deprecate rocmVersion and repoVersion

rocprim: deprecate rocmVersion and repoVersion

rocrand: deprecate rocmVersion and repoVersion

rocsparse: deprecate rocmVersion and repoVersion

rocthrust: deprecate rocmVersion and repoVersion

rocwmma: deprecate rocmVersion and repoVersion

tensile: deprecate rocmVersion and repoVersion
parent 78c7e665

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 ''${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 "$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/hipcub/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
# 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"
@@ -33,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromGitHub {

    owner = "ROCmSoftwarePlatform";

    repo = "hipCUB";

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

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

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

  };
@@ -81,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 ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -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; {
@@ -93,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;

  };

})

pkgs/development/libraries/hipsparse/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
# This can also use cuSPARSE as a backend instead of rocSPARSE

stdenv.mkDerivation (finalAttrs: {

  pname = "hipsparse";

  repoVersion = "2.3.1";

  rocmVersion = "5.3.3";

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

  version = "5.3.3";



  outputs = [

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

    owner = "ROCmSoftwarePlatform";

    repo = "hipSPARSE";

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

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

    hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c=";

  };
@@ -117,11 +115,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 ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/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 hipsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion

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

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

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

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

  '';



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

    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

    broken = finalAttrs.rocmVersion != hip.version;

    broken = finalAttrs.version != hip.version;

  };

})

pkgs/development/libraries/miopen/default.nix

+6 −9
Original line number Diff line number Diff line
@@ -57,11 +57,7 @@ let 
  };

in stdenv.mkDerivation (finalAttrs: {

  pname = "miopen";

  # We have to manually specify the repoVersion for now

  # Find the github release or `-- MIOpen_VERSION= X.X.X` in the build log

  repoVersion = "2.18.0";

  rocmVersion = "5.3.3";

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

  version = "5.3.3";



  outputs = [

    "out"
@@ -74,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromGitHub {

    owner = "ROCmSoftwarePlatform";

    repo = "MIOpen";

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

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

    hash = "sha256-5/JitdGJ0afzK4pGOOywRLsB3/Thc6/71sRkKIxf2Lg=";

  };
@@ -184,8 +180,9 @@ in 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 ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpen/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

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

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

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

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

  '';



  meta = with lib; {
@@ -193,7 +190,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen";

    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

    broken = finalAttrs.rocmVersion != hip.version;

    broken = finalAttrs.version != hip.version;

    # MIOpen will produce a very large output due to KDBs fetched

    # Also possibly in the future because of KDB generation

    hydraPlatforms = [ ];

pkgs/development/libraries/miopengemm/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ let 
  };

in stdenv.mkDerivation (finalAttrs: {

  pname = "miopengemm";

  rocmVersion = "5.3.3";

  version = finalAttrs.rocmVersion;

  version = "5.3.3";



  outputs = [

    "out"
@@ -48,7 +47,7 @@ in stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromGitHub {

    owner = "ROCmSoftwarePlatform";

    repo = "MIOpenGEMM";

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

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

    hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc=";

  };
@@ -114,8 +113,9 @@ in 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 ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"

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

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

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

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

  '';



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

    license = with licenses; [ mit ];

    maintainers = teams.rocm.members;

    broken = finalAttrs.rocmVersion != clang.version;

    broken = finalAttrs.version != clang.version;

  };

})