BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rocm-related: 5.3.3 → 5.4.0

Browse source 
clang-ocl: 5.3.3 → 5.4.0

hip: 5.3.3 → 5.4.0

hipsparse: 5.3.3 → 5.4.0

miopengemm: 5.3.3 → 5.4.0

hipcub: 5.3.3 → 5.4.0

rccl: 5.3.3 → 5.4.0

rocblas: 5.3.3 → 5.4.0

rocfft: 5.3.3 → 5.4.0

miopen: 5.3.3 → 5.4.0

rocm-comgr: 5.3.3 → 5.4.0

rocclr: 5.3.3 → 5.4.0

rocm-device-libs: 5.3.3 → 5.4.0

rocm-cmake: 5.3.3 → 5.4.0

rocm-runtime: 5.3.3 → 5.4.0

rocm-smi: 5.3.3 → 5.4.0

rocm-thunk: 5.3.3 → 5.4.0

rocm-opencl-runtime: 5.3.3 → 5.4.0

llvmPackages_rocm.llvm: 5.3.3 → 5.4.0

rocminfo: 5.3.3 → 5.4.0

rocmlir: 5.3.3 → 5.4.0

rocprim: 5.3.3 → 5.4.0

rocwmma: 5.3.3 → 5.4.0

rocrand: 5.3.3 → 5.4.0

rocsparse: 5.3.3 → 5.4.0

rocthrust: 5.3.3 → 5.4.0

tensile: 5.3.3 → 5.4.0

rocm-llvm: remove obsolete patch

hip: remove obsolete substituteInPlace

rocmlir: fixup build inputs and cmakeFlags

miopen: add nlohmann_json
This commit is contained in:
Madoura 2022-12-04 00:26:46 +00:00
parent 93a6789538
commit 33a5eb7be1
No known key found for this signature in database
GPG key ID: 3201136B3DB072F9
29 changed files with 68 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/compilers/hip/default.nix
View file

@ -30,13 +30,13 @@
let
hip = stdenv.mkDerivation (finalAttrs: {
pname = "hip";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "HIP";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE=";
hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw=";
};
patches = [
@ -60,9 +60,6 @@ let
-i "$f"
done
substituteInPlace bin/hip_embed_pch.sh \
--replace '$LLVM_DIR/bin/' ""
sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py
sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \
@ -110,13 +107,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hip";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "hipamd";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4=";
hash = "sha256-VL0vZVv099pZPX0J2pXPFvrhkVO/b6X+ZZDaD9B1hYI=";
};
nativeBuildInputs = [ cmake python3 makeWrapper perl ];

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

@ -1,12 +1,12 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:
let
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";
rev = "rocm-${version}";
hash = "sha256-IKo7N8wWvh5PBrZ2mh1Vu5s3uUXhanqYtC4qLV/+JBs=";
hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno=";
};
in rec {
clang = wrapCCWith rec {

23
pkgs/development/compilers/llvm/rocm/install-symlinks.patch
View file

@ -1,23 +0,0 @@
diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake
index b5c35f706cb7..ac25e40b1436 100644
--- a/cmake/modules/LLVMInstallSymlink.cmake
+++ b/cmake/modules/LLVMInstallSymlink.cmake
@@ -4,11 +4,16 @@
include(GNUInstallDirs)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake/Modules" ${CMAKE_MODULE_PATH})
+include(ExtendPath)
+
function(install_symlink name target outdir)
set(DESTDIR $ENV{DESTDIR})
- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}")
+ message(STATUS "Creating ${name} at ${bindir} (${CMAKE_MODULE_PATH})")
+ extend_path(prefixed_outdir "${CMAKE_INSTALL_PREFIX}" "${outdir}")
+ set(bindir "${DESTDIR}${prefixed_outdir}")
- message(STATUS "Creating ${name}")
+ message(STATUS "Creating ${name} at ${bindir}")
execute_process(
COMMAND "${CMAKE_COMMAND}" -E create_symlink "${target}" "${name}"

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

@ -52,10 +52,6 @@ in stdenv.mkDerivation (finalAttrs: {
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
];
patches = [
./install-symlinks.patch
];
postPatch = ''
patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh
substituteInPlace ../clang/cmake/modules/CMakeLists.txt \

2
pkgs/development/libraries/clang-ocl/default.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "clang-ocl";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";

4
pkgs/development/libraries/hipcub/default.nix
View file

@ -18,7 +18,7 @@
# CUB can also be used as a backend instead of rocPRIM.
stdenv.mkDerivation (finalAttrs: {
pname = "hipcub";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "hipCUB";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g=";
hash = "sha256-ctt7jbVqHNHcOm/Lhg0IFbMZ6JChnMylG7fJgZtzFuM=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/hipsparse/default.nix
View file

@ -18,7 +18,7 @@
# This can also use cuSPARSE as a backend instead of rocSPARSE
stdenv.mkDerivation (finalAttrs: {
pname = "hipsparse";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "hipSPARSE";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c=";
hash = "sha256-JWjmMvqIm4in1aPq2UgYmL0eWjrrRBiU6vH3FnCZZ40=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/miopen/default.nix
View file

@ -22,6 +22,7 @@
, boost
, sqlite
, bzip2
, nlohmann_json
, texlive
, doxygen
, sphinx
@ -57,7 +58,7 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "miopen";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -71,7 +72,7 @@ in stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "MIOpen";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-5/JitdGJ0afzK4pGOOywRLsB3/Thc6/71sRkKIxf2Lg=";
hash = "sha256-EOe3LUafOeVLzRoahPdS6DMZ/+6WWeVI7jG25zfPrx8=";
};
nativeBuildInputs = [
@ -97,6 +98,7 @@ in stdenv.mkDerivation (finalAttrs: {
boost
sqlite
bzip2
nlohmann_json
] ++ lib.optionals buildDocs [
latex
doxygen

2
pkgs/development/libraries/miopengemm/default.nix
View file

@ -32,7 +32,7 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "miopengemm";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"

4
pkgs/development/libraries/rccl/default.nix
View file

@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rccl";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rccl";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk=";
hash = "sha256-NbHzRmrUe4kJwkHZtZ+zHjIy2uk+dpN9caE0L5hUnbc=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/rocblas/default.nix
View file

@ -30,13 +30,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocblas";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocBLAS";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo=";
hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60=";
};
# We currently need this patch due to faulty toolchain includes

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

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocclr";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "ROCclr";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E=";
hash = "sha256-tYFoGafOsJYnRQaOLAaFix6tPD0QPTidOtOicPxP2Vk=";
};
patches = [

4
pkgs/development/libraries/rocfft/default.nix
View file

@ -21,7 +21,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocfft";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rocFFT";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM=";
hash = "sha256-XlpWT6PS+VpJjA4iG8yaiFRxE63kugNG1ZyQXoQVJL8=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-comgr";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-CompilerSupport";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg=";
hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs=";
};
sourceRoot = "source/lib/comgr";

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

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-device-libs";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-Device-Libs";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU=";
hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk=";
};
nativeBuildInputs = [ cmake ];

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

@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-opencl-runtime";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8=";
hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I=";
};
nativeBuildInputs = [ cmake rocm-cmake ];

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

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-runtime";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCR-Runtime";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI=";
hash = "sha256-M9kv1Oe5ZZfd9H/+KUJUoK9L1EdyS2qRp2mJDK0dnPE=";
};
sourceRoot = "source/src";

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

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-thunk";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k=";
hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE=";
};
preConfigure = ''

20
pkgs/development/libraries/rocmlir/default.nix
View file

@ -3,32 +3,40 @@
, fetchFromGitHub
, writeScript
, cmake
, hip
, clang
, git
, libxml2
, libedit
, python3
}:
stdenv.mkDerivation (finalAttrs: {
pname = "rocmlir";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocMLIR";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ=";
hash = "sha256-MokE7Ej8mLHTQeLYvKr7PPlsNG6ul91fqfXDlGu5JpI=";
};
nativeBuildInputs = [
cmake
hip
clang
];
buildInputs = [
git
libxml2
libedit
python3
];
cmakeFlags = [
"-DBUILD_FAT_LIBMLIRMIOPEN=ON"
"-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++"
"-DBUILD_FAT_LIBROCKCOMPILER=ON"
];
passthru.updateScript = writeScript "update.sh" ''
@ -44,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
license = with licenses; [ asl20 ];
maintainers = teams.rocm.members;
broken = finalAttrs.version != hip.version;
broken = finalAttrs.version != clang.version;
};
})

4
pkgs/development/libraries/rocprim/default.nix
View file

@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocprim";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rocPRIM";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U=";
hash = "sha256-VGTrMllQguIJKexdQNXC07KX7TxU/e5oT6VZdlSRcQY=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/rocrand/default.nix
View file

@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocrand";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rocRAND";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-awQLqPmhVxegrqqSoC8fiCQJ33bPKZlljSAXnHVcIZo=";
hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY=";
fetchSubmodules = true; # For inline hipRAND
};

4
pkgs/development/libraries/rocsparse/default.nix
View file

@ -21,7 +21,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocsparse";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rocSPARSE";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0=";
hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/rocthrust/default.nix
View file

@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocthrust";
version = "5.3.3";
version = "5.4.0";
# Comment out these outputs until tests/benchmarks are fixed (upstream?)
# outputs = [
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rocThrust";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw=";
hash = "sha256-3OcJUL6T1HJz6TQb1//lumsTxqfwbWbQ4lGuZoKmqbY=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/rocwmma/default.nix
View file

@ -34,7 +34,7 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "rocwmma";
version = "5.3.3";
version = "5.4.0";
outputs = [
"out"
@ -50,7 +50,7 @@ in stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform";
repo = "rocWMMA";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-wU3R1XGTy7uFbceUyE0wy+XayicuyJIVfd1ih6pbTN0=";
hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM=";
};
patches = lib.optionals buildTests [

4
pkgs/development/libraries/tensile/default.nix
View file

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "tensile";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "Tensile";
rev = "rocm-${version}";
hash = "sha256-6A7REYdIw/ZmjrJh7B+wCXZMleh4bf04TFpRItPtctA=";
hash = "sha256-W6yr6mptfsiJSSzPCImgqI1EmsUv+l99SjqkoZsOjag=";
};
buildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-cmake";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm-cmake";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc=";
hash = "sha256-JarQqiiZ36WV1d6vyQD546GN1EtoKLcdvcZsG3QWD2Y=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/tools/rocminfo/default.nix
View file

@ -7,7 +7,7 @@
# compilers to determine the desired target.
, defaultTargets ? []}:
stdenv.mkDerivation (finalAttrs: {
version = "5.3.3";
version = "5.4.0";
pname = "rocminfo";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-smi";
version = "5.3.3";
version = "5.4.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm_smi_lib";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ=";
hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE=";
};
nativeBuildInputs = [ cmake wrapPython ];

4
pkgs/top-level/all-packages.nix
View file

@ -15108,7 +15108,9 @@ with pkgs;
rocminfo = callPackage ../development/tools/rocminfo { };
rocmlir = callPackage ../development/libraries/rocmlir { };
rocmlir = callPackage ../development/libraries/rocmlir {
inherit (llvmPackages_rocm) clang;
};
rocprim = callPackage ../development/libraries/rocprim { };