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

Hybrid Batch + Smart Downloads #111

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
af7cb3c
experimental bash
morsecodist Mar 30, 2023
b67858e
version image
morsecodist Mar 30, 2023
c08d9b5
add env vars
morsecodist Mar 30, 2023
80198dc
bash fix
morsecodist Mar 30, 2023
05bac0b
bump
morsecodist Mar 30, 2023
bc812aa
exp
morsecodist Mar 30, 2023
67c2b44
bump
morsecodist Mar 30, 2023
8046164
version fix
morsecodist Mar 30, 2023
e569fd1
fix code
morsecodist Mar 30, 2023
2e00210
bump
morsecodist Mar 30, 2023
b63bbca
backend config fix
morsecodist Mar 30, 2023
59d48d6
config
morsecodist Mar 30, 2023
664a956
fix
morsecodist Mar 30, 2023
76c3d75
bump
morsecodist Mar 30, 2023
98896a7
uuid data
morsecodist Mar 30, 2023
4096630
bump
morsecodist Mar 30, 2023
d7932df
logwatch
morsecodist Mar 30, 2023
322f578
bump
morsecodist Mar 30, 2023
0407f09
perms
morsecodist Mar 30, 2023
585b70b
typo
morsecodist Mar 30, 2023
a666e59
policy fix
morsecodist Mar 30, 2023
b11f45f
perms
morsecodist Mar 30, 2023
38eb655
exp
morsecodist Mar 30, 2023
a32142f
message logging
morsecodist Mar 30, 2023
d5baa9d
exp
morsecodist Mar 30, 2023
3a9a5d6
exp
morsecodist Mar 30, 2023
6fb0768
exp
morsecodist Mar 30, 2023
346a283
exp
morsecodist Mar 30, 2023
1f1b6d4
stdout
morsecodist Mar 30, 2023
86a695b
bump
morsecodist Mar 30, 2023
13b3e9f
pathing
morsecodist Mar 30, 2023
bc4fad8
bump
morsecodist Mar 30, 2023
fead158
exit codes
morsecodist Mar 30, 2023
fc092ec
bump
morsecodist Mar 30, 2023
88b56bf
task outputs
morsecodist Mar 31, 2023
0cb1373
bump
morsecodist Mar 31, 2023
c4e035f
output loading
morsecodist Mar 31, 2023
08ceba0
bump
morsecodist Mar 31, 2023
47858d4
typo
morsecodist Mar 31, 2023
cbdf696
bump
morsecodist Mar 31, 2023
7719fc8
output
morsecodist Mar 31, 2023
c2f9dbf
bump
morsecodist Mar 31, 2023
a6279b2
a
morsecodist Mar 31, 2023
de45db6
bump
morsecodist Mar 31, 2023
e5c6b5d
a
morsecodist Mar 31, 2023
7e95ad3
bump
morsecodist Mar 31, 2023
7b4f1f1
a
morsecodist Mar 31, 2023
3bed12d
bump
morsecodist Mar 31, 2023
45a09e1
a
morsecodist Mar 31, 2023
f492a0e
bump
morsecodist Mar 31, 2023
1450590
logging
morsecodist Mar 31, 2023
b979001
logging
morsecodist Mar 31, 2023
f3bfc2a
bump
morsecodist Mar 31, 2023
b783f9a
work dir
morsecodist Mar 31, 2023
cd08697
bump
morsecodist Mar 31, 2023
924a8a3
proper join
morsecodist Mar 31, 2023
c0159eb
bump
morsecodist Mar 31, 2023
732b52b
unlog
morsecodist Mar 31, 2023
dbe648b
bump
morsecodist Mar 31, 2023
db288ed
host
morsecodist Mar 31, 2023
30b4f59
bump
morsecodist Mar 31, 2023
6279c94
exp
morsecodist Mar 31, 2023
637577c
bump
morsecodist Mar 31, 2023
209f0de
typo
morsecodist Mar 31, 2023
facc524
bump
morsecodist Mar 31, 2023
61abd98
logging
morsecodist Mar 31, 2023
d66db65
bump
morsecodist Mar 31, 2023
8190512
positioning
morsecodist Apr 3, 2023
64c0b55
bump
morsecodist Apr 3, 2023
62fc4a6
upload stuff
morsecodist Apr 3, 2023
98149e8
bump
morsecodist Apr 3, 2023
44c6936
merge
morsecodist Apr 3, 2023
662104c
bump
morsecodist Apr 3, 2023
1e2a9af
good spot
morsecodist Apr 7, 2023
384ef05
directories
morsecodist Apr 10, 2023
3613b90
format
morsecodist Apr 10, 2023
86612b3
working smart download
morsecodist Apr 11, 2023
736413c
fix
morsecodist Apr 11, 2023
123e5b5
exp
morsecodist Apr 12, 2023
c7ce71c
bump
morsecodist Apr 12, 2023
58e2bda
wip
morsecodist Apr 13, 2023
2eea3b3
bump
morsecodist Apr 17, 2023
f9bdace
python version
morsecodist Apr 17, 2023
9b7c7ee
bump
morsecodist Apr 17, 2023
c079b76
fix match issue
morsecodist Apr 17, 2023
5d9814f
bump
morsecodist Apr 17, 2023
c1bcfea
fix conditional
morsecodist Apr 17, 2023
ff26970
bump
morsecodist Apr 17, 2023
9ff3d52
logging
morsecodist Apr 18, 2023
07b4b66
bump
morsecodist Apr 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
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
# currently, there is an issue in v1.5.3 so we can't upgrade until it is resolved https://github.com/chanzuckerberg/miniwdl/issues/607
ARG MINIWDL_VERSION=1.5.2
Expand Down Expand Up @@ -61,7 +61,6 @@ ADD miniwdl-plugins miniwdl-plugins

RUN pip install miniwdl-plugins/s3upload
RUN pip install miniwdl-plugins/sfn_wdl
RUN pip install miniwdl-plugins/s3parcp_download

RUN cd /usr/bin; curl -O https://amazon-ecr-credential-helper-releases.s3.amazonaws.com/0.4.0/linux-amd64/docker-credential-ecr-login
RUN chmod +x /usr/bin/docker-credential-ecr-login
Expand Down
49 changes: 49 additions & 0 deletions foo.wdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
version 1.0

task say_hello {
input {
String salutation
String name
String docker_image_id
}
command <<<
echo "~{salutation} ~{name}" > "~{name}.txt"
>>>
output {
String greeting = "~{name}.txt"
}
runtime {
maxRetries: 3
docker: docker_image_id
}
}

# task merge {
# input {
# Array[String] greetings
# }
# command <<<
# echo "~{sep=', ' greetings}"
# >>>
# output {
# String combined = stdout()
# }
# }

workflow scatter_example {
input {
Array[String] name_array = ["Joe", "Bob", "Fred"]
String salutation = "hello"
String docker_image_id = "ubuntu:20.04"
}

scatter (name in name_array) {
call say_hello { input: name = name, salutation = salutation, docker_image_id = docker_image_id }
}

# call merge { input: greetings = say_hello.greeting }

output {
Array[String] combined = say_hello.greeting
}
}
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ locals {
module "sfn" {
source = "./terraform/modules/swipe-sfn"
app_name = var.app_name
batch_job_docker_image = "ghcr.io/chanzuckerberg/swipe:${chomp(local.version)}"
batch_job_docker_image = "732052188396.dkr.ecr.us-west-2.amazonaws.com/swipe:9ff3d52f958d82eb7c1c1cc37ceee321031a3a94"
batch_spot_job_queue_arn = module.batch_queue.batch_spot_job_queue_arn
batch_on_demand_job_queue_arn = module.batch_queue.batch_on_demand_job_queue_arn
miniwdl_dir = var.miniwdl_dir
Expand Down
13 changes: 0 additions & 13 deletions miniwdl-plugins/s3parcp_download/README.md

This file was deleted.

Empty file.
92 changes: 0 additions & 92 deletions miniwdl-plugins/s3parcp_download/miniwdl_s3parcp.py

This file was deleted.

30 changes: 0 additions & 30 deletions miniwdl-plugins/s3parcp_download/setup.py

This file was deleted.

Loading