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.

Sign up for GitHub

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

Jump to bottom

rocm-related: misc changes #203412

Merged
merged 8 commits into from
Nov 28, 2022
Merged

rocm-related: misc changes #203412

merged 8 commits into from
Nov 28, 2022

Conversation

Madouura
Copy link
Contributor

@Madouura Madouura commented Nov 28, 2022 •
edited
Loading

Description of changes

Tracking: #197885
Supercedes: #203335

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/)
  • 22.11 Release Notes (or backporting 22.05 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.

This was referenced Nov 28, 2022
Closed
Open
@Madouura
Copy link
Contributor Author

Madouura commented Nov 28, 2022 •
edited
Loading

Please do review, but do not merge until I figure out what's going on with nixpkgs-review.
This is a new error now only showing and I suspect it might have to do with what SuperSandro2000 commented on about strictDeps.
Fixed.

@Madouura
rocm-related: build documentation by default
535e40a 
miopen: build documentation by default

miopengemm: build documentation by default

rocwmma: build documentation by default
@Madouura
miopen: don't use nativeBuildInputs in test fixup
d54ee59
@Madouura
rocm-related: use empty list instead of null for gpuTargets
686606e 
composable_kernel: use empty list instead of null for gpuTargets

rocwmma: use empty list instead of null for gpuTargets
@Madouura
rocm-related: remove ? null and related asserts
2a44f63 
composable_kernel: remove ? null and related asserts

hipcub: remove ? null and related asserts

hipsparse: remove ? null and related asserts

miopen: remove ? null and related asserts

miopengemm: remove ? null and related asserts

rccl: remove ? null and related asserts

rocblas: remove ? null and related asserts

rocfft: remove ? null and related asserts

rocprim: remove ? null and related asserts

rocrand: remove ? null and related asserts

rocsparse: remove ? null and related asserts

rocthrust: remove ? null and related asserts

rocwmma: remove ? null and related asserts
@Madouura
rocm-related: optional GITHUB_TOKEN for update script
3ced817 
hip: optional GITHUB_TOKEN for update script

rocm-llvm: optional GITHUB_TOKEN for update script

clang-ocl: optional GITHUB_TOKEN for update script

hipcub: optional GITHUB_TOKEN for update script

hipsparse: optional GITHUB_TOKEN for update script

miopen: optional GITHUB_TOKEN for update script

miopengemm: optional GITHUB_TOKEN for update script

rccl: optional GITHUB_TOKEN for update script

rocblas: optional GITHUB_TOKEN for update script

rocclr: optional GITHUB_TOKEN for update script

rocfft: optional GITHUB_TOKEN for update script

rocm-comgr: optional GITHUB_TOKEN for update script

rocm-device-libs: optional GITHUB_TOKEN for update script

rocm-opencl-runtime: optional GITHUB_TOKEN for update script

rocm-runtime: optional GITHUB_TOKEN for update script

rocm-thunk: optional GITHUB_TOKEN for update script

rocmlir: optional GITHUB_TOKEN for update script

rocprim: optional GITHUB_TOKEN for update script

rocrand: optional GITHUB_TOKEN for update script

rocsparse: optional GITHUB_TOKEN for update script

rocthrust: optional GITHUB_TOKEN for update script

rocwmma: optional GITHUB_TOKEN for update script

tensile: optional GITHUB_TOKEN for update script

rocm-cmake: optional GITHUB_TOKEN for update script

rocminfo: optional GITHUB_TOKEN for update script

rocm-smi: optional GITHUB_TOKEN for update script
@Madouura
rocm-related: lib.strings -> lib
9dca985 
composable_kernel: lib.strings -> lib

rocblas: lib.strings -> lib

rocwmma: lib.strings -> lib
@Madouura Madouura mentioned this pull request Nov 28, 2022
Closed
13 tasks
@Madouura
Copy link
Contributor Author

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

25 packages built:
  • blender-hip
  • clang-ocl
  • composable_kernel
  • hip
  • hipcub
  • hipsparse
  • llvmPackages_rocm.clang
  • llvmPackages_rocm.clangNoCompilerRt
  • llvmPackages_rocm.llvm
  • miopengemm
  • rccl
  • rocblas
  • rocclr
  • rocm-comgr
  • rocm-device-libs
  • rocm-opencl-icd
  • rocm-opencl-runtime
  • rocm-runtime
  • rocminfo
  • rocmlir
  • rocprim
  • rocrand
  • rocsparse
  • rocthrust
  • rocwmma

@Madouura
rocm-related: move asserts to broken
78c7e66 
composable_kernel: move asserts to broken

rocblas: move asserts to broken

rocthrust: move asserts to broken

rocwmma: move asserts to broken
@Madouura
Copy link
Contributor Author

One moment while I deprecate rocmVersion and repoVersion...

@Madouura
rocm-related: deprecate rocmVersion and repoVersion
30a6bef 
clang-ocl: deprecate rocmVersion and repoVersion

hipcub: deprecate rocmVersion and repoVersion

hipsparse: deprecate rocmVersion and repoVersion

miopen: deprecate rocmVersion and repoVersion

miopengemm: deprecate rocmVersion and repoVersion

rccl: deprecate rocmVersion and repoVersion

rocblas: deprecate rocmVersion and repoVersion

rocfft: deprecate rocmVersion and repoVersion

rocmlir: deprecate rocmVersion and repoVersion

rocprim: deprecate rocmVersion and repoVersion

rocrand: deprecate rocmVersion and repoVersion

rocsparse: deprecate rocmVersion and repoVersion

rocthrust: deprecate rocmVersion and repoVersion

rocwmma: deprecate rocmVersion and repoVersion

tensile: deprecate rocmVersion and repoVersion
@Madouura
Copy link
Contributor Author

It'll be a bit to compile everything again, but unless there are other issues, this should be good for review and merge.

@Madouura
Copy link
Contributor Author

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

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

Flakebi
Flakebi reviewed Nov 28, 2022
View reviewed changes
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.

Looks good from my side

@lovesegfault lovesegfault merged commit d9a5323 into NixOS:master Nov 28, 2022
@Madouura Madouura deleted the pr/rocm-misc branch November 28, 2022 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Flakebi Flakebi Flakebi left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@mweinelt mweinelt Awaiting requested review from mweinelt

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@acowley acowley Awaiting requested review from acowley

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Madouura @Flakebi @SuperSandro2000 @lovesegfault