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 filesize sniffing and parallelize importing on jobs #5133

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
b59bc2e
Basic WDL implementation
stxue1 Oct 16, 2024
ccea6b0
Fix bug with importworker options
stxue1 Oct 24, 2024
3cd4c61
Asbtract WDL and CWL imports and enforce a better method
stxue1 Oct 24, 2024
d16dc24
Merge branch 'master' of github.com:DataBiosphere/toil into issues/51…
stxue1 Oct 24, 2024
642efd0
Remove unused import
stxue1 Oct 24, 2024
e712d88
satisfy mypy
stxue1 Oct 24, 2024
e6c13fc
Fix WDL import in CWL
stxue1 Oct 25, 2024
ae1e279
Fix WDL comments
stxue1 Oct 25, 2024
0c910f7
Merge branch 'master' into issues/5114-filesize-sniffing
stxue1 Oct 25, 2024
1eb4caf
Merge branch 'master' of github.com:DataBiosphere/toil into issues/51…
stxue1 Oct 30, 2024
1d89969
move url functions to job, remove dead imports, format with black
stxue1 Oct 30, 2024
56b7a50
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Oct 31, 2024
5eeb3b1
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 1, 2024
d9d5ee9
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 5, 2024
ff51526
Address comments
stxue1 Nov 6, 2024
b7ca42c
mypy
stxue1 Nov 6, 2024
2209cce
Merge branch 'issues/5114-filesize-sniffing' of github.com:DataBiosph…
stxue1 Nov 6, 2024
04ede19
Detect running out of disk space with OSError instead
stxue1 Nov 8, 2024
e5b5bbd
Merge branch 'master' of github.com:DataBiosphere/toil into issues/51…
stxue1 Nov 13, 2024
05a0898
Fix logic in worker import loop
stxue1 Nov 13, 2024
9f4fe36
Fix bad caching
stxue1 Nov 13, 2024
206926b
Merge branch 'master' of github.com:DataBiosphere/toil into issues/51…
stxue1 Nov 13, 2024
eba8f37
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 14, 2024
f955721
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 14, 2024
f12c199
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 14, 2024
645fd25
Add wdl-conformance-tests to gitignore and sphinx config + remove uns…
stxue1 Nov 14, 2024
9dac988
Update src/toil/cwl/cwltoil.py
stxue1 Nov 15, 2024
5c73743
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 15, 2024
6b144c9
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 15, 2024
82fd093
Move URLNotImplemented exception out to exceptions.py to prevent circ…
stxue1 Nov 18, 2024
d96e4ac
Merge branch 'issues/5114-filesize-sniffing' of github.com:DataBiosph…
stxue1 Nov 18, 2024
714d8ad
Update src/toil/job.py
stxue1 Nov 18, 2024
db7edaf
Some type hinting improvements
stxue1 Nov 18, 2024
0e0741a
Merge master into issues/5114-filesize-sniffing
github-actions[bot] Nov 20, 2024
d3aa7d5
Use base disk instead of disk_size
adamnovak Nov 20, 2024
03365dd
Fix mypy types
stxue1 Nov 20, 2024
8b80fc3
Merge branch 'master' of github.com:DataBiosphere/toil into issues/51…
stxue1 Nov 26, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ venv*
v3nv/
tmp/
/src/toil/test/cwl/spec*
/src/toil/test/wdl/wdl-conformance-tests
/cwltool_deps/
/docs/generated_rst/
/docker/Dockerfile
Expand Down
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ def setup(app):
autoapi_dirs = ["../src/toil"]
autodoc_typehints = "description"
autoapi_keep_files = True
autoapi_ignore = ["*.pyi", "*/test/cwl/spec*/*.py", "*/fake_mpi_run.py", "*/tutorial_*.py", "*/example_*.py", "*/mkFile.py", "*/debugWorkflow.py"]
autoapi_ignore = ["*.pyi", "*/test/cwl/spec*/*.py", "*/fake_mpi_run.py", "*/tutorial_*.py", "*/example_*.py", "*/mkFile.py", "*/debugWorkflow.py",
"*/test/wdl/wdl-conformance-tests/*"]
autoapi_options = [
"members",
"undoc-members",
Expand Down
4 changes: 2 additions & 2 deletions src/toil/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ def addOptions(
add_cwl_options(parser, suppress=not cwl)
add_wdl_options(parser, suppress=not wdl)
# Add shared runner options
add_runner_options(parser)
add_runner_options(parser, cwl=cwl, wdl=wdl)

def check_arguments(typ: str) -> None:
"""
Expand All @@ -764,7 +764,7 @@ def check_arguments(typ: str) -> None:
add_cwl_options(check_parser)
if typ == "cwl":
add_wdl_options(check_parser)
add_runner_options(check_parser)

for action in check_parser._actions:
action.default = SUPPRESS
other_options, _ = check_parser.parse_known_args(
Expand Down
Loading