diff --git a/lib/spack/docs/pipelines.rst b/lib/spack/docs/pipelines.rst index c30da836bf3..d154eb8431f 100644 --- a/lib/spack/docs/pipelines.rst +++ b/lib/spack/docs/pipelines.rst @@ -330,7 +330,7 @@ that ``--tests`` is passed to ``spack ci rebuild`` as part of the - spack --version - cd ${SPACK_CONCRETE_ENV_DIR} - spack env activate --without-view . - - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'" + - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}/{architecture.target}/{name}-{version}-{hash}'" - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data - if [[ -r /mnt/key/intermediate_ci_signing_key.gpg ]]; then spack gpg trust /mnt/key/intermediate_ci_signing_key.gpg; fi - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi diff --git a/share/spack/gitlab/cloud_pipelines/configs/config.yaml b/share/spack/gitlab/cloud_pipelines/configs/config.yaml index 89e9800e5fc..b1ea14eb9b5 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/config.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/config.yaml @@ -6,5 +6,4 @@ config: root: /home/software/spack padded_length: 256 projections: - all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}' - + all: "{architecture.platform}/{architecture.target}/{name}-{version}-{hash}" diff --git a/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml index 5fd569c4a96..a5c3b4abfd3 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml @@ -4,7 +4,7 @@ ci: before_script-: # Test package relocation on linux using a modified prefix # This is not well supported on MacOS (https://github.com/spack/spack/issues/37162) - - - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'" + - - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}/{architecture.target}/{name}-{version}-{hash}'" - match_behavior: first submapping: - match: diff --git a/share/spack/gitlab/cloud_pipelines/configs/linux/ppc64le/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/linux/ppc64le/ci.yaml index 5a700395a06..e5389af5bd9 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/linux/ppc64le/ci.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/linux/ppc64le/ci.yaml @@ -15,7 +15,7 @@ ci: - cd ${SPACK_CONCRETE_ENV_DIR} - spack env activate --without-view . - if [ -n "$SPACK_BUILD_JOBS" ]; then spack config add "config:build_jobs:$SPACK_BUILD_JOBS"; fi - - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'" + - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}/{architecture.target}/{name}-{version}-{hash}'" - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data - if [[ -r /mnt/key/e4s.gpg ]]; then spack gpg trust /mnt/key/e4s.gpg; fi - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml index 3cb1090a1ab..8933270387a 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml @@ -57,34 +57,22 @@ spack: - compiler_specs: - gcc@11.2 - # Licensing OK? - # - intel-oneapi-compilers@2022.1 - # - nvhpc - app_specs: - bwa # Depends on simde which requires newer compiler? #- bowtie2 - # Requires x86_64 specific ASM - #- cistem - - cromwell - - fastqc - flux-sched - flux-core - flux-pmix - - gatk - gromacs - lammps - wrf build_type=dm+sm - mfem - mpas-model ^parallelio+pnetcdf - - nextflow - octave - openfoam - osu-micro-benchmarks - - parallel - # - paraview - - picard - quantum-espresso - raja # Depends on bowtie2 -> simde which requires newer compiler? @@ -94,12 +82,9 @@ spack: - salmon - samtools - seqtk - - snakemake - star # Requires gcc@9: #- ufs-weather-model -# requires LLVM which fails without constraint - #- visit - lib_specs: - openmpi fabrics=ofi @@ -114,7 +99,6 @@ spack: - target: - target=aarch64 - specs: - matrix: @@ -130,7 +114,10 @@ spack: - matrix: - - $compiler_specs - - $compiler - - - $target + + - matrix: + - [cromwell, fastqc, gatk, nextflow, parallel, picard, snakemake] + - [$target] ci: pipeline-gen: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml index 2da054256c4..95a5187ff9f 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml @@ -2,6 +2,8 @@ spack: view: false packages: all: + require: + - target=x86_64_v3 providers: blas: - openblas @@ -12,7 +14,8 @@ spack: - mpich variants: +mpi tbb: - require: intel-tbb + require: + - intel-tbb binutils: variants: +ld +gold +headers +libiberty ~nls version: @@ -43,8 +46,6 @@ spack: - '1.18' relion: variants: ~mklfft -# texlive: -# version: [20210325] trilinos: variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu @@ -57,56 +58,35 @@ spack: - compiler_specs: - gcc@11.2 - # Licensing OK? - # - intel-oneapi-compilers@2022.1 - # - nvhpc - cuda_specs: -# Disabled for consistency with aarch64 - #- relion +cuda cuda_arch=70 - raja +cuda cuda_arch=70 - mfem +cuda cuda_arch=70 - app_specs: - bwa -# Disabled for consistency with aarch64 - #- bowtie2 -# Disabled for consistency with aarch64 - #- cistem - - cromwell - - fastqc - flux-sched - flux-core - flux-pmix - - gatk - gromacs - lammps - wrf build_type=dm+sm - mfem - mpas-model ^parallelio+pnetcdf - - nextflow - octave - openfoam - osu-micro-benchmarks - - parallel - # - paraview - - picard - quantum-espresso # Build broken for gcc@7.3.1 x86_64_v4 (error: '_mm512_loadu_epi32' was not declared in this scope) #- raja -# Disabled for consistency with aarch64 - #- rsem # Errors on texlive #- rstudio - salmon - samtools - seqtk - - snakemake - star # Requires gcc@9: #- ufs-weather-model -# Disabled for consistency with aarch64 - #- visit - lib_specs: - openmpi fabrics=ofi @@ -118,31 +98,32 @@ spack: - compiler: - '%gcc@7.3.1' - - target: - - target=x86_64_v3 - - specs: - matrix: - - $cuda_specs - - $compiler - - - $target - matrix: - - $app_specs - - $compiler - - - $target - matrix: - - $lib_specs - - $compiler - - - $target - matrix: - - $compiler_specs - - $compiler - - - $target + + - cromwell + - fastqc + - gatk + - parallel + - nextflow + - picard + - snakemake + ci: pipeline-gen: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml index e91665c398a..cf8481e4535 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml @@ -32,24 +32,21 @@ spack: - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done cdash: build-group: AWS Packages + config: shared_linking: missing_library_policy: ignore # due to use of externals - compilers: - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: amzn2 - paths: - cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gcc - cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/g++ - f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran - fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran - spec: gcc@=12.4.0 - target: aarch64 + packages: + gcc: + externals: + - spec: gcc@=12.4.0 + prefix: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b + extra_attributes: + compilers: + c: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gcc + cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/g++ + fortran: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran acfl: require: - '%gcc target=aarch64' @@ -73,7 +70,7 @@ spack: - mpich pmi=pmi2 device=ch4 netmod=ofi +slurm nvhpc: require: - - nvhpc %gcc target=aarch64 + - "nvhpc target=aarch64" openfoam: require: - openfoam ^scotch@6.0.9 @@ -85,7 +82,7 @@ spack: # require: # - one_of: ["palace cxxflags=\"-include cstdint\" ^fmt@9.1.0"] pmix: - require: 'pmix@3:' + require: "pmix@3:" quantum-espresso: require: - quantum-espresso@6.6 %gcc ^armpl-gcc @@ -95,7 +92,6 @@ spack: - prefix: /opt/slurm spec: slurm@22.05.8 +pmix all: - compiler: [gcc, arm, nvhpc, clang] providers: blas: [armpl-gcc, openblas] fftw-api: [armpl-gcc, fftw] diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml index fd2d4f2138c..de49933b822 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml @@ -36,38 +36,32 @@ spack: - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done cdash: build-group: AWS Packages + config: shared_linking: missing_library_policy: ignore # due to use of externals - compilers: - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: amzn2 - paths: - cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gcc - cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/g++ - f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran - fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran - spec: gcc@=12.4.0 - target: x86_64 - - compiler: - environment: {} - extra_rpaths: - - /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/lib64 - flags: {} - modules: [] - operating_system: amzn2 - paths: - cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icx - cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icpx - f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx - fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx - spec: oneapi@=2024.1.0 - target: x86_64 + packages: + gcc: + externals: + - spec: gcc@=12.4.0 + prefix: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb + extra_attributes: + compilers: + c: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gcc + cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/g++ + fortran: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran + intel-oneapi-compilers: + externals: + - spec: intel-oneapi-compilers@=2024.1.0 + prefix: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop + extra_attributes: + compilers: + c: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icx + cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icpx + fortran: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx + extra_rpaths: + - /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/lib64 gettext: # Newer gettext cannot build with gcc@12 and old AL2 glibc headers # Older gettext versions do not build correctly with oneapi. diff --git a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml index 3d0419e7318..2f5177af30d 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml @@ -2,25 +2,22 @@ spack: view: false packages: all: - require: target=x86_64_v3 - definitions: - - default_specs: - - 'uncrustify build_system=autotools' - - 'uncrustify build_system=cmake' - - lz4 # MakefilePackage - - mpich~fortran # AutotoolsPackage - - py-setuptools # PythonPackage - - openjpeg # CMakePackage - - r-rcpp # RPackage - - ruby-rake # RubyPackage - - perl-data-dumper # PerlPackage - - arch: - - '%gcc' + require: + - target=x86_64_v3 + c: + require: + - gcc specs: - - matrix: - - - $default_specs - - - $arch + - 'uncrustify build_system=autotools' + - 'uncrustify build_system=cmake' + - lz4 # MakefilePackage + - mpich~fortran # AutotoolsPackage + - py-setuptools # PythonPackage + - openjpeg # CMakePackage + - r-rcpp # RPackage + - ruby-rake # RubyPackage + - perl-data-dumper # PerlPackage cdash: build-group: Build Systems diff --git a/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml index b1b754daef1..56deb63504f 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml @@ -1,80 +1,78 @@ spack: view: false + packages: all: - require: target=x86_64_v3 + require: + - target=x86_64_v3 + prefer: + - '%gcc' + concretizer: unify: true reuse: false - definitions: - - default_specs: - # editors - - neovim~no_luajit - - py-pynvim - - emacs+json+native+treesitter # note, pulls in gcc - # - tree-sitter is a dep, should also have cli but no package - - nano # just in case - # tags and scope search helpers - - universal-ctags # only maintained ctags, works better with c++ - - direnv - # runtimes and compilers - - python - - llvm+link_llvm_dylib~lld~lldb~polly+python build_type=MinSizeRel # for clangd, clang-format - - node-js # for editor plugins etc., pyright language server - - npm - - cmake - - libtool - - go # to build fzf, gh, hub - - rust+dev # fd, ripgrep, hyperfine, exa, rust-analyzer - - binutils+ld+gold+plugins # support linking with built gcc - # styling and lints - - astyle - - cppcheck - - uncrustify - - py-fprettify - - py-fortran-language-server - - py-python-lsp-server - # cli dev tools - - ripgrep - - gh - - fd - # - bfs # liburing: /usr/include/linux/ipv6.h:19:8: error: redefinition of 'struct in6_pktinfo' - - fzf - - tree - - jq - - py-yq - - hub - - ncdu - - eza - - lsd - - hyperfine - - htop - - tmux - - ccache - # ensure we can use a jobserver build and do this fast - - gmake - - ninja # should be @kitware, can't be because of meson requirement - - openssl certs=system # must be this, system external does not work - - libtree - - patchelf - - sed - - which - - elfutils - - fontconfig - - font-util - - gdb - - flex - - graphviz - - doxygen - - meson - - - arch: - - '%gcc target=x86_64_v3' specs: - - matrix: - - - $default_specs - - - $arch + # editors + - neovim~no_luajit + - py-pynvim + # FIXME (compiler as nodes): recover dependency on gcc as a library when +native + - emacs+json~native+treesitter # note, pulls in gcc + # - tree-sitter is a dep, should also have cli but no package + - nano # just in case + # tags and scope search helpers + - universal-ctags # only maintained ctags, works better with c++ + - direnv + # runtimes and compilers + - python + - llvm+link_llvm_dylib~lld~lldb~polly+python build_type=MinSizeRel # for clangd, clang-format + - node-js # for editor plugins etc., pyright language server + - npm + - cmake + - libtool + - go # to build fzf, gh, hub + - rust+dev # fd, ripgrep, hyperfine, exa, rust-analyzer + - binutils+ld+gold+plugins # support linking with built gcc + # styling and lints + - astyle + - cppcheck + - uncrustify + - py-fprettify + - py-fortran-language-server + - py-python-lsp-server + # cli dev tools + - ripgrep + - gh + - fd + # - bfs # liburing: /usr/include/linux/ipv6.h:19:8: error: redefinition of 'struct in6_pktinfo' + - fzf + - tree + - jq + - py-yq + - hub + - ncdu + - eza + - lsd + - hyperfine + - htop + - tmux + - ccache + # ensure we can use a jobserver build and do this fast + - gmake + - ninja # should be @kitware, can't be because of meson requirement + - openssl certs=system # must be this, system external does not work + - libtree + - patchelf + - sed + - which + - elfutils + - fontconfig + - font-util + - gdb + - flex + - graphviz + - doxygen + - meson ci: pipeline-gen: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml index 9cd1ef7afdd..1ad951505ad 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml @@ -14,10 +14,15 @@ spack: packages: all: - require: "%cce@18.0.0 target=x86_64_v3" - compiler: [cce] + require: + - target=x86_64_v3 + prefer: + - "%cce" providers: blas: [cray-libsci] + c: [cce] + cxx: [cce] + fortran: [cce] lapack: [cray-libsci] mpi: [cray-mpich] tbb: [intel-tbb] @@ -140,8 +145,8 @@ spack: # - gptune # py-scipy: meson.build:82:0: ERROR: Unknown compiler(s): [['/home/gitlab-runner-3/builds/dWfnZWPh/0/spack/spack/lib/spack/env/cce/ftn']] # - hpctoolkit # dyninst requires %gcc # - hpx max_cpu_count=512 networking=mpi # libxcrypt-4.4.35 - # - lammps # lammps-20240829.1: Reversed (or previously applied) patch detected! Assume -R? [n] - # - libpressio +bitgrooming +bzip2 ~cuda ~cusz +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf +mgard # mgard: + # - lammps # lammps-20240829.1: Reversed (or previously applied) patch detected! Assume -R? [n] + # - libpressio +bitgrooming +bzip2 ~cuda ~cusz +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf +mgard # mgard: # - mgard +serial +openmp +timing +unstructured ~cuda # mgard # - nrm # py-scipy: meson.build:82:0: ERROR: Unknown compiler(s): [['/home/gitlab-runner-3/builds/dWfnZWPh/0/spack/spack/lib/spack/env/cce/ftn']] # - nvhpc # requires %gcc diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml index a770b0a299a..c613f1cb123 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml @@ -7,8 +7,9 @@ spack: packages: all: - require: "%gcc@9.4.0 target=ppc64le" - compiler: [gcc@9.4.0] + prefer: + - "%gcc@9.4.0" + - target=ppc64le providers: blas: [openblas] mpi: [mpich] @@ -31,19 +32,25 @@ spack: mpi: require: mpich mpich: - require: '~wrapperrpath ~hwloc %gcc@9.4.0 target=ppc64le' + require: + - '~wrapperrpath ~hwloc' ncurses: - require: '@6.3 +termlib %gcc@9.4.0 target=ppc64le' + require: + - '@6.3 +termlib' faodel: - require: "~tcmalloc %gcc@9.4.0 target=ppc64le" + require: + - "~tcmalloc" tbb: require: intel-tbb vtk-m: - require: "+examples %gcc@9.4.0 target=ppc64le" + require: + - "+examples" cuda: - require: "@11.4.4 %gcc@9.4.0 target=ppc64le" + require: + - "@11.4.4" paraview: - require: "+examples %gcc@9.4.0 target=ppc64le" + require: + - "+examples" specs: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml index d83646f32a4..25c2bc22a89 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml @@ -7,7 +7,8 @@ spack: packages: all: - require: '%gcc target=x86_64_v3' + require: + - 'target=x86_64_v3' providers: blas: [openblas] variants: +mpi @@ -21,7 +22,9 @@ spack: variants: threads=openmp paraview: # Don't build GUI support or GLX rendering for HPC/container deployments - require: "@5.11 +examples ~qt ^[virtuals=gl] osmesa %gcc target=x86_64_v3" + require: + - "@5.11 +examples ~qt ^[virtuals=gl] osmesa" + - 'target=x86_64_v3' # ROCm comgr: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml index 3aea6fc48a4..867c2ae9a62 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml @@ -2,48 +2,40 @@ spack: view: false packages: all: - require: target=x86_64_v3 + require: + - target=x86_64_v3 + - '%gcc@7.5.0' providers: mpi: [mvapich2] - definitions: - #- compilers: ['%gcc@8.3.1', '%clang@10.0.0'] - - compilers: ['%gcc@7.5.0'] - - # Note skipping spot since no spack package for it - - radiuss: - - ascent # ^conduit@0.6.0 - - axom - - blt - - caliper - - care # ~benchmarks ~examples ~tests - - chai # ~examples - - conduit # ^hdf5+shared - - flux-core - #- flux-sched - - hypre - - lbann - - lvarray ~tests # per Spack issue #23192 # ~examples - - mfem - - py-hatchet - - py-maestrowf - - py-merlin - - py-shroud - - raja # ~examples # ~tests - - raja-perf - - samrai - - scr - - sundials - - umpire # ~openmp - #- visit # ^mesa-glu@9.0.0 - - xbraid - - zfp - specs: - - matrix: - - [$radiuss] - - [$compilers] + - ascent # ^conduit@0.6.0 + - axom + - blt + - caliper + - care # ~benchmarks ~examples ~tests + - chai # ~examples + - conduit # ^hdf5+shared + - flux-core + # - flux-sched + - hypre + - lbann + - lvarray ~tests # per Spack issue #23192 # ~examples + - mfem + - py-hatchet + - py-maestrowf + - py-merlin + - py-shroud + - raja # ~examples # ~tests + - raja-perf + - samrai + - scr + - sundials + - umpire # ~openmp + # - visit # ^mesa-glu@9.0.0 + - xbraid + - zfp cdash: build-group: RADIUSS diff --git a/share/spack/gitlab/cloud_pipelines/stacks/windows-vis/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/windows-vis/spack.yaml index 1d2546b6980..5ee06adc2b8 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/windows-vis/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/windows-vis/spack.yaml @@ -6,7 +6,7 @@ spack: view: false specs: - - vtk~mpi + - vtk@9~mpi cdash: build-group: Windows Visualization (Kitware)