Skip to content
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

feat(framework) Add FlowerTune templates to flwr new #3587

Merged
merged 51 commits into from
Jun 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
41e231b
Init flwrtune to flwr new
yan-gao-GY Jun 11, 2024
39a448f
Update flwr run for backend_config passing
yan-gao-GY Jun 11, 2024
ab19093
Update
yan-gao-GY Jun 11, 2024
c828db8
Init flwr new with 4 LLM tasks
yan-gao-GY Jun 12, 2024
cd7a896
Formatting
yan-gao-GY Jun 12, 2024
df70a0f
Update src/py/flwr/cli/new/templates/app/pyproject.flwrtune.toml.tpl
yan-gao-GY Jun 12, 2024
7787d51
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 12, 2024
70e5d7a
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 12, 2024
4b6720b
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 12, 2024
421ddce
Fix config files
yan-gao-GY Jun 12, 2024
922c0c5
Update pyproject.flwrtune.toml.tpl
yan-gao-GY Jun 12, 2024
8e60056
Update pyproject.flwrtune.toml.tpl
yan-gao-GY Jun 12, 2024
51ba186
Fix
yan-gao-GY Jun 13, 2024
a318ac4
Fix
yan-gao-GY Jun 13, 2024
ca33364
Fix
yan-gao-GY Jun 13, 2024
5817d47
Avoid warnings
yan-gao-GY Jun 13, 2024
9b04e87
Fix
yan-gao-GY Jun 13, 2024
b9ab673
Update readme and formatting
yan-gao-GY Jun 13, 2024
f4cc70a
Formatting
yan-gao-GY Jun 13, 2024
2fc3c58
Update src/py/flwr/cli/new/templates/app/pyproject.flwrtune.toml.tpl
yan-gao-GY Jun 13, 2024
56ebd7a
Formatting
yan-gao-GY Jun 13, 2024
8bbdff3
Update src/py/flwr/cli/new/templates/app/code/flwrtune/config.yaml.tpl
jafermarq Jun 14, 2024
fdc867a
Merge branch 'main' into add-flwrtune-flwrnew
jafermarq Jun 14, 2024
83b30e6
Merge branch 'main' into add-flwrtune-flwrnew
jafermarq Jun 18, 2024
27cae47
Update readme
yan-gao-GY Jun 18, 2024
3bcf6dd
Replace `task` with `challenge`
yan-gao-GY Jun 18, 2024
9fd9a3f
Formatting
yan-gao-GY Jun 18, 2024
95e65dd
Update readme
yan-gao-GY Jun 18, 2024
29d78cd
Update src/py/flwr/cli/new/templates/app/README.flwrtune.md.tpl
yan-gao-GY Jun 18, 2024
5648a79
Update src/py/flwr/cli/new/templates/app/README.flwrtune.md.tpl
yan-gao-GY Jun 18, 2024
bfe3e1a
Update src/py/flwr/cli/new/templates/app/README.flwrtune.md.tpl
yan-gao-GY Jun 18, 2024
fabe74a
Update src/py/flwr/cli/new/templates/app/README.flwrtune.md.tpl
yan-gao-GY Jun 18, 2024
2a9ea73
Update readme
yan-gao-GY Jun 18, 2024
b634864
Merge branch 'main' into add-flwrtune-flwrnew
yan-gao-GY Jun 18, 2024
28c5602
Update readme
yan-gao-GY Jun 18, 2024
c0085ed
Update src/py/flwr/cli/new/new.py
yan-gao-GY Jun 20, 2024
5056153
Update src/py/flwr/cli/new/new.py
yan-gao-GY Jun 20, 2024
8ccf93f
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 20, 2024
cd6d02e
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 20, 2024
4cc871a
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 20, 2024
69a6693
Update src/py/flwr/cli/new/templates/app/code/flwrtune/client.py.tpl
yan-gao-GY Jun 20, 2024
dc9e08e
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 20, 2024
6368699
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 20, 2024
6ec4288
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 20, 2024
bf07c4f
Formatting
yan-gao-GY Jun 20, 2024
76093e3
Change model parameter init method & formatting
yan-gao-GY Jun 20, 2024
061275b
Merge branch 'main' into add-flwrtune-flwrnew
yan-gao-GY Jun 20, 2024
dc34b16
Update src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
yan-gao-GY Jun 21, 2024
d48c2a2
Update FlowerTune names
yan-gao-GY Jun 21, 2024
4a61686
Formatting
yan-gao-GY Jun 21, 2024
e4f66ed
Merge branch 'main' into add-flwrtune-flwrnew
yan-gao-GY Jun 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Formatting
  • Loading branch information
yan-gao-GY committed Jun 20, 2024
commit bf07c4f506a73ddaea301f9457b805c1036b6a80
3 changes: 2 additions & 1 deletion src/py/flwr/cli/new/templates/app/code/flwrtune/app.py.tpl
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@ from hydra import compose, initialize
from hydra.utils import instantiate
from $import_name.dataset import get_tokenizer_and_data_collator_and_propt_formatting

import flwr as fl
from flwr.client import ClientApp
from flwr.server import ServerApp, ServerConfig
yan-gao-GY marked this conversation as resolved.
Show resolved Hide resolved
from flwr_datasets import FederatedDataset

from $import_name.client import gen_client_fn
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ from trl import SFTTrainer
from transformers import TrainingArguments
from peft import get_peft_model_state_dict, set_peft_model_state_dict

import flwr as fl
from flwr.client import NumPyClient
from flwr.common.typing import NDArrays, Scalar

from $import_name.models import get_model, cosine_annealing