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: 5.4.0 → 5.4.1 & various fixes/changes #206421

Merged
merged 21 commits into from
Dec 19, 2022
Merged

rocm-related: 5.4.0 → 5.4.1 & various fixes/changes #206421

merged 21 commits into from
Dec 19, 2022

Conversation

Madouura
Copy link
Contributor

@Madouura Madouura commented Dec 16, 2022 •
edited
Loading

Description of changes

Tracking: #197885
This fixes a lot of issues, particularly the toolchain issue we were having.

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.

This was referenced Dec 16, 2022
Open
Closed
Closed
Closed
@Madouura Madouura force-pushed the pr/rocm-related branch 3 times, most recently from da7aa3e to d3e0bd7 Compare December 16, 2022 16:08
@Madouura
Copy link
Contributor Author

Manually updated tensile and rocthrust because the release order is messed up again.

@Madouura
Copy link
Contributor Author

That's a mass rebuild. I wonder if it's lit?
Is it meant to be updated along with the llvm packages?

Flakebi
Flakebi reviewed Dec 16, 2022
View reviewed changes
pkgs/development/libraries/miopen/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/rocclr/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/rocm-thunk/default.nix Outdated Show resolved Hide resolved
@Madouura Madouura force-pushed the pr/rocm-related branch 3 times, most recently from e9044ed to 151089a Compare December 16, 2022 18:22
@ofborg ofborg bot requested a review from Flakebi December 16, 2022 18:32
SuperSandro2000
SuperSandro2000 reviewed Dec 16, 2022
View reviewed changes
pkgs/development/compilers/hip/hip-common.nix Outdated
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = finalAttrs.version != stdenv.cc.version;
Copy link
Member

Choose a reason for hiding this comment

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

I am not sure if broken is actual correct here but I don't really have a better suggestion right now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The other option I found was including (llvmPackages_rocm) clang in the derivation, but since we already manually change the stdenv it feels like a needless point of redirection.

@Madouura Madouura changed the base branch from master to staging December 18, 2022 14:45
@Madouura
sphinx-automodapi: fix tests
61ac420
@Madouura
lit: 14.0.0 -> 15.0.6
7f864b4
@Madouura
spirv-llvm-translator: allow rocm versioning
8be466f
@Madouura
python3Packages: sphinx-markdown-tables: init at 0.0.17
3b271b7
@Madouura
rocm-llvm: rewrite and separate
0ee533a
@Madouura
rocm-related: standardize
785ed48 
rocminfo: standardize

rocm-thunk: standardize

rocm-opencl-icd: standardize

rocclr: standardize

rocm-device-libs: standardize

rocm-comgr: standardize

rocm-opencl-runtime: standardize

rocm-runtime: standardize

clang-ocl: standardize

composable_kernel: standardize

hipcub: standardize

hipsparse: standardize

miopengemm: standardize

rccl: standardize

rocfft: standardize

rocprim: standardize

rocsparse: standardize

rocmlir: standardize

rocrand: standardize

tensile: standardize

rocm-cmake: standardize

rocm-smi: standardize

miopen: standardize
@Madouura
rocm-related: standardize and fix tests/benchmarks
fb8a7b6 
rocblas: standardize and fix test/benchmarks

rocthrust: standardize and fix test/benchmarks

rocwmma: standardize and fix tests/benchmarks
@Madouura
hip: rewrite and separate
f6e28e2 
hip-common: init at 5.4.0

hipcc: init at 5.4.1
@Madouura
rocprofiler: init at 5.4.0
b943545
@Madouura
roctracer: init at 5.4.0
5b74e4e
@Madouura
rocsolver: init at 5.4.0
ecaaa49
@Madouura
rocalution: init at 5.4.0
f69c8df
@Madouura
rocm-related: 5.4.0 → 5.4.1
9e0472e 
clang-ocl: 5.4.0 → 5.4.1

hipsparse: 5.4.0 → 5.4.1

composable_kernel: unstable-2022-12-08 → unstable-2022-12-15

llvmPackages_rocm.llvm: 5.4.0 → 5.4.1

miopen: 5.4.0 → 5.4.1

miopengemm: 5.4.0 → 5.4.1

rccl: 5.4.0 → 5.4.1

rocalution: 5.4.0 → 5.4.1

hipcub: 5.4.0 → 5.4.1

rocclr: 5.4.0 → 5.4.1

rocfft: 5.4.0 → 5.4.1

rocm-cmake: 5.4.0 → 5.4.1

rocm-comgr: 5.4.0 → 5.4.1

rocm-device-libs: 5.4.0 → 5.4.1

hip: 5.4.0 → 5.4.1

rocblas: 5.4.0 → 5.4.1

rocm-runtime: 5.4.0 → 5.4.1

rocm-opencl-runtime: 5.4.0 → 5.4.1

rocm-thunk: 5.4.0 → 5.4.1

rocprim: 5.4.0 → 5.4.1

rocm-smi: 5.4.0 → 5.4.1

rocminfo: 5.4.0 → 5.4.1

rocsolver: 5.4.0 → 5.4.1

rocrand: 5.4.0 → 5.4.1

rocthrust: 5.4.0 → 5.4.1

rocprofiler: 5.4.0 → 5.4.1

rocwmma: 5.4.0 → 5.4.1

roctracer: 5.4.0 → 5.4.1

rocsparse: 5.4.0 → 5.4.1

tensile: 5.4.0 → 5.4.1
@Madouura
rocmlir: don't enable broken as long as minor version is the same
187452f
@Madouura
rocmUpdateScript: fix llvmPackages_rocm updating
93ec556
@Madouura
composable_kernel: fix tests, disable examples
f84b81a
@Madouura
miopen: fixup, enable kdbs by default, symlink for hydra
e86c679
@Madouura
rocm-related: add release notes
8de2395
@Madouura
Copy link
Contributor Author

Madouura commented Dec 18, 2022 •
edited
Loading

Fixed release-notes merge conflict.
Also rebased locally on staging.

@Madouura
Copy link
Contributor Author

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

1 package failed to build:
  • hipsparse
51 packages built:
  • blender-hip
  • clang-ocl
  • hip
  • hip-common
  • hipcc
  • hipcub
  • llvmPackages_rocm.bintools
  • llvmPackages_rocm.bintools-unwrapped
  • llvmPackages_rocm.clang
  • llvmPackages_rocm.clang-tools-extra
  • llvmPackages_rocm.clang-unwrapped
  • llvmPackages_rocm.compiler-rt
  • llvmPackages_rocm.libclc
  • llvmPackages_rocm.libcxx
  • llvmPackages_rocm.libcxxabi
  • llvmPackages_rocm.libunwind
  • llvmPackages_rocm.lld
  • llvmPackages_rocm.lldb
  • llvmPackages_rocm.llvm
  • llvmPackages_rocm.mlir
  • llvmPackages_rocm.openmp
  • llvmPackages_rocm.polly
  • llvmPackages_rocm.pstl
  • llvmPackages_rocm.rocmClangStdenv
  • miopen
  • miopengemm
  • python3Packages.sphinx-automodapi
  • python3Packages.sphinx-markdown-tables
  • rccl
  • rocalution
  • rocblas
  • rocclr
  • rocm-cmake
  • rocm-comgr
  • rocm-device-libs
  • rocm-opencl-icd
  • rocm-opencl-runtime
  • rocm-runtime
  • rocm-smi
  • rocm-thunk
  • rocminfo
  • rocmlir
  • rocprim
  • rocprofiler
  • rocrand
  • rocsolver
  • rocsparse
  • roctracer
  • rocwmma
  • spirv-llvm-translator
  • tensile

@Madouura
Copy link
Contributor Author

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

52 packages built:
  • blender-hip
  • clang-ocl
  • hip
  • hip-common
  • hipcc
  • hipcub
  • hipsparse
  • llvmPackages_rocm.bintools
  • llvmPackages_rocm.bintools-unwrapped
  • llvmPackages_rocm.clang
  • llvmPackages_rocm.clang-tools-extra
  • llvmPackages_rocm.clang-unwrapped
  • llvmPackages_rocm.compiler-rt
  • llvmPackages_rocm.libclc
  • llvmPackages_rocm.libcxx
  • llvmPackages_rocm.libcxxabi
  • llvmPackages_rocm.libunwind
  • llvmPackages_rocm.lld
  • llvmPackages_rocm.lldb
  • llvmPackages_rocm.llvm
  • llvmPackages_rocm.mlir
  • llvmPackages_rocm.openmp
  • llvmPackages_rocm.polly
  • llvmPackages_rocm.pstl
  • llvmPackages_rocm.rocmClangStdenv
  • miopen
  • miopengemm
  • python3Packages.sphinx-automodapi
  • python3Packages.sphinx-markdown-tables
  • rccl
  • rocalution
  • rocblas
  • rocclr
  • rocm-cmake
  • rocm-comgr
  • rocm-device-libs
  • rocm-opencl-icd
  • rocm-opencl-runtime
  • rocm-runtime
  • rocm-smi
  • rocm-thunk
  • rocminfo
  • rocmlir
  • rocprim
  • rocprofiler
  • rocrand
  • rocsolver
  • rocsparse
  • roctracer
  • rocwmma
  • spirv-llvm-translator
  • tensile

@Madouura
Copy link
Contributor Author

Forgot to add it to the list, but composable_kernel builds, obviously or miopen wouldn't.

@lovesegfault lovesegfault merged commit 5b18bca into NixOS:staging Dec 19, 2022
@Madouura Madouura deleted the pr/rocm-related branch December 20, 2022 02:18
@Madouura Madouura mentioned this pull request Dec 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@winterqt winterqt winterqt left review comments

@gloaming gloaming Awaiting requested review from gloaming

@dtzWill dtzWill Awaiting requested review from dtzWill

@acowley acowley Awaiting requested review from acowley

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@Flakebi Flakebi Awaiting requested review from Flakebi

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: python 8.has: changelog 8.has: clean-up 8.has: documentation 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Madouura @acowley @Flakebi @SuperSandro2000 @winterqt @lovesegfault