From 65ab88d26c0c473fd1110303e9fa9260d0e06abe Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 22 Aug 2022 20:50:43 -0600 Subject: [PATCH 1/6] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 10 ++++++---- spack | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index c92fbbc5e..69b4720d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,11 @@ [submodule "spack"] path = spack - #url = https://github.com/spack/spack - #branch = develop - url = https://github.com/NOAA-EMC/spack - branch = jcsda_emc_spack_stack + ##url = https://github.com/spack/spack + ##branch = develop + #url = https://github.com/NOAA-EMC/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/climbfuji/spack + branch = https://github.com/climbfuji/spack/pull/new/feature/update_esmf_from_develop [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 8a949c880..a056b0e8b 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 8a949c880aac1781852eb8c1ef45f32668edcdfb +Subproject commit a056b0e8bcd3c5f68391890d417e11cc4881cae0 From a93066cc7d6d9be62f9e2379ed06a3fa4f7c9296 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 22 Aug 2022 20:56:35 -0600 Subject: [PATCH 2/6] Update .github/workflows/macos-dom.yaml --- .github/workflows/macos-dom.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-dom.yaml b/.github/workflows/macos-dom.yaml index d99c2c603..26671e978 100644 --- a/.github/workflows/macos-dom.yaml +++ b/.github/workflows/macos-dom.yaml @@ -44,9 +44,9 @@ jobs: spack external find spack external find perl - spack external find python@3 + spack external find python spack external find wget - PATH="/usr/local/opt/qt@5/bin:${PATH}" spack external find qt@5 + PATH="/usr/local/opt/qt@5/bin:${PATH}" spack external find qt PATH="/usr/local/opt/curl/bin:${PATH}" spack external find curl spack compiler find From e43a2f7f07f4bf0d4e7305a309367915cb76f722 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Aug 2022 08:25:45 -0600 Subject: [PATCH 3/6] [skip ci] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 10 ++++------ spack | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 69b4720d9..c92fbbc5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,9 @@ [submodule "spack"] path = spack - ##url = https://github.com/spack/spack - ##branch = develop - #url = https://github.com/NOAA-EMC/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/climbfuji/spack - branch = https://github.com/climbfuji/spack/pull/new/feature/update_esmf_from_develop + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/NOAA-EMC/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index a056b0e8b..5fbc9b5d3 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit a056b0e8bcd3c5f68391890d417e11cc4881cae0 +Subproject commit 5fbc9b5d38d53cbbbbb4a0dc8da78974493a6b67 From 7d5da3e3aa5f8f059a2219b771bf763bcc1e0b03 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Aug 2022 15:56:43 -0600 Subject: [PATCH 4/6] Update openmpi version in doc/source/Platforms.rst instructions --- doc/source/Platforms.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/Platforms.rst b/doc/source/Platforms.rst index 0ad75fc71..bbcba61c0 100644 --- a/doc/source/Platforms.rst +++ b/doc/source/Platforms.rst @@ -506,7 +506,7 @@ Remember to activate the ``lua`` module environment and have MacTeX in your sear .. code-block:: console spack config add "packages:python:buildable:False" - spack config add "packages:all:providers:mpi:[openmpi@4.1.3]" + spack config add "packages:all:providers:mpi:[openmpi@4.1.4]" spack config add "packages:all:compiler:[apple-clang@13.1.6]" 7. Optionally, edit site config files and common config files, for example to remove duplicate versions of external packages that are unwanted, add specs in ``envs/jedi-ufs.mymacos/spack.yaml``, etc. @@ -711,7 +711,7 @@ It is recommended to increase the stacksize limit by using ``ulimit -S -s unlimi # Example for Red Hat 8 following the above instructions spack config add "packages:python:buildable:False" - spack config add "packages:all:providers:mpi:[openmpi@4.1.3]" + spack config add "packages:all:providers:mpi:[openmpi@4.1.4]" spack config add "packages:all:compiler:[gcc@11.2.1]" # Example for Ubuntu 20.04 following the above instructions From f4bf2aad6ff52adfefb61e957cc6990931ff2674 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Aug 2022 15:57:10 -0600 Subject: [PATCH 5/6] Remove global-workflow-env from Dom's macOS build --- .github/workflows/macos-dom.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-dom.yaml b/.github/workflows/macos-dom.yaml index 26671e978..54840b60f 100644 --- a/.github/workflows/macos-dom.yaml +++ b/.github/workflows/macos-dom.yaml @@ -50,6 +50,9 @@ jobs: PATH="/usr/local/opt/curl/bin:${PATH}" spack external find curl spack compiler find + # https://github.com/dtcenter/MET/issues/2239 + spack remove global-workflow-env + spack concretize spack install --fail-fast From db04e801f81850630274152c7e4547c73ee553bb Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 24 Aug 2022 07:49:56 -0600 Subject: [PATCH 6/6] [skip ci] Update doc/source/KnownIssues.rst --- doc/source/KnownIssues.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/source/KnownIssues.rst b/doc/source/KnownIssues.rst index f6218feac..b5d0f3a52 100644 --- a/doc/source/KnownIssues.rst +++ b/doc/source/KnownIssues.rst @@ -15,6 +15,9 @@ General There are several build errors with Python 3.10, for example Python packages being installed in nested subdirectories ``local`` of what is supposed to be the target installation directory. We therefore strongly recommend using Python 3.8 or 3.9. +3. Issues starting/finding ``ecflow_server`` due to a mismatch of hostnames + On some systems, ``ecflow_server`` gets confused by multiple hostnames, e.g. ``localhost`` and ``MYORG-L-12345``. The ``ecflow_start.sh`` script reports the hostname it wants to use. This name (or both) must be in ``/etc/hosts`` in the correct address line, often the loopback address (``127.0.0.1``). + ============================== NASA Discover ============================== @@ -61,3 +64,6 @@ macOS 4. Errors such as ``Symbol not found: __cg_png_create_info_struct`` Can happen when trying to use the raster plotting scripts in ``fv3-jedi-tools``. In that case, exporting ``DYLD_LIBRARY_PATH=/usr/lib/:$DYLD_LIBRARY_PATH`` can help. If ``git`` commands fail after this, you might need to verify where ``which git`` points to (Homebrew vs module) and unload the ``git`` module. + +5. Error building MET 10.1.1.20220419 build error on macOS Monterey 12.1 + See https://github.com/NOAA-EMC/spack-stack/issues/316. Note that this error does not occur in the macOS CI tests.