Skip to content

rocm-related: 5.3.3 → 5.4.0#204378

Merged
lovesegfault merged 7 commits intoNixOS:masterfrom
Madouura:pr/rocm-related
Dec 12, 2022
Merged

rocm-related: 5.3.3 → 5.4.0#204378
lovesegfault merged 7 commits intoNixOS:masterfrom
Madouura:pr/rocm-related

Conversation

@Madouura
Copy link
Copy Markdown
Contributor

@Madouura Madouura commented Dec 4, 2022

Description of changes

Tracking: #197885
Manually updated rocthrust and tensile because the release order is messed up...
Also fixed an issue with the update scripts that could have resulted in a bunch of the rocm packages being marked as broken due to the rocm version check on most of them. (5.4 != 5.4.0)
Will update the section below once I'm finished building.
Fixes #203949

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg Bot requested review from Flakebi, acowley and lovesegfault December 4, 2022 00:59
@ofborg ofborg Bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Dec 4, 2022
@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 4, 2022

I probably should have made this a draft.
Don't merge yet.

@ofborg ofborg Bot added the 8.has: package (new) This PR adds a new package label Dec 4, 2022
@Madouura Madouura mentioned this pull request Dec 4, 2022
34 tasks
@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 4, 2022

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

32 packages built:
  • blender-hip
  • clang-ocl
  • composable_kernel
  • hip
  • hipcub
  • hipsparse
  • llvmPackages_rocm.clang
  • llvmPackages_rocm.clangNoCompilerRt
  • llvmPackages_rocm.llvm
  • miopen (miopen-hip)
  • miopen-opencl
  • miopengemm
  • rccl
  • rocblas
  • rocclr
  • rocfft
  • rocm-cmake
  • rocm-comgr
  • rocm-device-libs
  • rocm-opencl-icd
  • rocm-opencl-runtime
  • rocm-runtime
  • rocm-smi
  • rocm-thunk
  • rocminfo
  • rocmlir
  • rocprim
  • rocrand
  • rocsparse
  • rocthrust
  • rocwmma
  • tensile

@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 4, 2022

Ready.

Comment thread pkgs/development/compilers/hip/default.nix Outdated
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

We should do a generic updater for rocm instead of copying the changes to all packages.

Comment thread pkgs/development/compilers/hip/default.nix Outdated
@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 4, 2022

We should do a generic updater for rocm instead of copying the changes to all packages.

Alright, I'll go ahead and incorporate the changes from #204219 into that since it'll be easier for all of us then.

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
@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 4, 2022

Haven't rebuilt everything, but from what I can tell there are no glaring nix-build errors for evaluation.
I have ran the update scripts a few times with various changes to make sure that's working, and it is.

@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 4, 2022

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

31 packages built:
  • blender-hip
  • clang-ocl
  • composable_kernel
  • hip
  • hipcub
  • hipsparse
  • llvmPackages_rocm.clang
  • llvmPackages_rocm.clangNoCompilerRt
  • llvmPackages_rocm.llvm
  • miopen (miopen-hip)
  • miopen-opencl
  • miopengemm
  • rccl
  • rocblas
  • rocclr
  • rocm-cmake
  • rocm-comgr
  • rocm-device-libs
  • rocm-opencl-icd
  • rocm-opencl-runtime
  • rocm-runtime
  • rocm-smi
  • rocm-thunk
  • rocminfo
  • rocmlir
  • rocprim
  • rocrand
  • rocsparse
  • rocthrust
  • rocwmma
  • tensile

@Madouura
Copy link
Copy Markdown
Contributor Author

Madouura commented Dec 5, 2022

cc @SuperSandro2000
Are there any further issues I need to address before we get this merged?

Comment thread pkgs/development/libraries/hipcub/default.nix Outdated
@github-actions github-actions Bot added the 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) label Dec 10, 2022
@Madouura
Copy link
Copy Markdown
Contributor Author

Looks like the rocm-llvm was a bit more of a rabbit hole than I thought.
I'm saving that for a later PR in maybe a week or so.
This should fix the immediate issues.

@Madouura
Copy link
Copy Markdown
Contributor Author

Almost forgot to revert the change that's been causing hydra errors.

@lovesegfault
Copy link
Copy Markdown
Member

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

31 packages built:
  • blender-hip
  • clang-ocl
  • composable_kernel
  • hip
  • hipcub
  • hipsparse
  • llvmPackages_rocm.clang
  • llvmPackages_rocm.clangNoCompilerRt
  • llvmPackages_rocm.llvm
  • miopen (miopen-hip)
  • miopen-opencl
  • miopengemm
  • rccl
  • rocblas
  • rocclr
  • rocm-cmake
  • rocm-comgr
  • rocm-device-libs
  • rocm-opencl-icd
  • rocm-opencl-runtime
  • rocm-runtime
  • rocm-smi
  • rocm-thunk
  • rocminfo
  • rocmlir
  • rocprim
  • rocrand
  • rocsparse
  • rocthrust
  • rocwmma
  • tensile

@lovesegfault lovesegfault merged commit fc6c79f into NixOS:master Dec 12, 2022
@Madouura Madouura deleted the pr/rocm-related branch December 12, 2022 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

rocm-opencl-runtime: "Output limit exceeded" on Hydra

4 participants