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

added some core API reference #52

Merged
merged 1 commit into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions doc/source/core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@ federatedscope.core.configs
.. automodule:: federatedscope.core.configs
:members:

federatedscope.core.DAIL_fed_api

federatedscope.core.monitors
-----------------------

.. automodule:: federatedscope.core.monitors
:members:

federatedscope.core.fed_runner
-----------------------

.. automodule:: federatedscope.core.DAIL_fed_api
.. automodule:: federatedscope.core.fed_runner
:members:

federatedscope.core.worker
Expand Down
38 changes: 38 additions & 0 deletions federatedscope/core/configs/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@


class CN(CfgNode):
"""
An extended configuration system based on [yacs](https://github.com/rbgirshick/yacs).
The two-level tree structure consists of several internal dict-like containers to allow simple key-value access and management.

"""
def __init__(self, init_dict=None, key_list=None, new_allowed=False):
super().__init__(init_dict, key_list, new_allowed)
self.cfg_check_funcs = [] # to check the config values validity
Expand All @@ -15,28 +20,56 @@ def register_cfg_check_fun(self, cfg_check_fun):
self.cfg_check_funcs.append(cfg_check_fun)

def merge_from_file(self, cfg_filename):
"""
load configs from a yaml file, another cfg instance or a list stores the keys and values.

:param cfg_filename (string):
:return:
"""
cfg_check_funcs = copy.copy(self.cfg_check_funcs)
super(CN, self).merge_from_file(cfg_filename)
self.cfg_check_funcs = cfg_check_funcs
self.assert_cfg()

def merge_from_other_cfg(self, cfg_other):
"""
load configs from another cfg instance

:param cfg_other (CN):
:return:
"""
cfg_check_funcs = copy.copy(self.cfg_check_funcs)
super(CN, self).merge_from_other_cfg(cfg_other)
self.cfg_check_funcs = cfg_check_funcs
self.assert_cfg()

def merge_from_list(self, cfg_list):
"""
load configs from a list stores the keys and values.

:param cfg_list (list):
:return:
"""
cfg_check_funcs = copy.copy(self.cfg_check_funcs)
super(CN, self).merge_from_list(cfg_list)
self.cfg_check_funcs = cfg_check_funcs
self.assert_cfg()

def assert_cfg(self):
"""
check the validness of the configuration instance

:return:
"""
for check_func in self.cfg_check_funcs:
check_func(self)

def clean_unused_sub_cfgs(self):
"""
Clean the un-used secondary-level CfgNode, whose `.use` attribute is `True`

:return:
"""
for v in self.values():
if isinstance(v, CfgNode) or isinstance(v, CN):
# sub-config
Expand All @@ -49,6 +82,11 @@ def clean_unused_sub_cfgs(self):
del v[k]

def freeze(self):
"""
make the cfg attributes immutable, and save the freezed cfg_check_funcs into "self.outdir/config.yaml" for better reproducibility

:return:
"""
self.assert_cfg()
self.clean_unused_sub_cfgs()
# save the final cfg
Expand Down
2 changes: 0 additions & 2 deletions federatedscope/core/configs/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

- The method `local` indicates that the clients only locally train their model without sharing any training related information
- The method `global` indicates that the only one client locally trains using all data
# TODO: add fine-tune, allowing freezing para name, and be called whenever need


"""

Expand Down
3 changes: 3 additions & 0 deletions federatedscope/core/monitors/monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@


class Monitor(object):
"""
provide the monitoring functionalities such as formatting the evaluation results into diverse metrics
"""
SUPPORTED_FORMS = ['weighted_avg', 'avg', 'fairness', 'raw']

def __init__(
Expand Down