Unverified Commit 33a5eb7b authored by Madoura's avatar Madoura
Browse files

rocm-related: 5.3.3 → 5.4.0 

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
parent 93a67895

pkgs/development/compilers/hip/default.nix

+4 −7
Original line number Diff line number Diff line
@@ -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 ];

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

+2 −2
Original line number Diff line number Diff line 
{ 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 {

pkgs/development/compilers/llvm/rocm/install-symlinks.patch

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
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}"

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

+0 −4
Original line number Diff line number Diff line
@@ -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 \

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "clang-ocl";

  version = "5.3.3";

  version = "5.4.0";



  src = fetchFromGitHub {

    owner = "RadeonOpenCompute";