From 0fde42d707dfa0633eb26adb853595b61e7eb15e Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Fri, 30 Aug 2024 09:12:49 -0600 Subject: [PATCH 1/7] Changes to get Mac Sonoma 14.6.1 with Command Line Tools 15.3 working --- .gitmodules | 6 ++++-- doc/source/NewSiteConfigs.rst | 7 ++++++- spack | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5c7383f2..66778fc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = release/1.8.0 + #url = https://github.com/jcsda/spack + #branch = release/1.8.0 + url = https://github.com/srherbener/spack + branch = feature/enable-mac-sonoma [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/doc/source/NewSiteConfigs.rst b/doc/source/NewSiteConfigs.rst index b4116538..4d86a1d1 100644 --- a/doc/source/NewSiteConfigs.rst +++ b/doc/source/NewSiteConfigs.rst @@ -152,6 +152,8 @@ These instructions are meant to be a reference that users can follow to set up t brew install libiconv # Note - need to pin to version 5 brew install qt@5 + # Note - for mac Sonoma + brew install m4 # Note - only needed for running JCSDA's # JEDI-Skylab system (using R2D2 localhost) @@ -245,9 +247,12 @@ Remember to activate the ``lua`` module environment and have MacTeX in your sear PATH="$HOMEBREW_ROOT/opt/curl/bin:$PATH" \ spack external find --scope system curl - PATH="$HOMEBREW_ROOT/opt/qt@5/bin:$PATH" \ + PATH="$HOMEBREW_ROOT/opt/qt\@5/bin:$PATH" \ spack external find --scope system qt + PATH="$HOMEBREW_ROOT/opt/m4/bin:$PATH" \ + spack external find --scope system m4 + # Optional, only if planning to build jedi-tools environment with LaTeX support # The texlive bin directory must have been added to PATH (see above) spack external find --scope system texlive diff --git a/spack b/spack index 33eea047..e830ddaa 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 33eea04798da9317b9e48862291f3dfa9788d0e7 +Subproject commit e830ddaa8a94d75ecab0a6e7c50e8adc053e1910 From 912e53ab0460f1419ab1f4c84f39142943601332 Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Fri, 30 Aug 2024 17:29:40 -0600 Subject: [PATCH 2/7] Update spack submodule hash --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index e830ddaa..276956ad 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e830ddaa8a94d75ecab0a6e7c50e8adc053e1910 +Subproject commit 276956ad8c629318075a50f06b1daae3dd17972a From af838f990541ca78873462302a9edcae31b5940c Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Sat, 31 Aug 2024 11:41:28 -0600 Subject: [PATCH 3/7] Added "brew install pkg-config" for mac Sonoma instructions --- doc/source/NewSiteConfigs.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/NewSiteConfigs.rst b/doc/source/NewSiteConfigs.rst index 4d86a1d1..afd5305b 100644 --- a/doc/source/NewSiteConfigs.rst +++ b/doc/source/NewSiteConfigs.rst @@ -152,8 +152,9 @@ These instructions are meant to be a reference that users can follow to set up t brew install libiconv # Note - need to pin to version 5 brew install qt@5 - # Note - for mac Sonoma + # Note - For Sonoma only, install m4 and pkg-config brew install m4 + brew install pkg-config # Note - only needed for running JCSDA's # JEDI-Skylab system (using R2D2 localhost) @@ -247,7 +248,7 @@ Remember to activate the ``lua`` module environment and have MacTeX in your sear PATH="$HOMEBREW_ROOT/opt/curl/bin:$PATH" \ spack external find --scope system curl - PATH="$HOMEBREW_ROOT/opt/qt\@5/bin:$PATH" \ + PATH="$HOMEBREW_ROOT/opt/qt@5/bin:$PATH" \ spack external find --scope system qt PATH="$HOMEBREW_ROOT/opt/m4/bin:$PATH" \ From 70be2a24fa43ca7b73f655432d81ada89d90709a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 3 Sep 2024 17:00:39 -0600 Subject: [PATCH 4/7] Add variant shared for macos.default site config --- configs/sites/tier2/macos.default/packages.yaml | 3 +++ spack | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/sites/tier2/macos.default/packages.yaml b/configs/sites/tier2/macos.default/packages.yaml index f08498c6..7765c40d 100644 --- a/configs/sites/tier2/macos.default/packages.yaml +++ b/configs/sites/tier2/macos.default/packages.yaml @@ -1,6 +1,9 @@ packages: cairo: variants: ~png ~svg + # https://github.com/JCSDA/spack-stack/issues/1211 + fms: + variants: +shared git: buildable: false libiconv: diff --git a/spack b/spack index 276956ad..b0654766 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 276956ad8c629318075a50f06b1daae3dd17972a +Subproject commit b0654766f0150074a1873c025c6524087b59cfbb From bba752924c6460c3431d5ce29e0b0b39acc4cfd4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 3 Sep 2024 20:49:04 -0600 Subject: [PATCH 5/7] Update submodule pointer for spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index b0654766..18084523 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b0654766f0150074a1873c025c6524087b59cfbb +Subproject commit 18084523b061686a920841c5766df86847fa2a45 From 2c4cc424b346f469831272df37783ac7ca1c982b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Sep 2024 16:22:44 -0600 Subject: [PATCH 6/7] Update syntax for fms and wgrib2 in configs/sites/tier2/macos.default/packages.yaml and configs/common/packages.yaml so that the macOS settings get combined with the default settings --- configs/common/packages.yaml | 8 +++++--- configs/sites/tier2/macos.default/packages.yaml | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 1deb17e3..7f08bdf9 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -75,8 +75,9 @@ packages: # Pin version to avoid duplicates require: '@2.6.4' fms: - require: '@2024.02' - variants: 'precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io' + require: + - '@2024.02' + - 'precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io' fontconfig: require: '+pic' freetype: @@ -274,7 +275,8 @@ packages: w3nco: require: '@2.4.1' wgrib2: - require: '@3.1.1' + require: + - '@3.1.1' wrf-io: require: '@1.2.0' zstd: diff --git a/configs/sites/tier2/macos.default/packages.yaml b/configs/sites/tier2/macos.default/packages.yaml index 7765c40d..ddb2d126 100644 --- a/configs/sites/tier2/macos.default/packages.yaml +++ b/configs/sites/tier2/macos.default/packages.yaml @@ -3,10 +3,12 @@ packages: variants: ~png ~svg # https://github.com/JCSDA/spack-stack/issues/1211 fms: - variants: +shared + require: + - '+shared' git: buildable: false libiconv: buildable: false wgrib2: - variants: ~openmp + require: + - '~openmp' From 4cf77d1df89a3e2f5376707315a6c191a84bf67e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Sep 2024 20:17:28 -0600 Subject: [PATCH 7/7] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 66778fc5..5c7383f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = release/1.8.0 - url = https://github.com/srherbener/spack - branch = feature/enable-mac-sonoma + url = https://github.com/jcsda/spack + branch = release/1.8.0 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 9ec296ab..1b3e3e52 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 9ec296abca1ba22e7e75b14cd1658abfbe6966ea +Subproject commit 1b3e3e5252e5b0e4cb28f9e4255e84ea1a06ff5f