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.

Sign up for GitHub

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

Refactor vertical FL module for XGB-base #482

Merged
merged 17 commits into from
Jan 17, 2023
Merged

Refactor vertical FL module for XGB-base #482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0d47076
refactor vfl data
xieyxclack Jan 3, 2023
ef1c0cb
merge configurations
xieyxclack Jan 3, 2023
d93ba58
merge configurations and worker class
xieyxclack Jan 3, 2023
57c80b3
vertical loss
xieyxclack Jan 3, 2023
e870236
modify xgb_base
xieyxclack Jan 11, 2023
f3ccf5f
resolve conflicts
xieyxclack Jan 11, 2023
e1af4f4
fix bugs in autotune vfl
xieyxclack Jan 11, 2023
a6c1a89
minor fix: cfgs in test files
xieyxclack Jan 11, 2023
01326e8
minor fix for autotune module
xieyxclack Jan 12, 2023
fd38282
bug fix
xieyxclack Jan 12, 2023
a1e05d9
workaround for evalution change
xieyxclack Jan 12, 2023
159a6c6
clear msg buffer generated by feature engineering
xieyxclack Jan 13, 2023
76846a4
minor fix
xieyxclack Jan 13, 2023
a14e73b
minor fix
xieyxclack Jan 13, 2023
9876bd9
move data related vars
xieyxclack Jan 13, 2023
86225b2
bug fix for xgb refactor and autotune
xieyxclack Jan 13, 2023
92d3d03
minor fix
xieyxclack Jan 16, 2023
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
minor fix
  • Loading branch information
@xieyxclack
xieyxclack committed Jan 16, 2023
commit 92d3d032e327ea8e7ce0832e5556eb34c0322fcf
2 changes: 1 addition & 1 deletion federatedscope/vertical_fl/dataloader/dataloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def load_vertical_data(config=None, generate=False):
else:
args = {'normalization': False, 'standardization': False}

dataset_class = VERTICAL_DATASET[dataset_name]
if not generate:
dataset_class = VERTICAL_DATASET[dataset_name]
dataset = dataset_class(root=config.data.root,
num_of_clients=config.federate.client_num,
feature_partition=config.vertical.dims,
Expand Down
10 changes: 5 additions & 5 deletions tests/test_xgb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from federatedscope.core.auxiliaries.utils import setup_seed
from federatedscope.core.auxiliaries.logging import update_logger
from federatedscope.core.configs.config import global_cfg
from federatedscope.core.fed_runner import FedRunner
from federatedscope.core.auxiliaries.runner_builder import get_runner


class XGBTest(unittest.TestCase):
Expand Down Expand Up @@ -60,10 +60,10 @@ def test_XGBFL(self):
init_cfg.merge_from_other_cfg(modified_config)
self.assertIsNotNone(data)

Fed_runner = FedRunner(data=data,
server_class=get_server_cls(init_cfg),
client_class=get_client_cls(init_cfg),
config=init_cfg.clone())
Fed_runner = get_runner(data=data,
server_class=get_server_cls(init_cfg),
client_class=get_client_cls(init_cfg),
config=init_cfg.clone())
self.assertIsNotNone(Fed_runner)
test_results = Fed_runner.run()
init_cfg.merge_from_other_cfg(backup_cfg)
Expand Down