From 5e26435ea8979d707a16db1a465e08e99ca2d503 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 17 Jan 2024 20:27:13 -0700 Subject: [PATCH] Enable mpi variant for pflogger as a workaround for the pflogger build system --- .github/workflows/ubuntu-ci-x86_64.yaml | 3 +++ .github/workflows/ubuntu-rnd-x86_64.yaml | 6 ++++++ configs/sites/aws-pcluster/packages.yaml | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml index dace76e13..64281eb78 100644 --- a/.github/workflows/ubuntu-ci-x86_64.yaml +++ b/.github/workflows/ubuntu-ci-x86_64.yaml @@ -116,6 +116,9 @@ jobs: # Add additional variants for MET packages, different from config/common/packages.yaml spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis" + # https://github.com/spack/spack/issues/42137 + spack config add "packages:pflogger:variants:+mpi" + # Concretize and check for duplicates spack concretize 2>&1 | tee log.concretize.intel-2022.1.0 ${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2022.1.0 -i fms -i crtm -i esmf -i mapl diff --git a/.github/workflows/ubuntu-rnd-x86_64.yaml b/.github/workflows/ubuntu-rnd-x86_64.yaml index 6b924468c..e11a0e9ac 100644 --- a/.github/workflows/ubuntu-rnd-x86_64.yaml +++ b/.github/workflows/ubuntu-rnd-x86_64.yaml @@ -64,6 +64,9 @@ jobs: # Add additional variants for MET packages, different from config/common/packages.yaml spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis" + # https://github.com/spack/spack/issues/42137 + spack config add "packages:pflogger:variants:+mpi" + # Overrides for spack build and staging areas to speed up builds, # separate from the default site config locations to avoid conflicts spack config add "config:build_stage:/home/ubuntu/spack-stack/CI/tmp/build_stage" @@ -130,6 +133,9 @@ jobs: # Add additional variants for MET packages, different from config/common/packages.yaml spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis" + # https://github.com/spack/spack/issues/42137 + spack config add "packages:pflogger:variants:+mpi" + # Overrides for spack build and staging areas to speed up builds, # separate from the default site config locations to avoid conflicts spack config add "config:build_stage:/home/ubuntu/spack-stack/CI/tmp/build_stage" diff --git a/configs/sites/aws-pcluster/packages.yaml b/configs/sites/aws-pcluster/packages.yaml index ee9922c6d..50830f9a6 100644 --- a/configs/sites/aws-pcluster/packages.yaml +++ b/configs/sites/aws-pcluster/packages.yaml @@ -30,6 +30,12 @@ packages: - libfabric-aws/1.16.0~amzn4.0 - openmpi/4.1.4 +### Modification of common packages + + # https://github.com/spack/spack/issues/42137 + pflogger: + variants: +mpi + ### All other external packages listed alphabetically autoconf: externals: