zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e4s rocm external ci stack: upgrade to v6.1.2 (#45356)

Browse Source 
* e4s rocm external ci stack: upgrade to v6.1.2

* magma: add rocm-core 6.1.2
This commit is contained in:
eugeneswalker 2024-07-23 09:52:52 -07:00 committed by GitHub
parent 6ea944bf17
commit 0fb44529bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 77 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
View File

@ -376,7 +376,7 @@ e4s-neoverse_v1-build:
e4s-rocm-external-generate: e4s-rocm-external-generate:
extends: [ ".e4s-rocm-external", ".generate-x86_64"] extends: [ ".e4s-rocm-external", ".generate-x86_64"]
image: ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4-rocm6.1.1:2024.06.23 image: ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4-rocm6.1.2:2024.07.22
e4s-rocm-external-build: e4s-rocm-external-build:
extends: [ ".e4s-rocm-external", ".build" ] extends: [ ".e4s-rocm-external", ".build" ]

150
share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml
View File

@ -27,186 +27,186 @@ spack:
comgr: comgr:
buildable: false buildable: false
externals: externals:
- spec: comgr@6.1.1 - spec: comgr@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
hip-rocclr: hip-rocclr:
buildable: false buildable: false
externals: externals:
- spec: hip-rocclr@6.1.1 - spec: hip-rocclr@6.1.2
prefix: /opt/rocm-6.1.1/hip prefix: /opt/rocm-6.1.2/hip
hipblas: hipblas:
buildable: false buildable: false
externals: externals:
- spec: hipblas@6.1.1 - spec: hipblas@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
hipcub: hipcub:
buildable: false buildable: false
externals: externals:
- spec: hipcub@6.1.1 - spec: hipcub@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
hipfft: hipfft:
buildable: false buildable: false
externals: externals:
- spec: hipfft@6.1.1 - spec: hipfft@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
hipsparse: hipsparse:
buildable: false buildable: false
externals: externals:
- spec: hipsparse@6.1.1 - spec: hipsparse@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
miopen-hip: miopen-hip:
buildable: false buildable: false
externals: externals:
- spec: miopen-hip@6.1.1 - spec: miopen-hip@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
miopengemm: miopengemm:
buildable: false buildable: false
externals: externals:
- spec: miopengemm@6.1.1 - spec: miopengemm@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rccl: rccl:
buildable: false buildable: false
externals: externals:
- spec: rccl@6.1.1 - spec: rccl@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocblas: rocblas:
buildable: false buildable: false
externals: externals:
- spec: rocblas@6.1.1 - spec: rocblas@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocfft: rocfft:
buildable: false buildable: false
externals: externals:
- spec: rocfft@6.1.1 - spec: rocfft@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-clang-ocl: rocm-clang-ocl:
buildable: false buildable: false
externals: externals:
- spec: rocm-clang-ocl@6.1.1 - spec: rocm-clang-ocl@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-cmake: rocm-cmake:
buildable: false buildable: false
externals: externals:
- spec: rocm-cmake@6.1.1 - spec: rocm-cmake@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-dbgapi: rocm-dbgapi:
buildable: false buildable: false
externals: externals:
- spec: rocm-dbgapi@6.1.1 - spec: rocm-dbgapi@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-debug-agent: rocm-debug-agent:
buildable: false buildable: false
externals: externals:
- spec: rocm-debug-agent@6.1.1 - spec: rocm-debug-agent@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-device-libs: rocm-device-libs:
buildable: false buildable: false
externals: externals:
- spec: rocm-device-libs@6.1.1 - spec: rocm-device-libs@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-gdb: rocm-gdb:
buildable: false buildable: false
externals: externals:
- spec: rocm-gdb@6.1.1 - spec: rocm-gdb@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
rocm-opencl: rocm-opencl:
buildable: false buildable: false
externals: externals:
- spec: rocm-opencl@6.1.1 - spec: rocm-opencl@6.1.2
prefix: /opt/rocm-6.1.1/opencl prefix: /opt/rocm-6.1.2/opencl
rocm-smi-lib: rocm-smi-lib:
buildable: false buildable: false
externals: externals:
- spec: rocm-smi-lib@6.1.1 - spec: rocm-smi-lib@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
hip: hip:
buildable: false buildable: false
externals: externals:
- spec: hip@6.1.1 - spec: hip@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
extra_attributes: extra_attributes:
compilers: compilers:
c: /opt/rocm-6.1.1/llvm/bin/clang++ c: /opt/rocm-6.1.2/llvm/bin/clang++
c++: /opt/rocm-6.1.1/llvm/bin/clang++ c++: /opt/rocm-6.1.2/llvm/bin/clang++
hip: /opt/rocm-6.1.1/hip/bin/hipcc hip: /opt/rocm-6.1.2/hip/bin/hipcc
hipify-clang: hipify-clang:
buildable: false buildable: false
externals: externals:
- spec: hipify-clang@6.1.1 - spec: hipify-clang@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
llvm-amdgpu: llvm-amdgpu:
buildable: false buildable: false
externals: externals:
- spec: llvm-amdgpu@6.1.1 - spec: llvm-amdgpu@6.1.2
prefix: /opt/rocm-6.1.1/llvm prefix: /opt/rocm-6.1.2/llvm
extra_attributes: extra_attributes:
compilers: compilers:
c: /opt/rocm-6.1.1/llvm/bin/clang++ c: /opt/rocm-6.1.2/llvm/bin/clang++
cxx: /opt/rocm-6.1.1/llvm/bin/clang++ cxx: /opt/rocm-6.1.2/llvm/bin/clang++
hsakmt-roct: hsakmt-roct:
buildable: false buildable: false
externals: externals:
- spec: hsakmt-roct@6.1.1 - spec: hsakmt-roct@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
hsa-rocr-dev: hsa-rocr-dev:
buildable: false buildable: false
externals: externals:
- spec: hsa-rocr-dev@6.1.1 - spec: hsa-rocr-dev@6.1.2
prefix: /opt/rocm-6.1.1/ prefix: /opt/rocm-6.1.2/
extra_atributes: extra_atributes:
compilers: compilers:
c: /opt/rocm-6.1.1/llvm/bin/clang++ c: /opt/rocm-6.1.2/llvm/bin/clang++
cxx: /opt/rocm-6.1.1/llvm/bin/clang++ cxx: /opt/rocm-6.1.2/llvm/bin/clang++
roctracer-dev-api: roctracer-dev-api:
buildable: false buildable: false
externals: externals:
- spec: roctracer-dev-api@6.1.1 - spec: roctracer-dev-api@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
roctracer-dev: roctracer-dev:
buildable: false buildable: false
externals: externals:
- spec: roctracer-dev@4.5.3 - spec: roctracer-dev@4.5.3
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocprim: rocprim:
buildable: false buildable: false
externals: externals:
- spec: rocprim@6.1.1 - spec: rocprim@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocrand: rocrand:
buildable: false buildable: false
externals: externals:
- spec: rocrand@6.1.1 - spec: rocrand@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
hipsolver: hipsolver:
buildable: false buildable: false
externals: externals:
- spec: hipsolver@6.1.1 - spec: hipsolver@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocsolver: rocsolver:
buildable: false buildable: false
externals: externals:
- spec: rocsolver@6.1.1 - spec: rocsolver@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocsparse: rocsparse:
buildable: false buildable: false
externals: externals:
- spec: rocsparse@6.1.1 - spec: rocsparse@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocthrust: rocthrust:
buildable: false buildable: false
externals: externals:
- spec: rocthrust@6.1.1 - spec: rocthrust@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocprofiler-dev: rocprofiler-dev:
buildable: false buildable: false
externals: externals:
- spec: rocprofiler-dev@6.1.1 - spec: rocprofiler-dev@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
rocm-core: rocm-core:
buildable: false buildable: false
externals: externals:
- spec: rocm-core@6.1.1 - spec: rocm-core@6.1.2
prefix: /opt/rocm-6.1.1 prefix: /opt/rocm-6.1.2
specs: specs:
# ROCM NOARCH # ROCM NOARCH
@ -300,7 +300,7 @@ spack:
ci: ci:
pipeline-gen: pipeline-gen:
- build-job: - build-job:
image: ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4-rocm6.1.1:2024.06.23 image: ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4-rocm6.1.2:2024.07.22
cdash: cdash:
build-group: E4S ROCm External build-group: E4S ROCm External

1
var/spack/repos/builtin/packages/magma/package.py
View File

@ -65,6 +65,7 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
"6.0.2", "6.0.2",
"6.1.0", "6.1.0",
"6.1.1", "6.1.1",
"6.1.2",
]: ]:
depends_on(f"rocm-core@{ver}", when=f"@2.8.0: +rocm ^hip@{ver}") depends_on(f"rocm-core@{ver}", when=f"@2.8.0: +rocm ^hip@{ver}")
depends_on("python", when="@master", type="build") depends_on("python", when="@master", type="build")