ci: require x86_64_v3 everywhere (#36158)

This commit is contained in:
Harmen Stoppels 2023-03-29 15:58:48 +02:00 committed by GitHub
parent 7579eaf75a
commit dba57ff113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 232 additions and 262 deletions

View File

@ -9,15 +9,10 @@ default:
SPACK_TARGET_PLATFORM: "darwin"
SPACK_TARGET_ARCH: "x86_64"
.linux_x86_64:
.linux_x86_64_v3:
variables:
SPACK_TARGET_PLATFORM: "linux"
SPACK_TARGET_ARCH: "x86_64"
.linux_x86_64_v4:
variables:
SPACK_TARGET_PLATFORM: "linux"
SPACK_TARGET_ARCH: "x86_64_v4"
SPACK_TARGET_ARCH: "x86_64_v3"
.linux_aarch64:
variables:
@ -169,7 +164,7 @@ protected-publish:
# My Super Cool Pipeline
########################################
# .my-super-cool-stack:
# extends: [ ".linux_x86_64" ]
# extends: [ ".linux_x86_64_v3" ]
# variables:
# SPACK_CI_STACK_NAME: my-super-cool-stack
# tags: [ "all", "tags", "your", "job", "needs"]
@ -324,7 +319,7 @@ protected-publish:
# E4S pipeline
########################################
.e4s:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: e4s
@ -362,7 +357,7 @@ e4s-protected-build:
# GPU Testing Pipeline
########################################
.gpu-tests:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: gpu-tests
@ -400,7 +395,7 @@ gpu-tests-protected-build:
# E4S OneAPI Pipeline
########################################
.e4s-oneapi:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: e4s-oneapi
@ -478,7 +473,7 @@ e4s-power-protected-build:
# Build tests for different build-systems
#########################################
.build_systems:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: build_systems
@ -514,7 +509,7 @@ build_systems-protected-build:
# RADIUSS
#########################################
.radiuss:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: radiuss
@ -562,7 +557,7 @@ radiuss-protected-build:
image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] }
.radiuss-aws:
extends: [ ".linux_x86_64_v4" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: radiuss-aws
@ -634,7 +629,7 @@ radiuss-aws-aarch64-protected-build:
# ECP Data & Vis SDK
########################################
.data-vis-sdk:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: data-vis-sdk
@ -679,7 +674,7 @@ data-vis-sdk-protected-build:
image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] }
.aws-ahug:
extends: [ ".linux_x86_64_v4" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: aws-ahug
@ -757,7 +752,7 @@ aws-ahug-aarch64-protected-build:
image: { "name": "ghcr.io/spack/e4s-amazonlinux-2:v2023-03-09", "entrypoint": [""] }
.aws-isc:
extends: [ ".linux_x86_64_v4" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: aws-isc
@ -830,7 +825,7 @@ aws-isc-aarch64-protected-build:
# Spack Tutorial
########################################
.tutorial:
extends: [ ".linux_x86_64" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: tutorial
@ -866,7 +861,7 @@ tutorial-protected-build:
# Machine Learning - Linux x86_64 (CPU)
#######################################
.ml-linux-x86_64-cpu:
extends: [ ".linux_x86_64_v4" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: ml-linux-x86_64-cpu
@ -906,7 +901,7 @@ ml-linux-x86_64-cpu-protected-build:
# Machine Learning - Linux x86_64 (CUDA)
########################################
.ml-linux-x86_64-cuda:
extends: [ ".linux_x86_64_v4" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: ml-linux-x86_64-cuda
@ -946,7 +941,7 @@ ml-linux-x86_64-cuda-protected-build:
# Machine Learning - Linux x86_64 (ROCm)
########################################
.ml-linux-x86_64-rocm:
extends: [ ".linux_x86_64_v4" ]
extends: [ ".linux_x86_64_v3" ]
variables:
SPACK_CI_STACK_NAME: ml-linux-x86_64-rocm

View File

@ -5,4 +5,4 @@ ci:
- - curl -LfsS "https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.x86_64-linux-gnu.tar.gz" -o gmake.tar.gz
- printf "fef1f59e56d2d11e6d700ba22d3444b6e583c663d6883fd0a4f63ab8bd280f0f gmake.tar.gz" | sha256sum --check --strict --quiet
- tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
tags: ["x86_64"]
tags: ["x86_64_v3"]

View File

@ -1,8 +0,0 @@
ci:
pipeline-gen:
- build-job:
before_script:
- - curl -LfsS "https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.x86_64-linux-gnu.tar.gz" -o gmake.tar.gz
- printf "fef1f59e56d2d11e6d700ba22d3444b6e583c663d6883fd0a4f63ab8bd280f0f gmake.tar.gz" | sha256sum --check --strict --quiet
- tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
tags: ["x86_64_v4"]

View File

@ -1,5 +1,8 @@
spack:
view: false
packages:
all:
require: target=x86_64_v3
definitions:
- default_specs:
- 'uncrustify build_system=autotools'
@ -11,7 +14,7 @@ spack:
- r-rcpp # RPackage
- ruby-rake # RubyPackage
- arch:
- '%gcc target=x86_64'
- '%gcc'
specs:
- matrix:

View File

@ -10,7 +10,7 @@ spack:
libglx:
require: ^mesa +glx
all:
target: [x86_64]
require: target=x86_64_v3
definitions:
- paraview_specs:

View File

@ -6,7 +6,7 @@ spack:
providers:
blas: [openblas]
mpi: [mpich]
target: [x86_64]
require: target=x86_64_v3
variants: +mpi amdgpu_target=gfx90a cuda_arch=80
tbb:
require: "intel-tbb"

View File

@ -7,7 +7,7 @@ spack:
providers:
blas: [openblas]
mpi: [mpich]
target: [x86_64]
require: target=x86_64_v3
variants: +mpi amdgpu_target=gfx90a cuda_arch=80
tbb:
require: "intel-tbb"

View File

@ -2,11 +2,12 @@ spack:
view: false
packages:
all:
target: [x86_64_v3]
require: target=x86_64_v3
variants: ~cuda~rocm
mpi:
require: openmpi
definitions:
- packages:
specs:
# Horovod
- py-horovod
@ -73,14 +74,6 @@ spack:
# - r-xgboost
- xgboost
- arch:
- target=x86_64_v3
specs:
- matrix:
- [$packages]
- [$arch]
mirrors: { "mirror": "s3://spack-binaries/develop/ml-linux-x86_64-cpu" }
ci:

View File

@ -2,14 +2,15 @@ spack:
view: false
packages:
all:
target: [x86_64_v3]
require: target=x86_64_v3
variants: ~rocm+cuda cuda_arch=80
llvm:
# https://github.com/spack/spack/issues/27999
require: ~cuda
mpi:
require: openmpi
definitions:
- packages:
specs:
# Horovod
- py-horovod
@ -76,14 +77,6 @@ spack:
# - r-xgboost
- xgboost
- arch:
- target=x86_64_v3
specs:
- matrix:
- [$packages]
- [$arch]
mirrors: { "mirror": "s3://spack-binaries/develop/ml-linux-x86_64-cuda" }
ci:

View File

@ -2,16 +2,17 @@ spack:
view: false
packages:
all:
target: [x86_64_v3]
require: target=x86_64_v3
variants: ~cuda+rocm amdgpu_target=gfx90a
gl:
require: "osmesa"
py-torch:
# Does not yet support Spack-installed ROCm
require: ~rocm
mpi:
require: openmpi
definitions:
- packages:
specs:
# Horovod
- py-horovod
@ -79,14 +80,6 @@ spack:
# - r-xgboost
- xgboost
- arch:
- target=x86_64_v3
specs:
- matrix:
- [$packages]
- [$arch]
mirrors: { "mirror": "s3://spack-binaries/develop/ml-linux-x86_64-rocm" }
ci:

View File

@ -11,6 +11,7 @@ spack:
- openmpi
- mpich
variants: +mpi cuda_arch=70
require: target=x86_64_v3
definitions:
- radiuss:

View File

@ -2,7 +2,7 @@ spack:
view: false
packages:
all:
target: [x86_64]
require: target=x86_64_v3
providers:
mpi: [mvapich2]

View File

@ -7,7 +7,7 @@ spack:
view: false
packages:
all:
target: [x86_64]
require: target=x86_64_v3
tbb:
require: intel-tbb
definitions: