Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rocmPackages_5: disallow further version upgrades, fixup links #274980

Merged
merged 4 commits into from
Dec 22, 2023

Conversation

Madouura
Copy link
Contributor

@Madouura Madouura commented Dec 17, 2023

Description of changes

Tracking: #197885
Preparation PR for ROCm 6.0.0.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

This is mainly to prevent automatic update scripts from updating and to prevent accidental breaking merges.

Any further upgrades should go into 'rocmPackages_6'.
@Madouura
Copy link
Contributor Author

Result of nixpkgs-review pr 274980 run on x86_64-linux 1

12 packages marked as broken and skipped:
  • rocmPackages.llvm.flang
  • rocmPackages.llvm.flang.doc
  • rocmPackages.llvm.flang.info
  • rocmPackages.llvm.flang.man
  • rocmPackages.rdc
  • rocmPackages.rdc.doc
  • rocmPackages_5.llvm.flang
  • rocmPackages_5.llvm.flang.doc
  • rocmPackages_5.llvm.flang.info
  • rocmPackages_5.llvm.flang.man
  • rocmPackages_5.rdc
  • rocmPackages_5.rdc.doc
60 packages built:
  • blender-hip
  • magma (magma-hip ,magma_2_7_2)
  • magma_2_6_2
  • opensyclWithRocm
  • python310Packages.torchWithRocm
  • python310Packages.torchWithRocm.cxxdev
  • python310Packages.torchWithRocm.dev
  • python310Packages.torchWithRocm.dist
  • python310Packages.torchWithRocm.lib
  • python311Packages.torchWithRocm
  • python311Packages.torchWithRocm.cxxdev
  • python311Packages.torchWithRocm.dev
  • python311Packages.torchWithRocm.dist
  • python311Packages.torchWithRocm.lib
  • rocmPackages.clr (rocmPackages_5.clr)
  • rocmPackages.clr.icd (rocmPackages_5.clr.icd)
  • rocmPackages.composable_kernel (rocmPackages_5.composable_kernel)
  • rocmPackages.hipblas (rocmPackages_5.hipblas)
  • rocmPackages.hipcub (rocmPackages_5.hipcub)
  • rocmPackages.hipfft (rocmPackages_5.hipfft)
  • rocmPackages.hiprand (rocmPackages.rocrand ,rocmPackages_5.hiprand ,rocmPackages_5.rocrand)
  • rocmPackages.hipsolver (rocmPackages_5.hipsolver)
  • rocmPackages.hipsparse (rocmPackages_5.hipsparse)
  • rocmPackages.llvm.mlir (rocmPackages_5.llvm.mlir)
  • rocmPackages.llvm.openmp (rocmPackages_5.llvm.openmp)
  • rocmPackages.llvm.openmp.doc (rocmPackages_5.llvm.openmp.doc)
  • rocmPackages.llvm.openmp.info (rocmPackages_5.llvm.openmp.info)
  • rocmPackages.llvm.openmp.man (rocmPackages_5.llvm.openmp.man)
  • rocmPackages.migraphx (rocmPackages_5.migraphx)
  • rocmPackages.miopen (rocmPackages.miopen-hip ,rocmPackages_5.miopen ,rocmPackages_5.miopen-hip)
  • rocmPackages.miopen-opencl (rocmPackages_5.miopen-opencl)
  • rocmPackages.miopengemm (rocmPackages_5.miopengemm)
  • rocmPackages.miopengemm.doc (rocmPackages_5.miopengemm.doc)
  • rocmPackages.mivisionx (rocmPackages.mivisionx-hip ,rocmPackages_5.mivisionx ,rocmPackages_5.mivisionx-hip)
  • rocmPackages.mivisionx-cpu (rocmPackages_5.mivisionx-cpu)
  • rocmPackages.mivisionx-opencl (rocmPackages_5.mivisionx-opencl)
  • rocmPackages.rccl (rocmPackages_5.rccl)
  • rocmPackages.rocalution (rocmPackages_5.rocalution)
  • rocmPackages.rocblas (rocmPackages_5.rocblas)
  • rocmPackages.rocdbgapi (rocmPackages_5.rocdbgapi)
  • rocmPackages.rocdbgapi.doc (rocmPackages_5.rocdbgapi.doc)
  • rocmPackages.rocfft (rocmPackages_5.rocfft)
  • rocmPackages.rocm-runtime (rocmPackages_5.rocm-runtime)
  • rocmPackages.rocminfo (rocmPackages_5.rocminfo)
  • rocmPackages.rocmlir (rocmPackages_5.rocmlir)
  • rocmPackages.rocmlir-rock (rocmPackages_5.rocmlir-rock)
  • rocmPackages.rocmlir.external (rocmPackages_5.rocmlir.external)
  • rocmPackages.rocprim (rocmPackages_5.rocprim)
  • rocmPackages.rocprofiler (rocmPackages_5.rocprofiler)
  • rocmPackages.rocr-debug-agent (rocmPackages_5.rocr-debug-agent)
  • rocmPackages.rocsolver (rocmPackages_5.rocsolver)
  • rocmPackages.rocsparse (rocmPackages_5.rocsparse)
  • rocmPackages.rocthrust (rocmPackages_5.rocthrust)
  • rocmPackages.roctracer (rocmPackages_5.roctracer)
  • rocmPackages.rocwmma (rocmPackages_5.rocwmma)
  • rocmPackages.rpp (rocmPackages.rpp-hip ,rocmPackages_5.rpp ,rocmPackages_5.rpp-hip)
  • rocmPackages.rpp-cpu (rocmPackages_5.rpp-cpu)
  • rocmPackages.rpp-opencl (rocmPackages_5.rpp-opencl)
  • rocmPackages.tensile (rocmPackages_5.tensile)
  • rocmPackages.tensile.dist (rocmPackages_5.tensile.dist)

Copy link
Member

@Flakebi Flakebi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

pkgs/development/rocm-modules/5/clr/default.nix Outdated Show resolved Hide resolved
@pbsds
Copy link
Contributor

pbsds commented Dec 18, 2023

Diff LGTM, but should this broken criteria be added to each package, or would it make sense to somehow apply it to the whole package set?

@Madouura
Copy link
Contributor Author

Madouura commented Dec 18, 2023

Diff LGTM, but should this broken criteria be added to each package, or would it make sense to somehow apply it to the whole package set?

Applying mass breakage is something I'm planning for rocmPackages_6, which I will, when time allows, backport to rocmPackages_5.

This is more of a quick and dirty transitory fix for the transition to rocmPackages_6.

'RadeonOpenCompute', 'ROCm-Developer-Tools', 'ROCmSoftwarePlatform', 'GPUOpen-ProfessionalCompute-Libraries' -> 'ROCm'
Further prevent bot-based updates
@Madouura
Copy link
Contributor Author

Only change, the rocm-cmake issue is more accurate anyway, and links to the old issue.

diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix
index b5676a8256af..1a72a8d7c3fb 100644
--- a/pkgs/development/rocm-modules/5/clr/default.nix
+++ b/pkgs/development/rocm-modules/5/clr/default.nix
@@ -82,7 +82,7 @@ in stdenv.mkDerivation (finalAttrs: {
     "-DROCM_PATH=${rocminfo}"
 
     # Temporarily set variables to work around upstream CMakeLists issue
-    # Can be removed once https://github.com/ROCm/hipamd/issues/55 is fixed
+    # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed
     "-DCMAKE_INSTALL_BINDIR=bin"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_LIBDIR=lib"

@ofborg ofborg bot requested a review from Flakebi December 18, 2023 18:32
@lovesegfault lovesegfault merged commit f23b7ca into NixOS:master Dec 22, 2023
19 checks passed
@Madouura Madouura deleted the pr/rocm_5 branch December 23, 2023 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants