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

LightningDataModule for webdataset #100

Merged
merged 70 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
0d71fa0
BugFix: parser of docker version string
DejunL Jul 23, 2024
1d30c43
Enhancement: migrate diffdock utils modules from v1
DejunL Jul 29, 2024
9a7f82e
Enhancement: explicitly pass tr/rot/tor_sigma's to t_to_sigma
DejunL Jul 30, 2024
756a2e3
Enhancement: add diffdock score model data module and tests
DejunL Aug 1, 2024
0b8411a
BugFix: control wds shardshuffle randomness
DejunL Aug 2, 2024
76ec1c7
Test: refactor ScoreModelWDS fixture to allow comparing different ins…
DejunL Aug 2, 2024
ca0cc65
Test: consistent ligand position after NoiseTransform
DejunL Aug 2, 2024
7d95a67
BugFix: reduce total_size factor to ensure enough number of shards
DejunL Aug 2, 2024
b82ee03
Test: parametrize by split type
DejunL Aug 2, 2024
8420700
Enhancement: move NoiseTransform to GenerateNoise in the diffusion mo…
DejunL Aug 3, 2024
662ce27
BugFix: always GenerateNoise in score model data
DejunL Aug 3, 2024
99d8e6e
Regress: with_length -> with_epoch
DejunL Aug 3, 2024
e604a49
BugFix: define length on SizeAwareBatching dataset
DejunL Aug 5, 2024
8e236d6
Test: setup data loader
DejunL Aug 5, 2024
0e4c7bd
Enhancement: factor out GenerateNoise outside of data module
DejunL Aug 5, 2024
88035d6
Enhancement: use a dict: Split -> List[str] as the input subset compl…
DejunL Aug 5, 2024
377f276
BugFix: check _xform_gen_wds's avail before composing
DejunL Aug 5, 2024
7c5add1
Enhancement: move the batching from wds to webloader
DejunL Aug 6, 2024
69620fb
Test: assert sample and batch type
DejunL Aug 6, 2024
6ee03c0
Enhancement: factor out the batching method as input webloader compos…
DejunL Aug 6, 2024
598a4ae
Enhancement: remove local_batch_size
DejunL Aug 6, 2024
213095b
BugFix: remove unused random.seed() call
DejunL Aug 6, 2024
1d8f162
Enhancement: rename ScoreModelWDS -> PickledDataWDS
DejunL Aug 6, 2024
add7870
Enhancement: internalize the wds archive formatter
DejunL Aug 6, 2024
7bbc651
Test: rename score model test data directory
DejunL Aug 6, 2024
78c1f80
Test: confidence model data module
DejunL Aug 7, 2024
e13b325
Test: parametrize tests with model type
DejunL Aug 7, 2024
c8a128b
Enhancement: factor out the webdataset-specific method into a base da…
DejunL Aug 8, 2024
80149e2
Enhancement: reduce args redundancy in PickledDataWDS by passing *arg…
DejunL Aug 8, 2024
cc911b0
Enhancement: add integration tests in lightning trainer workflows
DejunL Aug 8, 2024
6541bc2
Enhancement: implement predict stage
DejunL Aug 8, 2024
bc00979
BugFix: remove select for sample size > 1
DejunL Aug 10, 2024
975c91e
Enhancement: remove legacy dataloader config
DejunL Aug 10, 2024
a3b07e2
Enhancement: allow input an iterable of generators passed as pipelines
DejunL Aug 10, 2024
2c8a2c8
Enhancement: move the webdataset data module into bionemo-core
DejunL Aug 13, 2024
b622a2c
Enhancement: rename WDSModule -> WebDataModule
DejunL Aug 13, 2024
1ffde95
Enhancement: actually support Iterable[str] as suffix_keys_wds
DejunL Aug 13, 2024
5948230
Test: WebDataModule with mock-up dataset and model
DejunL Aug 14, 2024
78ed189
Enhancement: remove hard-coded shuffle from workflow
DejunL Aug 14, 2024
01bb63e
Enhancement: rename kwargs_dl -> kwargs_wld
DejunL Aug 14, 2024
c34dd0f
Enhancement: replace hard-coded webdatast kwargs with user input
DejunL Aug 14, 2024
40044fc
Test: move data into bionemo2_root/test_data
DejunL Aug 14, 2024
6f0d4b2
Doc: docstring and readme.md
DejunL Aug 14, 2024
19c3dcd
Test: PickledDataWDS init and setup()
DejunL Aug 14, 2024
2e6e8db
Doc: update class description
DejunL Aug 15, 2024
9693aba
Test: re-org test data location
DejunL Aug 15, 2024
71391a8
Test: generate the test data for webdatamodule
DejunL Aug 15, 2024
eff5093
Enhancement: remove unused functions
DejunL Aug 15, 2024
c8c396b
BugFix: remove license
DejunL Aug 15, 2024
458611d
Enhancement: use list comprehension
DejunL Aug 15, 2024
e6f9c3f
License: clean up old licenses
DejunL Aug 16, 2024
c470b21
BugFix: add __init__.py
DejunL Aug 16, 2024
e1e5551
BugFix: my email
DejunL Aug 19, 2024
0f46ed8
Package: move webdatamodule under bionemo-webdatamodule
DejunL Aug 19, 2024
b8f2bf5
Package: remove bionemo-diffdock
DejunL Aug 19, 2024
57b6c3a
BugFix: change license header
DejunL Aug 20, 2024
009fa23
BugFix: ignore E731 and fix format
DejunL Aug 20, 2024
5d01a19
Regress: use PEP604
DejunL Aug 20, 2024
6bcccb6
Enhancement: pickle within fh context
DejunL Aug 20, 2024
168bc9b
Bugfix: default to python 3.10 for consistency
DejunL Aug 20, 2024
4c611ba
BugFix: f-string typo
DejunL Aug 20, 2024
86f97e3
Enhancement: use sample counts instead of size to enforce number of t…
DejunL Aug 23, 2024
553258d
Test: sample overlap tests via md5 hash of pickles
DejunL Aug 23, 2024
d5284e6
Test: assert throw from webdataset when num_workers > num_shards
DejunL Aug 24, 2024
6e51a7e
Enhancement: reuse the webdatamodule dirs_tars_wds arg in PickledDataWDS
DejunL Aug 28, 2024
5b6f309
Enhancement: allow multiple data objects for each sample
DejunL Aug 28, 2024
8522273
Regress: remove default python version
DejunL Aug 28, 2024
26a59d6
Test: rename test to be consistent with module
DejunL Aug 28, 2024
0d5c144
Test: factor pickle generation into a new fixture
DejunL Aug 29, 2024
a35765f
Test: multiple data objects per sample
DejunL Aug 29, 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
4 changes: 2 additions & 2 deletions launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ build() {
}

# Check Docker version
docker_version=$(docker --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
docker_version=$(docker --version | awk -F'[, ]' '{print $3}')
malcolmgreaves marked this conversation as resolved.
Show resolved Hide resolved
required_docker_version="23.0.1"

if ! version_ge "$docker_version" "$required_docker_version"; then
Expand All @@ -112,7 +112,7 @@ build() {
fi

# Check Buildx version
buildx_version=$(docker buildx version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
buildx_version=$(docker buildx version | awk '{print $2}')
required_buildx_version="0.10.2"

if ! version_ge "$buildx_version" "$required_buildx_version"; then
Expand Down
202 changes: 202 additions & 0 deletions sub-packages/bionemo-webdatamodule/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
Loading