Merge branch 'main' into add_notebooks_for_dli

NVIDIA · Jan 28, 2025 · 4b94e9b · 4b94e9b
2 parents 5fa34ce + d226101
commit 4b94e9b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2,007 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,3 +3,4 @@ include nvflare/_version.py
 include nvflare/libs/*.so
 include nvflare/fuel/utils/*.json
 include nvflare/private/fed/app/simulator/log_config.json
+include nvflare/lighter/templates
diff --git a/nvflare/dashboard/application/blob.py b/nvflare/dashboard/application/blob.py
@@ -24,10 +24,10 @@
 from .models import Client, Project, User
 
 lighter_folder = os.path.dirname(utils.__file__)
-template = utils.load_yaml(os.path.join(lighter_folder, "impl", "master_template.yml"))
+template = utils.load_yaml(os.path.join(lighter_folder, "templates", "master_template.yml"))
 supported_csps = ["aws", "azure"]
 for csp in supported_csps:
-    csp_template_file = os.path.join(lighter_folder, "impl", f"{csp}_template.yml")
+    csp_template_file = os.path.join(lighter_folder, "templates", f"{csp}_template.yml")
     if os.path.exists(csp_template_file):
         template.update(utils.load_yaml(csp_template_file))
 

diff --git a/nvflare/dashboard/cli.py b/nvflare/dashboard/cli.py
@@ -137,9 +137,9 @@ def stop():
 
 def cloud(args):
     lighter_folder = os.path.dirname(utils.__file__)
-    template = utils.load_yaml(os.path.join(lighter_folder, "impl", "master_template.yml"))
-    template.update(utils.load_yaml(os.path.join(lighter_folder, "impl", "aws_template.yml")))
-    template.update(utils.load_yaml(os.path.join(lighter_folder, "impl", "azure_template.yml")))
+    template = utils.load_yaml(os.path.join(lighter_folder, "templates", "master_template.yml"))
+    template.update(utils.load_yaml(os.path.join(lighter_folder, "templates", "aws_template.yml")))
+    template.update(utils.load_yaml(os.path.join(lighter_folder, "templates", "azure_template.yml")))
     tplt = tplt_utils.Template(template)
     cwd = os.getcwd()
     csp = args.cloud