diff --git a/.gitmodules b/.gitmodules index b1f475b64..de2edab38 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/jcsda/spack - branch = jcsda_emc_spack_stack + ##url = https://github.com/spack/spack + ##branch = develop + #url = https://github.com/jcsda/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/climbfuji/spack + branch = feature/pytorch_internal_protobuf [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index b1f29d9c8..d95bf8fba 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b1f29d9c8105f36390e6e8f0178ab6e6005b30d6 +Subproject commit d95bf8fba7da1b0cf68851bf11dffa4852dc440f diff --git a/spack-ext/repos/spack-stack/packages/ai-env/package.py b/spack-ext/repos/spack-stack/packages/ai-env/package.py index 1d50e0a78..2d7379f45 100644 --- a/spack-ext/repos/spack-stack/packages/ai-env/package.py +++ b/spack-ext/repos/spack-stack/packages/ai-env/package.py @@ -18,6 +18,6 @@ class AiEnv(BundlePackage): version("1.0.0") depends_on("jedi-base-env", type="run") - depends_on("py-torch", type="run") + depends_on("py-torch +internal-protobuf", type="run") # There is no need for install() since there is no code.