rocm-related: fixup for ROCm 5.7.0

blender: fixup for ROCm 5.7.0

opensycl: fixup for ROCm 5.7.0

magma: fixup for ROCm 5.7.0

torch: fixup for ROCm 5.7.0

pkgs/applications/misc/blender/default.nix

@@ -6,7 +6,7 @@
 , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? config.cudaSupport, cudaPackages ? { }
-, hipSupport ? false, hip # comes with a significantly larger closure size
+, hipSupport ? false, rocmPackages # comes with a significantly larger closure size
 , colladaSupport ? true, opencollada
 , spaceNavSupport ? stdenv.isLinux, libspnav
 , makeWrapper
@@ -103,8 +103,8 @@ stdenv.mkDerivation (finalAttrs: rec {
  substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
  '') +
  (lib.optionalString hipSupport ''
- substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"'
- substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"'
+ substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
+ substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
  '');
 
  cmakeFlags =

pkgs/development/compilers/opensycl/default.nix

@@ -2,15 +2,13 @@
 , fetchFromGitHub
 , llvmPackages_15
 , lld_15
-, rocm-device-libs
 , python3
-, rocm-runtime
 , cmake
 , boost
 , libxml2
 , libffi
 , makeWrapper
-, hip
+, rocmPackages
 , rocmSupport ? false
 }:
 let
@@ -40,8 +38,8 @@ stdenv.mkDerivation rec {
  llvmPackages_15.libclang.dev
  llvmPackages_15.llvm
  ] ++ lib.optionals rocmSupport [
- hip
- rocm-runtime
+ rocmPackages.clr
+ rocmPackages.rocm-runtime
  ];
 
  # opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually
@@ -55,7 +53,7 @@ stdenv.mkDerivation rec {
  --add-flags "-L${llvmPackages_15.openmp}/lib" \
  --add-flags "-I${llvmPackages_15.openmp.dev}/include" \
  '' + lib.optionalString rocmSupport ''
- --add-flags "--rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode"
+ --add-flags "--rocm-device-lib-path=${rocmPackages.rocm-device-libs}/amdgcn/bitcode"
  '';
 
  meta = with lib; {

pkgs/development/libraries/science/math/magma/generic.nix

@@ -18,15 +18,12 @@
 , gfortran
 , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities
 , gpuTargets ? [ ] # Non-CUDA targets, that is HIP
-, hip
-, hipblas
-, hipsparse
+, rocmPackages
 , lapack
 , lib
 , libpthreadstubs
 , magmaRelease
 , ninja
-, openmp
 , rocmSupport ? false
 , static ? false
 , stdenv
@@ -47,7 +44,7 @@ let
  # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches.
  # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must
  # remove it.
- rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets;
+ rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets;
  supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets;
  unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches;
 
@@ -125,10 +122,10 @@ stdenv.mkDerivation {
  ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [
  cuda_profiler_api.dev # <cuda_profiler_api.h>
  ]) ++ lists.optionals rocmSupport [
- hip
- hipblas
- hipsparse
- openmp
+ rocmPackages.clr
+ rocmPackages.hipblas
+ rocmPackages.hipsparse
+ rocmPackages.llvm.openmp
  ];
 
  cmakeFlags = [
@@ -142,8 +139,8 @@ stdenv.mkDerivation {
  "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++"
  "-DMAGMA_ENABLE_CUDA=ON"
  ] ++ lists.optionals rocmSupport [
- "-DCMAKE_C_COMPILER=${hip}/bin/hipcc"
- "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc"
+ "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc"
+ "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc"
  "-DMAGMA_ENABLE_HIP=ON"
  ];
 

pkgs/development/python-modules/torch/default.nix

@@ -44,10 +44,10 @@
  # ROCm dependencies
  rocmSupport ? false,
  gpuTargets ? [ ],
- openmp, rocm-core, hip, rccl, miopen, miopengemm, rocrand, rocblas,
+ openmp, rocm-core, clr, rccl, miopen, miopengemm, rocrand, rocblas,
  rocfft, rocsparse, hipsparse, rocthrust, rocprim, hipcub, roctracer,
  rocsolver, hipfft, hipsolver, hipblas, rocminfo, rocm-thunk, rocm-comgr,
- rocm-device-libs, rocm-runtime, rocm-opencl-runtime, hipify
+ rocm-device-libs, rocm-runtime, hipify
 }:
 
 let
@@ -89,7 +89,7 @@ let
  else if cudaSupport then
  gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities
  else if rocmSupport then
- hip.gpuTargets
+ clr.gpuTargets
  else
  throw "No GPU targets specified"
  );
@@ -98,11 +98,11 @@ let
  name = "rocm-merged";
 
  paths = [
- rocm-core hip rccl miopen miopengemm rocrand rocblas
+ rocm-core clr rccl miopen miopengemm rocrand rocblas
  rocfft rocsparse hipsparse rocthrust rocprim hipcub
  roctracer rocfft rocsolver hipfft hipsolver hipblas
  rocminfo rocm-thunk rocm-comgr rocm-device-libs
- rocm-runtime rocm-opencl-runtime hipify
+ rocm-runtime clr.icd hipify
  ];
  };
 
@@ -170,7 +170,7 @@ in buildPythonPackage rec {
  # Strangely, this is never set in cmake
  substituteInPlace cmake/public/LoadHIP.cmake \
  --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \
- "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." hip.version))})"
+ "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." clr.version))})"
  ''
  # Detection of NCCL version doesn't work particularly well when using the static binary.
  + lib.optionalString cudaSupport ''

pkgs/top-level/all-packages.nix

@@ -30666,7 +30666,6 @@ with pkgs;
  # LLVM 11 crashes when compiling GHOST_SystemCocoa.mm
  stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv;
  inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;
- inherit (rocmPackages) hip;
  };
 
  blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix { };
@@ -39222,10 +39221,7 @@ with pkgs;
 
  lie = callPackage ../applications/science/math/LiE { };
 
- inherit (callPackage ../development/libraries/science/math/magma {
- inherit (rocmPackages.llvm) openmp;
- inherit (rocmPackages) hip hipblas hipsparse;
- }) magma magma_2_7_2 magma_2_6_2;
+ inherit (callPackage ../development/libraries/science/math/magma { }) magma magma_2_7_2 magma_2_6_2;
 
  magma-cuda = magma.override {
  cudaSupport = true;
@@ -39236,8 +39232,7 @@ with pkgs;
  static = true;
  };
 
- # TODO:AMD won't compile with anything newer than 2.6.2 -- it fails at the linking stage.
- magma-hip = magma_2_6_2.override {
+ magma-hip = magma.override {
  cudaSupport = false;
  rocmSupport = true;
  };