From afbafb03204cdc597ea712ffc889dbe226ca2142 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 17 Feb 2026 11:56:56 -0700 Subject: [PATCH 1/4] Update .gitmodules and submodule pointer for repos/builtin for code review and testing --- .gitmodules | 6 ++++-- repos/builtin | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..42cdc0f71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,7 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + #url = https://github.com/jcsda/spack-packages + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack-packages + branch = feature/cherry_pick_codee_e07895d7186370847b19b53b22cbe0698d972818 diff --git a/repos/builtin b/repos/builtin index 64cccad58..802482d23 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 64cccad58b7806c458e8d86d7fb9d864c025e82a +Subproject commit 802482d234a2c01c72856c2cc79bdb89c40568af From 69bdb2ae2c7412ac075fcadea7d8688e45eafbf9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 17 Feb 2026 14:23:01 -0700 Subject: [PATCH 2/4] Add codee@2025.4.7 to neptune-env virtual package --- configs/common/packages.yaml | 3 +++ .../spack_repo/spack_stack/packages/neptune_env/package.py | 1 + 2 files changed, 4 insertions(+) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 33420be31..934cde8a5 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -84,6 +84,9 @@ packages: require: - '@3.29:' - +ownlibs + codee: + require: + - '@2025.4.7' # Attention - when updating also check the various jcsda-emc-bundles env packages crtm: require: diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/neptune_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/neptune_env/package.py index 904f648bf..a03c79d5b 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/neptune_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/neptune_env/package.py @@ -32,6 +32,7 @@ class NeptuneEnv(BundlePackage): if not sys.platform == "darwin": depends_on("numactl", type="run") + depends_on("codee", type="run") depends_on("libyaml", type="run") depends_on("p4est", type="run") depends_on("w3emc", type="run") From 4e1f9834003d21f8ef419a0b18e7ec6727a3aef7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 17 Feb 2026 14:34:42 -0700 Subject: [PATCH 3/4] Update submodule pointer for repos/builtin --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 802482d23..dab9d9e6b 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 802482d234a2c01c72856c2cc79bdb89c40568af +Subproject commit dab9d9e6b98322dee3adb1d28452370e933279d8 From e38ddb82d431529bda62faa438f9f34c3f48d109 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 17 Feb 2026 19:35:08 -0700 Subject: [PATCH 4/4] Update submodule pointer for repos/builtin --- .gitmodules | 6 ++---- repos/builtin | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 42cdc0f71..2f6cb0566 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - #url = https://github.com/jcsda/spack-packages - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack-packages - branch = feature/cherry_pick_codee_e07895d7186370847b19b53b22cbe0698d972818 + url = https://github.com/jcsda/spack-packages + branch = spack-stack-dev diff --git a/repos/builtin b/repos/builtin index dab9d9e6b..01a4b52f3 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit dab9d9e6b98322dee3adb1d28452370e933279d8 +Subproject commit 01a4b52f38444cce9f7a3991252e7e0aaace6c13