algos and results dirs

.gitignore

@@ -1,160 +1,19 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
+# python
+*__pycache__*
+
+# results
+logs/
+checkpoints/
+results/
+*.h5
 *.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
 
-# Cython debug symbols
-cython_debug/
+# dataset
+dataset/cifar10/
+dataset/cifar100/
+dataset/organaminist25/
+dataset/organaminist50/
+dataset/organaminist100/
+dataset/Office-home20/
+dataset/Office-home-raw/
 
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/

system/main.py

@@ -143,7 +143,9 @@ def get_args():
                         help="Local learning rate")
     parser.add_argument('-gr', "--global_rounds", type=int, default=3)
     parser.add_argument('-ls', "--local_steps", type=int, default=5)
-    parser.add_argument('-algo', "--algorithm", type=str, default="PGFed")
+    parser.add_argument('-algo', "--algorithm", type=str, default="PGFed",
+                        choices=["Local", "FedAvg", "FedDyn", "pFedMe", "FedFomo", "APFL", "FedRep",
+                                 "LGFedAvg", "FedPer", "PerAvg", "FedRoD", "FedBABU", "PGFed"])
     parser.add_argument('-jr', "--join_ratio", type=float, default=0.25,
                         help="Ratio of clients per round")
     parser.add_argument('-nc', "--num_clients", type=int, default=25,
@@ -176,9 +178,9 @@ def get_args():
     # FedBABU
     parser.add_argument('-fts', "--fine_tuning_steps", type=int, default=1)
     # save directories
-    parser.add_argument("--hist_dir", type=str, default="../", help="dir path for output hist file")
-    parser.add_argument("--log_dir", type=str, default="../", help="dir path for log (main results) file")
-    parser.add_argument("--ckpt_dir", type=str, default="../", help="dir path for checkpoints")
+    parser.add_argument("--hist_dir", type=str, default="../results/", help="dir path for output hist file")
+    parser.add_argument("--log_dir", type=str, default="../logs/", help="dir path for log (main results) file")
+    parser.add_argument("--ckpt_dir", type=str, default="../checkpoints/", help="dir path for checkpoints")
 
     args = parser.parse_args()
     return args