-
Notifications
You must be signed in to change notification settings - Fork 181
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Flower SuperExec plugin #2855
Draft
panh99
wants to merge
6
commits into
NVIDIA:main
Choose a base branch
from
panh99:intro-flower-superexec-plugin
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
68a4467
add superexec plugin
panh99 1e29911
use Flower job
panh99 1fde0ed
Merge branch 'main' into intro-flower-superexec-plugin
panh99 58d7a4f
convert tmp_dir to str
panh99 162030e
Merge branch 'intro-flower-superexec-plugin' of https://github.com/pa…
panh99 7f9acde
Merge branch 'main' into intro-flower-superexec-plugin
panh99 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,191 @@ | ||
# Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import tempfile | ||
from logging import ERROR | ||
from pathlib import Path | ||
from typing import List | ||
|
||
import pathspec | ||
import shutil | ||
from flwr.cli.config_utils import get_fab_metadata | ||
from flwr.cli.install import install_from_fab | ||
from flwr.common.logger import log | ||
from flwr.common.typing import UserConfig | ||
from flwr.superexec.executor import Executor as FlowerSuperExecExecutor | ||
from flwr.superexec.executor import RunTracker | ||
from typing_extensions import Optional, override | ||
from nvflare.app_opt.flower.flower_job import FlowerJob | ||
|
||
from nvflare.fuel.flare_api.flare_api import Session, new_secure_session | ||
|
||
SESSION_ARGS = {"username", "startup_kit_location", "debug", "timeout"} | ||
|
||
|
||
def _get_job_name(publisher: str, app_name: str, app_version: str) -> str: | ||
"""Generate the job name.""" | ||
# Replace invalid characters | ||
app_name = app_name.replace(" ", "_") | ||
|
||
# Return the job name | ||
return f"{app_name}@{publisher}[{app_version}]" | ||
|
||
|
||
def _load_gitignore(directory: Path) -> pathspec.PathSpec: | ||
"""Load and parse .gitignore file, returning a pathspec.""" | ||
gitignore_path = directory / ".gitignore" | ||
patterns = ["__pycache__/"] # Default pattern | ||
if gitignore_path.exists(): | ||
with open(gitignore_path, encoding="UTF-8") as file: | ||
patterns.extend(file.readlines()) | ||
return pathspec.PathSpec.from_lines("gitwildmatch", patterns) | ||
|
||
|
||
def _copy_to_tmp_dir(directory: Path) -> Path: | ||
"""Copy all allowed files in the directory to a temporary directory.""" | ||
# Allowed extensions | ||
allowed_exts = ["py", "toml", "md"] | ||
|
||
# Load gitignore | ||
gitignore = _load_gitignore(directory) | ||
|
||
# Make temporary directory | ||
tmp_dir = Path(tempfile.mkdtemp()) | ||
|
||
# Walk through the directory and copy all allowed files | ||
for file in (_ for ext in allowed_exts for _ in directory.rglob(f"*.{ext}")): | ||
relative_path = file.relative_to(directory) | ||
# Check gitignore | ||
if not gitignore.match_file(relative_path): | ||
# Create the same sub-directory structure in the temp directory | ||
dst_path = tmp_dir / relative_path | ||
print(f"dst parent: {dst_path.parent}") | ||
dst_path.parent.mkdir(parents=True, exist_ok=True) | ||
|
||
# Copy the file to the destination | ||
shutil.copy2(file, dst_path) | ||
print(f"Copied file {file} to {dst_path}") | ||
|
||
# Return the created temporary directory | ||
return tmp_dir | ||
|
||
|
||
def _export_and_submit_job(session: Session, job: FlowerJob, export_to: str) -> None: | ||
"""Export and submit a job via the secure session.""" | ||
# Export job | ||
job_path = Path(export_to) / job.name | ||
job.export_job(job_path.parent) | ||
|
||
# Submit job | ||
session.submit_job(str(job_path)) | ||
|
||
|
||
class FlowerSuperExecPlugin(FlowerSuperExecExecutor): | ||
"""POC engine executor for Flower SuperExec.""" | ||
|
||
def __init__(self) -> None: | ||
self._sess = None | ||
self.job_dir = None | ||
self.flwr_dir = None | ||
|
||
@override | ||
def set_config( | ||
self, | ||
config: UserConfig, | ||
) -> None: | ||
"""Set executor config arguments. | ||
|
||
Parameters | ||
---------- | ||
config : UserConfig | ||
A dictionary for configuration values. | ||
Supported configuration key/value pairs: | ||
- "job-dir": str | ||
The directory to which jobs are exported. | ||
- "flwr-dir": str | ||
The path to the Flower directory. | ||
""" | ||
print(f"Setting config: {config}") | ||
if not config: | ||
return | ||
if job_dir := config.get("job-dir"): | ||
if not isinstance(job_dir, str): | ||
raise ValueError("The `job-dir` value should be of type `str`.") | ||
self.job_dir = job_dir | ||
if flwr_dir := config.get("flwr-dir"): | ||
if not isinstance(flwr_dir, str): | ||
raise ValueError("The `flwr-dir` value should be of type `str`.") | ||
self.flwr_dir = str(flwr_dir) | ||
|
||
@override | ||
def start_run( | ||
self, | ||
fab_file: bytes, | ||
override_config: UserConfig, | ||
federation_config: UserConfig, | ||
) -> Optional[RunTracker]: | ||
"""Start run using Flare Engine.""" | ||
try: | ||
# Load FAB file and extract metadata | ||
fab_id, fab_version = get_fab_metadata(fab_file) | ||
|
||
# Install FAB | ||
fab_path = install_from_fab(fab_file, None, True) | ||
|
||
# Generate the job name | ||
publisher, app_name = fab_id.split("/") | ||
job_name = _get_job_name(publisher, app_name, fab_version) | ||
|
||
# Locate all allowed files in the FAB directory | ||
tmp_dir = _copy_to_tmp_dir(Path(fab_path)) | ||
|
||
# Create FedJob | ||
job = FlowerJob(job_name, tmp_dir) | ||
|
||
# Export & submit the job | ||
if self.job_dir is not None: | ||
_export_and_submit_job(self.sess(federation_config), job, self.job_dir) | ||
else: | ||
with tempfile.TemporaryDirectory() as tmpdir: | ||
_export_and_submit_job(self.sess(federation_config), job, tmpdir) | ||
|
||
# TODO: Return RunTracker | ||
return RunTracker(run_id=0, proc=None) # Replace with actual run_id and proc | ||
except Exception: | ||
import traceback | ||
|
||
log(ERROR, "Could not start run: %s", traceback.format_exc()) | ||
return None | ||
|
||
def sess(self, configs: UserConfig) -> Session: | ||
"""Obtain a secure session.""" | ||
# Check the validity of configs | ||
configs = {k: v for k, v in configs.items() if k in SESSION_ARGS} | ||
|
||
# Check if a session is already created | ||
if self._sess is not None: | ||
# If the args are the same, return the existing session | ||
if self.sess_cfgs == configs: | ||
return self._sess | ||
# Close the existing session | ||
self._sess.close() | ||
|
||
# Open a new session | ||
self._sess = new_secure_session(**configs) | ||
self.sess_cfgs = configs | ||
|
||
return self._sess | ||
|
||
|
||
executor = FlowerSuperExecPlugin() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @yanchengnv . May I know if this is the correct way to use
FlowerJob
? I somehow got a strangecustom
folder after exporting the Flower job:The temporary folder that contains all flower files is correct:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You cannot directly pass tmp_dir to FlowerJob as "flower_content".
FlowerJob requires the "flower_content" to be a str, whereas tmp_dir is Path.
You need to pass str(tmp_dir) to FlowerJob.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@yanchengnv Thanks so much for your help! I've just updated the PR.