search

JCSDA / spack

A flexible package manager that supports multiple versions, configurations, platforms, and compilers.
https://spack.io
Other
0 stars 14 forks source link

Merge spack develop as of 2024/05/09 into spack-stack-dev #432

Closed climbfuji closed 6 months ago

climbfuji commented 6 months ago

Description

Yet another round of updates from spack develop as of 2024/05/09 (**Spack:** 0.22.0.dev0 (4154b2d83f87ae1408ceb604d6b9d5fee444f866))

Please note the merge conflicts that I had to fix and additional commits to fix installation errors on my macOS for the unified environment:

Merge branch 'develop' of https://github.com/spack/spack into feature/merge_spack_develop_into_spack_stack_dev_20240509

# Conflicts:
#       lib/spack/spack/modules/common.py
#       var/spack/repos/builtin/packages/awscli-v2/package.py
#       var/spack/repos/builtin/packages/fms/package.py
#       var/spack/repos/builtin/packages/fontconfig/package.py
#       var/spack/repos/builtin/packages/g2c/package.py
#       var/spack/repos/builtin/packages/g2tmpl/package.py
#       var/spack/repos/builtin/packages/gdal/package.py
#       var/spack/repos/builtin/packages/glib/package.py
#       var/spack/repos/builtin/packages/grads/package.py
#       var/spack/repos/builtin/packages/grib-util/package.py
#       var/spack/repos/builtin/packages/hdf-eos2/package.py
#       var/spack/repos/builtin/packages/libjpeg-turbo/package.py
#       var/spack/repos/builtin/packages/nco/package.py
#       var/spack/repos/builtin/packages/netcdf-fortran/package.py
#       var/spack/repos/builtin/packages/pixman/package.py
#       var/spack/repos/builtin/packages/prod-util/package.py
#       var/spack/repos/builtin/packages/py-torch/package.py
#       var/spack/repos/builtin/packages/python/package.py
#       var/spack/repos/builtin/packages/scotch/package.py
#       var/spack/repos/builtin/packages/w3nco/package.py
#       var/spack/repos/builtin/packages/zlib-ng/package.py
#       var/spack/repos/builtin/packages/zstd/package.py
#

AND

commit 37dce57a0fa0e0d6dcee917d3f37bff3db6a7f7e (HEAD -> feature/merge_spack_develop_into_spack_stack_dev_20240509)
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri May 10 11:09:03 2024 -0600

    Bug fix in var/spack/repos/builtin/packages/ecflow/package.py: 5.11.4 does not build with boost 1.85:

AND

commit e3a929305c1febd70c48c081fd51d225a9aabcf2 (HEAD -> feature/merge_spack_develop_into_spack_stack_dev_20240509, dom/feature/merge_spack_develop_into_spack_stack_dev_20240509)
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 16 14:10:19 2024 -0600

    Revert netcdf-cxx4 back to autotools version

AND

commit c30b4fc075ccccc130beb5873c26529d758ed007 (HEAD -> feature/merge_spack_develop_into_spack_stack_dev_20240509)
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri May 10 13:31:54 2024 -0600

    Fix new syntax in lib/spack/spack/modules/common.py to have case-preserving {name}_ROOT env variables in auto-generated module files

AND

commit 101cce38ae799d83e457077edafb35a64a74c88a (HEAD -> feature/merge_spack_develop_into_spack_stack_dev_20240509, dom/feature/merge_spack_develop_into_spack_stack_dev_20240509)
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri May 10 14:57:31 2024 -0600

    Fix package audit errors in var/spack/repos/builtin/packages/ufs-weather-model/package.py

We should consider cherry-picking the first two commits and sending them upstream to address https://github.com/spack/spack/issues/44122 and https://github.com/spack/spack/issues/44116.

Update. I think it's unlikely they will accept the reversal of the builder for netcdf-cxx4, but I already sent the changes for ecflow in https://github.com/spack/spack/pull/44181.

Issue(s) addressed

Resolves https://github.com/JCSDA/spack/issues/429 !

Dependencies

n/a

Impact

Updates to spack-stack required, potentially more bug fixes when building the unified environment on tier 1 platforms and configurable platforms.

Checklist