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

Update workflow to use the public Docker image. #14

Merged
merged 7 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .dockstore.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
version: 1.2
workflows:
- subclass: WDL
primaryDescriptorPath: embedding_creation_script.wdl
name: EmbeddingCreation
primaryDescriptorPath: /embedding_creation_script.wdl
topic: Method to compute per-cell embeddings for all JUMP-CP data.
testParameterFiles:
- /single_plate_example_inputs.json
15 changes: 11 additions & 4 deletions embedding_creation_script.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ workflow EmbeddingCreation {
Int tfHubModelInputImageHeight
Int tfHubModelInputImageWidth
Int tfHubModelOutputEmbSize
String embeddingCreationDockerImage = 'PUBLIC_DOCKER_IMAGE_GOES_HERE'
String embeddingCreationDockerImage = 'ghcr.io/deflaux/embedding_creation:20240502_203214'
Int embeddingCreationCPU = 8
Int embeddingCreationMemoryGB = 30
Int embeddingCreationDiskGB = 10
Int embeddingCreationBootDiskGB = 15
Int embeddingCreationMaxRetries = 1
Int embeddingCreationPreemptibleAttempts = 2
String embeddingCreationGPUType = "nvidia-tesla-t4"
Expand All @@ -52,7 +53,8 @@ workflow EmbeddingCreation {
input:
loadDataWithIllum = loadDataWithIllum,
modulus = modulus,
dockerImage = embeddingCreationDockerImage
dockerImage = embeddingCreationDockerImage,
bootDiskGB = embeddingCreationBootDiskGB
}

# Run embedding creation scattered by shards of multiple wells.
Expand All @@ -72,6 +74,7 @@ workflow EmbeddingCreation {
cpu = embeddingCreationCPU,
memoryGB = embeddingCreationMemoryGB,
diskGB = embeddingCreationDiskGB,
bootDiskGB = embeddingCreationBootDiskGB,
maxRetries = embeddingCreationMaxRetries,
preemptibleAttempts = embeddingCreationPreemptibleAttempts,
gpuType = embeddingCreationGPUType,
Expand Down Expand Up @@ -103,7 +106,8 @@ task determineShards {
Int modulus = 24

# Docker image
String dockerImage = 'PUBLIC_DOCKER_IMAGE_GOES_HERE'
String dockerImage = 'ghcr.io/deflaux/embedding_creation:20240502_203214'
Int bootDiskGB = 15
}

String outputFilename = 'shards_metadata.txt'
Expand All @@ -130,6 +134,7 @@ task determineShards {

runtime {
docker: dockerImage
bootDiskSizeGb: bootDiskGB
maxRetries: 1
preemptible: 2
}
Expand All @@ -150,10 +155,11 @@ task runEmbeddingCreationScript {
Int tfHubModelInputImageWidth
Int tfHubModelOutputEmbSize

String dockerImage = 'PUBLIC_DOCKER_IMAGE_GOES_HERE'
String dockerImage = 'ghcr.io/deflaux/embedding_creation:20240502_203214'
Int cpu = 8
Int memoryGB = 30
Int diskGB = 10
Int bootDiskGB = 15
Int maxRetries = 1
Int preemptibleAttempts = 2
String gpuType = 'nvidia-tesla-t4'
Expand Down Expand Up @@ -205,6 +211,7 @@ task runEmbeddingCreationScript {
docker: dockerImage
memory: memoryGB + ' GB'
disks: 'local-disk ' + diskGB + ' SSD'
bootDiskSizeGb: bootDiskGB
maxRetries: maxRetries
preemptible: preemptibleAttempts
cpu: cpu
Expand Down
10 changes: 10 additions & 0 deletions single_plate_example_inputs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"EmbeddingCreation.tfHubModelOutputEmbSize":"${1280}",
"EmbeddingCreation.cellCentersPathPrefix":"s3://cellpainting-gallery/cpg0016-jump/source_10/workspace/analysis/2021_05_31_U2OS_48_hr_run1/Dest210531-152149/analysis",
"EmbeddingCreation.cellPatchDim":"${128}",
"EmbeddingCreation.loadDataWithIllum":"s3://cellpainting-gallery/cpg0016-jump/source_10/workspace/load_data_csv/2021_05_31_U2OS_48_hr_run1/Dest210531-152149/load_data_with_illum.parquet",
"EmbeddingCreation.tfHubModelInputImageHeight":"${384}",
"EmbeddingCreation.tfHubModelPath":"https://tfhub.dev/google/imagenet/efficientnet_v2_imagenet21k_s/feature_vector/2",
"EmbeddingCreation.tfHubModelInputImageWidth":"${384}",
"EmbeddingCreation.modelBatchDim":"${256}"
}
Loading