From 6b2164f7e821990eec0f1d2200a892b21b4ca5cd Mon Sep 17 00:00:00 2001 From: ajwr Date: Tue, 22 Nov 2022 14:05:36 -0800 Subject: [PATCH 01/27] point to updated spack branch for ufs-related changes --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index c92fbbc5e..80fd5df46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,8 @@ 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/AlexanderRichert-NOAA/spack_NOAAEMC + branch = ufs_hera_update [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From 3a7edac260576f14fe9b4405ab3ebcce7d024741 Mon Sep 17 00:00:00 2001 From: ajwr Date: Tue, 29 Nov 2022 13:30:27 -0800 Subject: [PATCH 02/27] Update submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 80fd5df46..7e71259b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ #url = https://github.com/spack/spack #branch = develop url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC - branch = ufs_hera_update + branch = develop [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From 99625a2d1299eb5712822dfefe7a26b099376f6c Mon Sep 17 00:00:00 2001 From: ajwr Date: Tue, 29 Nov 2022 13:30:50 -0800 Subject: [PATCH 03/27] Update submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7e71259b0..80fd5df46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ #url = https://github.com/spack/spack #branch = develop url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC - branch = develop + branch = ufs_hera_update [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From ae7981db0402a0e22d66001aacc4e4ad9fede85b Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 1 Dec 2022 14:01:08 -0800 Subject: [PATCH 04/27] Update spack submodule --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index a5127b4b8..683a6aa5a 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit a5127b4b834ffcb524dd7b34bed496a791bad962 +Subproject commit 683a6aa5aa350bba681217eb737c8e10b4d1034f From ad9c839f2e2fe63b688b394a60afe173d869e694 Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 1 Dec 2022 17:26:16 -0800 Subject: [PATCH 05/27] Update submodule pointer --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 683a6aa5a..19dde1320 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 683a6aa5aa350bba681217eb737c8e10b4d1034f +Subproject commit 19dde1320f7fb9331ba69eebfdd4ebd604b809da From acb7b4eaa9663bfab168448434132b014492c28b Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 1 Dec 2022 19:02:43 -0800 Subject: [PATCH 06/27] Update spack submodule pointer --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 19dde1320..69094bc74 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 19dde1320f7fb9331ba69eebfdd4ebd604b809da +Subproject commit 69094bc7455e1381c33092e0436269595a98cbfb From db7e42fbd0693215053051a8b16f662937141df2 Mon Sep 17 00:00:00 2001 From: ajwr Date: Wed, 7 Dec 2022 17:23:15 -0800 Subject: [PATCH 07/27] Add ufs-weather-model-static template --- .../ufs-weather-model-static/spack.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 configs/templates/ufs-weather-model-static/spack.yaml diff --git a/configs/templates/ufs-weather-model-static/spack.yaml b/configs/templates/ufs-weather-model-static/spack.yaml new file mode 100644 index 000000000..df394f65a --- /dev/null +++ b/configs/templates/ufs-weather-model-static/spack.yaml @@ -0,0 +1,43 @@ +spack: + concretizer: + unify: true + + config: + install_tree: + root: $env/install + modules: + default: + roots: + lmod: $env/install/modulefiles + tcl: $env/install/modulefiles + + view: false + include: [] + + specs: + - cmake + - git + - wget + - curl + - jasper@2.0.25~shared + - libjpeg-turbo~shared + - libpng@1.6.37~shared + - zlib@1.2.11~shared + - bacio@2.4.1 + - crtm@2.4.0 + - esmf@8.3.0b09+debug~shared + - esmf@8.3.0b09~debug~shared + - fms@2022.01 + - g2@3.4.5 + - g2tmpl@1.10.0 + - gftl-shared@1.5.0 + - hdf5@1.10.6+hl+mpi~shared + - ip@3.3.3 + - mapl@2.22.0~pnetcdf+debug~shared + - mapl@2.22.0~pnetcdf~debug~shared + - netcdf-c@4.7.4~parallel-netcdf+v2+mpi~shared + - netcdf-fortran@4.5.4~shared + - parallel-netcdf@1.12.2~shared + - parallelio@2.5.7+fortran~pnetcdf~shared + - sp@2.3.3 + - w3emc@2.9.2 From 1a1828fa42d76d89fea4d38b1245add045d71fda Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Thu, 8 Dec 2022 03:44:31 +0000 Subject: [PATCH 08/27] UFS static template: sort packages; remove unnecessary packages; unify when_possible --- .../ufs-weather-model-static/spack.yaml | 57 +++++++++---------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/configs/templates/ufs-weather-model-static/spack.yaml b/configs/templates/ufs-weather-model-static/spack.yaml index df394f65a..c1c3dd206 100644 --- a/configs/templates/ufs-weather-model-static/spack.yaml +++ b/configs/templates/ufs-weather-model-static/spack.yaml @@ -1,7 +1,6 @@ spack: concretizer: - unify: true - + unify: when_possible config: install_tree: root: $env/install @@ -10,34 +9,30 @@ spack: roots: lmod: $env/install/modulefiles tcl: $env/install/modulefiles - view: false - include: [] - + include: + - site + - common specs: - - cmake - - git - - wget - - curl - - jasper@2.0.25~shared - - libjpeg-turbo~shared - - libpng@1.6.37~shared - - zlib@1.2.11~shared - - bacio@2.4.1 - - crtm@2.4.0 - - esmf@8.3.0b09+debug~shared - - esmf@8.3.0b09~debug~shared - - fms@2022.01 - - g2@3.4.5 - - g2tmpl@1.10.0 - - gftl-shared@1.5.0 - - hdf5@1.10.6+hl+mpi~shared - - ip@3.3.3 - - mapl@2.22.0~pnetcdf+debug~shared - - mapl@2.22.0~pnetcdf~debug~shared - - netcdf-c@4.7.4~parallel-netcdf+v2+mpi~shared - - netcdf-fortran@4.5.4~shared - - parallel-netcdf@1.12.2~shared - - parallelio@2.5.7+fortran~pnetcdf~shared - - sp@2.3.3 - - w3emc@2.9.2 + - jasper@2.0.25~shared + - libjpeg-turbo~shared + - libpng@1.6.37~shared + - zlib@1.2.11~shared + - bacio@2.4.1 + - crtm@2.4.0 + - esmf@8.3.0b09+debug~shared + - esmf@8.3.0b09~debug~shared + - fms@2022.01 + - g2@3.4.5 + - g2tmpl@1.10.0 + - gftl-shared@1.5.0 + - hdf5@1.10.6+hl+mpi~shared + - ip@3.3.3 + - mapl@2.22.0~pnetcdf+debug~shared + - mapl@2.22.0~pnetcdf~debug~shared + - netcdf-c@4.7.4~parallel-netcdf+v2+mpi~shared~dap + - netcdf-fortran@4.5.4~shared + - parallel-netcdf@1.12.2~shared + - parallelio@2.5.7+fortran~pnetcdf~shared + - sp@2.3.3 + - w3emc@2.9.2 From ee04eda5c72e895caa4fe9d737214258394bd6b8 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Thu, 8 Dec 2022 07:36:16 +0000 Subject: [PATCH 09/27] pointer update --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 69094bc74..027a1ff15 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 69094bc7455e1381c33092e0436269595a98cbfb +Subproject commit 027a1ff1547b818f034e65a4dda9ad9fb0959d74 From f4cf5ee9e835bdf361397967429f34bfab0b89a4 Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 8 Dec 2022 12:05:08 -0800 Subject: [PATCH 10/27] update pointer; testing with old netcdf-c package.py --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 027a1ff15..f88aabaf2 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 027a1ff1547b818f034e65a4dda9ad9fb0959d74 +Subproject commit f88aabaf2f4f9f8e925faf1968a7b0c3550fd429 From c702efe2e9e29652df0daf5539703a18db217d92 Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 8 Dec 2022 13:27:19 -0800 Subject: [PATCH 11/27] point to spack with update for simplified netcdf-c --- configs/templates/ufs-weather-model-static/spack.yaml | 2 +- spack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/templates/ufs-weather-model-static/spack.yaml b/configs/templates/ufs-weather-model-static/spack.yaml index c1c3dd206..2116cf006 100644 --- a/configs/templates/ufs-weather-model-static/spack.yaml +++ b/configs/templates/ufs-weather-model-static/spack.yaml @@ -30,7 +30,7 @@ spack: - ip@3.3.3 - mapl@2.22.0~pnetcdf+debug~shared - mapl@2.22.0~pnetcdf~debug~shared - - netcdf-c@4.7.4~parallel-netcdf+v2+mpi~shared~dap + - netcdf-c@4.7.4~parallel-netcdf+mpi~shared~dap - netcdf-fortran@4.5.4~shared - parallel-netcdf@1.12.2~shared - parallelio@2.5.7+fortran~pnetcdf~shared diff --git a/spack b/spack index f88aabaf2..804b038bc 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit f88aabaf2f4f9f8e925faf1968a7b0c3550fd429 +Subproject commit 804b038bc4ed340ec67089bcf67348a07a3ccc32 From 60a1224ef5d7ab28721da21466aa3a4faf0e7463 Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 8 Dec 2022 15:17:30 -0800 Subject: [PATCH 12/27] adding debug info for netcdf-fortran/doxygen/dot problem --- .github/actions/setup-spack-stack/action.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/actions/setup-spack-stack/action.yaml b/.github/actions/setup-spack-stack/action.yaml index 6b8680370..677f3cb59 100644 --- a/.github/actions/setup-spack-stack/action.yaml +++ b/.github/actions/setup-spack-stack/action.yaml @@ -225,6 +225,14 @@ runs: # tail -n 10 spack_install.log # sleep 60 #done + echo "which doxygen: $(which doxygen)" + echo "which dot: $(which dot)" + echo "/usr/bin" + ls /usr/bin + echo "/usr/local/bin" + ls /usr/local/bin + echo "find doxygen or dot in Cellar" + find /usr/local/Cellar \( -name doxygen -o -name dot \) spack install --fail-fast - name: create-meta-modules From 7e7a1e0914fbf31e20da864b78959e92536a5b6c Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 8 Dec 2022 16:17:36 -0800 Subject: [PATCH 13/27] u --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 80fd5df46..f10eea2d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "spack"] path = spack - #url = https://github.com/spack/spack - #branch = develop - url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC - branch = ufs_hera_update + url = https://github.com/NOAA-EMC/spack + branch = jcsda_emc_spack_stack + #url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC + #branch = ufs_hera_update [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From fa29afa1326ccf964668aa8b21c9fa8a3586ffd4 Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 8 Dec 2022 16:18:05 -0800 Subject: [PATCH 14/27] try NOAA-EMC/spack for netcdf-fortran issue --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 804b038bc..e4359d68e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 804b038bc4ed340ec67089bcf67348a07a3ccc32 +Subproject commit e4359d68e1f98d376b0289ef29e2f2f74ec65eb6 From 9912daa58d9c78dc97bfca9f3b03cdc69fe3956f Mon Sep 17 00:00:00 2001 From: ajwr Date: Thu, 8 Dec 2022 18:18:24 -0800 Subject: [PATCH 15/27] revert debug action stuff --- .github/actions/setup-spack-stack/action.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/actions/setup-spack-stack/action.yaml b/.github/actions/setup-spack-stack/action.yaml index 677f3cb59..6b8680370 100644 --- a/.github/actions/setup-spack-stack/action.yaml +++ b/.github/actions/setup-spack-stack/action.yaml @@ -225,14 +225,6 @@ runs: # tail -n 10 spack_install.log # sleep 60 #done - echo "which doxygen: $(which doxygen)" - echo "which dot: $(which dot)" - echo "/usr/bin" - ls /usr/bin - echo "/usr/local/bin" - ls /usr/local/bin - echo "find doxygen or dot in Cellar" - find /usr/local/Cellar \( -name doxygen -o -name dot \) spack install --fail-fast - name: create-meta-modules From 3b7cb2b6513a56c0890ac391fab47059e00c4325 Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 09:26:57 -0800 Subject: [PATCH 16/27] update spack pointer --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index e4359d68e..be4488b22 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e4359d68e1f98d376b0289ef29e2f2f74ec65eb6 +Subproject commit be4488b223039ebfc99abe9edc3cee2493b949af From 2f3dd55c62ec2481710747a6068c31d77e8285bb Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 10:21:18 -0800 Subject: [PATCH 17/27] pointing back to my spack --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index f10eea2d2..e2836a52e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/NOAA-EMC/spack - branch = jcsda_emc_spack_stack - #url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC - #branch = ufs_hera_update + #url = https://github.com/NOAA-EMC/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC + branch = ufs_hera_update [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From 7b6dc3c0497d146f95a08c75e03645c2951df4ca Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 10:25:05 -0800 Subject: [PATCH 18/27] point back to my spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index be4488b22..804b038bc 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit be4488b223039ebfc99abe9edc3cee2493b949af +Subproject commit 804b038bc4ed340ec67089bcf67348a07a3ccc32 From fd505dcd703f08f959a3ea6cb58807bd37aab9e6 Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 10:42:35 -0800 Subject: [PATCH 19/27] Trying with upstream hdf & both netcdf's --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 804b038bc..50a0cb0fb 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 804b038bc4ed340ec67089bcf67348a07a3ccc32 +Subproject commit 50a0cb0fbe0f7cd60ef4cdf7385470fd71686bb3 From 4d24fb39bbc56fe2d989beb9dcdab181d4ed1763 Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 13:23:57 -0800 Subject: [PATCH 20/27] add hdf5 back into mix --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 50a0cb0fb..11146567f 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 50a0cb0fbe0f7cd60ef4cdf7385470fd71686bb3 +Subproject commit 11146567fe9a0f71edf0fe9fb912fb2e1d668a12 From 31dc6817adc1e93068c83b24a4d6d2cd3e9e94da Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 14:34:47 -0800 Subject: [PATCH 21/27] restore netcdf-c changes --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 11146567f..a5ee2e796 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 11146567fe9a0f71edf0fe9fb912fb2e1d668a12 +Subproject commit a5ee2e7967b15de42f0feac3e2638a1056e61ad8 From c3b49b2cbd84dfcb7d576b5533a8b113d596b4cc Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 16:44:20 -0800 Subject: [PATCH 22/27] reincluding modified netcdf-fortran --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index a5ee2e796..685b68cf7 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit a5ee2e7967b15de42f0feac3e2638a1056e61ad8 +Subproject commit 685b68cf72f74223d5d3eae6aa7d24a56a48b2bf From e1cdffa3531eb1e1de5e008dc5dc49c85f6c677b Mon Sep 17 00:00:00 2001 From: ajwr Date: Fri, 9 Dec 2022 16:56:12 -0800 Subject: [PATCH 23/27] reincluding modified netcdf-fortran - fix --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 685b68cf7..5a70ec920 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 685b68cf72f74223d5d3eae6aa7d24a56a48b2bf +Subproject commit 5a70ec92050ed3f2f9821417cadf2a0b764d3983 From 2b4a2a492972377c2c420d292fe2437cda520e10 Mon Sep 17 00:00:00 2001 From: ajwr Date: Sat, 10 Dec 2022 09:21:18 -0800 Subject: [PATCH 24/27] Update pointer after hdf5 pkgconfig patch fix --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 5a70ec920..78e6013fe 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 5a70ec92050ed3f2f9821417cadf2a0b764d3983 +Subproject commit 78e6013fe81fcd53e60d379d3b560acfb3791821 From fce4e1a170039a54ff95e3a42f24393228578064 Mon Sep 17 00:00:00 2001 From: ajwr Date: Mon, 12 Dec 2022 09:24:50 -0800 Subject: [PATCH 25/27] point .gitmodules back to NOAA-EMC repo --- .gitmodules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index e2836a52e..04eb2153f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/NOAA-EMC/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/AlexanderRichert-NOAA/spack_NOAAEMC - branch = ufs_hera_update + 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 From 9936ac2fee04579c27d83ebd45cad5352be1e5df Mon Sep 17 00:00:00 2001 From: ajwr Date: Mon, 12 Dec 2022 09:27:03 -0800 Subject: [PATCH 26/27] update spack submodule pointer --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 78e6013fe..377817d6c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 78e6013fe81fcd53e60d379d3b560acfb3791821 +Subproject commit 377817d6ce84cb0eeef60b0f7872c4a9638ca8fa From 03c9438df73aa194744090a9f045b8e26a4f4349 Mon Sep 17 00:00:00 2001 From: Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> Date: Mon, 12 Dec 2022 10:00:00 -0800 Subject: [PATCH 27/27] Update .gitmodules --- .gitmodules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmodules b/.gitmodules index 04eb2153f..c92fbbc5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,7 @@ [submodule "spack"] path = spack + #url = https://github.com/spack/spack + #branch = develop url = https://github.com/NOAA-EMC/spack branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"]