b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #102602 from danieldk/rocm-3.9.0

Browse source 
Update ROCm to 3.9.0
This commit is contained in:
Daniël de Kok 2020-11-05 06:59:28 +01:00 committed by GitHub
parent bd01bae1e9 92719cca78
commit 341aa3d3e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/llvm/rocm/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
let
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";
rev = "rocm-${version}";
sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6";
sha256 = "01ljx6mhix3z2pgddgn0ymhrsbigs1nqlz3kkwkr6p2igprrly9f";
};
in rec {
clang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/rocm/lld.nix
View file

@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
postInstall = ''
moveToOutput include "$dev"
moveToOutput lib "$dev"
# Fix lld binary path for CMake.
substituteInPlace "$dev/lib/cmake/lld/LLDTargets-release.cmake" \
--replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld"
'';
meta = with stdenv.lib; {

7
pkgs/development/libraries/rocclr/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocclr";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "ROCclr";
rev = "rocm-${version}";
sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf";
sha256 = "193pd6lbnfjrmqsrlvkpadxxi908a9r0c41y8x1bkbbaviad39q0";
};
nativeBuildInputs = [ cmake rocm-cmake ];
@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
];
preFixup = ''
# Work around broken cmake files
ln -s $out/include/compiler/lib/include/* $out/include
ln -s $out/include/elf/elfio $out/include/elfio
substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \
--replace "/build/source/build" "$out"
'';

4
pkgs/development/libraries/rocm-comgr/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rocm-comgr";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-CompilerSupport";
rev = "rocm-${version}";
sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1";
sha256 = "1lwgr6x2b6jisc2nxvr9m24zrc7f2vcgrbkj9sf2blpha61xgk14";
};
sourceRoot = "source/lib/comgr";

4
pkgs/development/libraries/rocm-device-libs/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "rocm-device-libs";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-Device-Libs";
rev = "rocm-${version}";
sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4";
sha256 = "1nil0nhlkszslgvqhim5vmcp3flfafydviq0zk7db8i6z17kq090";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/rocm-opencl-runtime/default.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "rocm-opencl-runtime";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${version}";
sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm";
sha256 = "1qsgswm1wl2wknhgy6c9l6dnj0z1kwddimdzjmvjcpyxq987y2gv";
};
nativeBuildInputs = [ cmake rocm-cmake ];

6
pkgs/development/libraries/rocm-runtime/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "rocm-runtime";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCR-Runtime";
rev = "rocm-${version}";
sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c";
sha256 = "034qbqznfligg4lwd95zmqa7lwcda720zbfv066nqvarlcml0kr6";
};
sourceRoot = "source/src";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ clang-unwrapped elfutils llvm ];
cmakeFlags = [
"-DBITCODE_DIR=${rocm-device-libs}/lib"
"-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode"
"-DCMAKE_PREFIX_PATH=${rocm-thunk}"
];

4
pkgs/development/libraries/rocm-thunk/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rocm-thunk";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${version}";
sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k";
sha256 = "0xkp50ik7miz9whywnmiiqiamc7g8flfr9g8c02kxr0cay1in6cj";
};
preConfigure = ''

4
pkgs/development/tools/build-managers/rocm-cmake/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rocm-cmake";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm-cmake";
rev = "rocm-${version}";
sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja";
sha256 = "13j7gmcy1j6qsydgccmgiacg6sj38l5mlwn4ck8qizl0cpc14gfm";
};
nativeBuildInputs = [ cmake ];

4
pkgs/tools/system/rocm-smi/default.nix
View file

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "rocm-smi";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROC-smi";
rev = "rocm-${version}";
sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz";
sha256 = "190x31s7mjpyp7hr6cgdnvn2s20qj3sqcxywycjm2i9ar429l2ni";
};
format = "other";