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

Add FedVSSL baseline #2412

Merged
merged 135 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
e8da06d
Added FedVSSL
yasar-rehman Aug 31, 2023
4e2cc38
updated FedVSSL
yasar-rehman Sep 6, 2023
628b2f6
updated FedVSSL
yasar-rehman Sep 6, 2023
ef9b751
updated the FedVSSL dataset_preparation
yasar-rehman Sep 8, 2023
b18c48c
add mmcv configs
Sep 10, 2023
80a787c
Update main.py
yasar-rehman Sep 12, 2023
3578f95
Update dataset_preparation.py
yasar-rehman Sep 12, 2023
186dc7c
updates
yasar-rehman Sep 12, 2023
6407f0c
Merge branch 'main' of https://github.com/yasar-rehman/flower into main
yasar-rehman Sep 12, 2023
e17b638
pre-training
Sep 12, 2023
122119d
create dummy data and test pre-training
Sep 12, 2023
a2f037f
main_updated
yasar-rehman Sep 13, 2023
09aa607
updated main
yasar-rehman Sep 13, 2023
5698b7e
updated
yasar-rehman Sep 14, 2023
f36ab15
upload data partitioning code
Sep 17, 2023
14b33e6
updated description in dataset_preparation
yasar-rehman Sep 18, 2023
1987c57
updated the strategy
yasar-rehman Sep 19, 2023
23f53e5
add parse_args
Sep 19, 2023
e68ff1e
updates
yasar-rehman Sep 20, 2023
f6e99d0
updated
yasar-rehman Sep 20, 2023
09d1349
updated
yasar-rehman Sep 20, 2023
e51f553
update readme
Sep 20, 2023
7f372f8
update
Sep 21, 2023
6eff888
delete hard code for saving chkp on server
Sep 21, 2023
ee6b11a
add fedavg
Sep 21, 2023
cdeafcb
update
Sep 21, 2023
a9af82d
update
Sep 21, 2023
3a987e9
update
Sep 21, 2023
7b24fcf
update
Sep 21, 2023
4c311f2
update
Sep 21, 2023
8912284
update
Sep 21, 2023
6761f21
update
Sep 21, 2023
efaa6d4
update
Sep 21, 2023
a49201d
update
Sep 21, 2023
5222fb2
update
Sep 21, 2023
50febcf
update
Sep 21, 2023
30121ce
update
Sep 21, 2023
46600e6
update readme
Sep 21, 2023
15f45c5
update
Sep 21, 2023
6ce2cbc
updated the FedVSSL
yasar-rehman Sep 22, 2023
f37e300
updated dataset_preparation
yasar-rehman Sep 22, 2023
363aab5
updated dataset_preparation
yasar-rehman Sep 22, 2023
9804dc1
updated dataset_preparation
yasar-rehman Sep 22, 2023
ac4c857
updated dataset_preparation
yasar-rehman Sep 22, 2023
7d38a7e
updated dataset_preparation
yasar-rehman Sep 22, 2023
8507f04
update
Sep 22, 2023
c8fc29c
update
Sep 22, 2023
50aeeb3
update
Sep 22, 2023
af64c60
update
Sep 22, 2023
f13cbd5
Update baselines/FedVSSL/pyproject.toml
yasar-rehman Oct 3, 2023
b71ca4d
Update baselines/FedVSSL/README.md
yasar-rehman Oct 3, 2023
a735d03
Update baselines/FedVSSL/README.md
yasar-rehman Oct 3, 2023
21016ed
removed the requirement.txt file
yasar-rehman Oct 3, 2023
cb41ee8
rename the `docs` directory to `_static` and change readme accordingly
yan-gao-GY Oct 19, 2023
0c4c499
updated the directory from FedVSSL to fedvssl
yasar-rehman Oct 24, 2023
5dd973c
Update README.md
yasar-rehman Oct 24, 2023
4d3fbee
Remove the extra FedVSSL
yasar-rehman Oct 24, 2023
b0c18f6
delete EXTENDED_README.md
yan-gao-GY Oct 25, 2023
b5c43a0
fix init_p_paths
yan-gao-GY Oct 25, 2023
1b3fec5
support hydra config
yan-gao-GY Oct 25, 2023
b0e630c
support hydra config
yan-gao-GY Oct 25, 2023
27932b6
change default pre-trained path
yan-gao-GY Oct 26, 2023
d1db156
fix cfg name error
yan-gao-GY Oct 26, 2023
847eb94
change default pre-trained path
yan-gao-GY Oct 26, 2023
c2f05b8
update
yasar-rehman Oct 26, 2023
c023bc3
update readme
yan-gao-GY Oct 26, 2023
5fc8c62
formatting
yan-gao-GY Oct 26, 2023
4ff70e5
updated
yasar-rehman Oct 30, 2023
38d962b
Merge branch 'main' of https://github.com/yasar-rehman/flower into main
yasar-rehman Oct 30, 2023
91463a7
Move more hyper-parameters to hydra config
yan-gao-GY Oct 30, 2023
85be14f
formatting
yan-gao-GY Oct 30, 2023
0fefb26
updated main.py and base.yaml
yasar-rehman Nov 1, 2023
176bef5
Update README.md
yasar-rehman Nov 1, 2023
83fbf49
Update readme
yan-gao-GY Nov 1, 2023
76e60ff
Clarify dataset_preparation
yan-gao-GY Nov 2, 2023
995f523
Update readme
yan-gao-GY Nov 2, 2023
3d3e19c
Clean up dataset_preparation.py
yan-gao-GY Nov 2, 2023
7b63cbb
simplifications
jafermarq Nov 2, 2023
c87ac87
updates pyproject.toml
jafermarq Nov 2, 2023
ec5430e
Delete duplicate content
yan-gao-GY Nov 2, 2023
bd4ccb0
Merge branch 'main' of https://github.com/yasar-rehman/flower
yan-gao-GY Nov 2, 2023
b9ae08e
Update readme for cuda installation
yan-gao-GY Nov 2, 2023
1d86f02
Update baselines/fedvssl/README.md
yan-gao-GY Nov 15, 2023
d20ec8f
Update baselines/fedvssl/README.md
yan-gao-GY Nov 15, 2023
a7621c1
Update baselines/fedvssl/README.md
yan-gao-GY Nov 15, 2023
3dd5461
Update baselines/fedvssl/README.md
yan-gao-GY Nov 15, 2023
78fbc84
Update baselines/fedvssl/fedvssl/conf/base.yaml
yan-gao-GY Nov 15, 2023
e449dab
Update baselines/fedvssl/fedvssl/main.py
yan-gao-GY Nov 15, 2023
c212933
Update baselines/fedvssl/fedvssl/conf/base.yaml
yan-gao-GY Nov 16, 2023
78851f1
Update based on comments
yan-gao-GY Nov 16, 2023
8b4409d
Solve gpu number issue
yan-gao-GY Nov 17, 2023
454a66a
Solve fine-tuning data loading issue
yan-gao-GY Nov 17, 2023
027188e
Update baselines/fedvssl/pyproject.toml
yasar-rehman Nov 22, 2023
39f6376
Update baselines/fedvssl/README.md
yasar-rehman Nov 22, 2023
41b2741
Update baselines/fedvssl/pyproject.toml
yan-gao-GY Nov 28, 2023
f97508a
Update baselines/fedvssl/pyproject.toml
yan-gao-GY Nov 28, 2023
e36e1f5
Update baselines/fedvssl/README.md
yan-gao-GY Nov 28, 2023
111c257
Add fine-tuning gpu_nums; ignore user warning
yan-gao-GY Nov 28, 2023
1031c34
Move result dir to hydra dir
yan-gao-GY Nov 28, 2023
206913a
Move finetuning out of main.py
yan-gao-GY Nov 30, 2023
183be3e
Remove fine-tuning stuffs from main.py and base.yaml
yan-gao-GY Nov 30, 2023
2a16f9e
Formatting
yan-gao-GY Nov 30, 2023
df83f63
Formatting
yan-gao-GY Nov 30, 2023
212e626
Formatting
yan-gao-GY Nov 30, 2023
f895c01
Formatting
yan-gao-GY Nov 30, 2023
54829b9
Change dataset_preparation.py to command lines
yan-gao-GY Nov 30, 2023
ff113ec
Formatting
yan-gao-GY Nov 30, 2023
7029144
Update readme
yan-gao-GY Nov 30, 2023
738d3d2
Update strategy.py
yasar-rehman Dec 1, 2023
97ae3fc
Update README.md
yasar-rehman Dec 1, 2023
9192bb8
Update finetune_preprocess.py
yasar-rehman Dec 1, 2023
b4c9e28
Formatting
yan-gao-GY Dec 1, 2023
2a6d15c
Formatting
yan-gao-GY Dec 1, 2023
b04c1b7
Solve format issue of loading pre-trained model weights
yan-gao-GY Dec 1, 2023
20bf84d
Merge branch 'main' into main
jafermarq Dec 7, 2023
907b6ec
format and more
jafermarq Dec 8, 2023
0e3bdc1
all ssl outputs go to hydra output dir; edits to readme
jafermarq Dec 8, 2023
3e00b71
fix
jafermarq Dec 8, 2023
9fe8f7d
all install from pyproject
jafermarq Dec 8, 2023
0acc9d2
Update README.md
yasar-rehman Dec 8, 2023
8e3d7f8
Update README.md
yasar-rehman Dec 8, 2023
7544834
Update README.md
yasar-rehman Dec 8, 2023
6fe8819
Update README.md
yasar-rehman Dec 8, 2023
b8c521c
Update README.md
yasar-rehman Dec 11, 2023
921f72f
Update readme
yan-gao-GY Dec 11, 2023
606c885
Update readme for k-400 dataset
yan-gao-GY Dec 11, 2023
a3e15d5
Update readme
yan-gao-GY Dec 11, 2023
2e6a559
Update readme
yan-gao-GY Dec 11, 2023
007002c
format; removed CtP
jafermarq Dec 15, 2023
7da214c
update
jafermarq Dec 15, 2023
4216a73
Merge branch 'main' into main
jafermarq Dec 15, 2023
0a20437
added missing file
jafermarq Dec 15, 2023
eebadeb
Update readme
yan-gao-GY Dec 15, 2023
4e7fe04
to changelog
jafermarq Dec 15, 2023
9751c31
Merge branch 'main' into main
danieljanes Dec 18, 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
2 changes: 2 additions & 0 deletions baselines/fedvssl/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
outputs/
*.__pycache__
202 changes: 202 additions & 0 deletions baselines/fedvssl/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

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.
Loading