Skip to content

Commit 3adc0f1

Browse files
Created python-data-slim-plots and using it in FunctionalEquivalence WDLs (#111)
* Created new image for plotting based on python-data-slim * Changed FE tasks to new python-data-slim-plots image
1 parent 72e00b6 commit 3adc0f1

File tree

8 files changed

+15
-25
lines changed

8 files changed

+15
-25
lines changed

FunctionalEquivalence/FunctionalEquivalence.wdl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,6 @@ task CreateHTMLReport {
383383

384384
command <<<
385385
set -xeuo pipefail
386-
387-
source activate fe_evaluation
388386

389387
fe_plots_base64=$(base64 -w 0 ~{merged_fe_plots})
390388
f1_plots_base64=$(base64 -w 0 ~{merged_f1_plots})
@@ -444,7 +442,7 @@ EOF
444442
>>>
445443

446444
runtime {
447-
docker: "us.gcr.io/broad-dsde-methods/functionalequivalence/fe_evaluation:1.0.0"
445+
docker: "us.gcr.io/broad-dsde-methods/python-data-slim-plots:1.0"
448446
preemptible: select_first([preemptible, 0])
449447
memory: "2 GB"
450448
disks: "local-disk 20 HDD"

FunctionalEquivalence/docker/fe_evaluation/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

FunctionalEquivalence/docker/fe_evaluation/environment.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

FunctionalEquivalence/subworkflows/F1Evaluation.wdl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ task F1EvaluationTask {
4848
command <<<
4949
set -xeuo pipefail
5050

51-
source activate fe_evaluation
52-
5351
cat <<'EOF' > script.py
5452
import numpy as np
5553
import matplotlib
@@ -332,7 +330,7 @@ EOF
332330
}
333331

334332
runtime {
335-
docker: "us.gcr.io/broad-dsde-methods/functionalequivalence/fe_evaluation:1.0.0"
333+
docker: "us.gcr.io/broad-dsde-methods/python-data-slim-plots:1.0"
336334
preemptible: select_first([preemptible, 0])
337335
memory: machine_mem_gb + " GB"
338336
disks: "local-disk 20 HDD"

FunctionalEquivalence/subworkflows/FEEvaluation.wdl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ task FEEvaluationTask {
4646
command <<<
4747
set -xeuo pipefail
4848

49-
source activate fe_evaluation
50-
5149
cat <<EOF > script.py
5250
import matplotlib.pyplot as plt
5351
import argparse
@@ -267,7 +265,7 @@ EOF
267265
}
268266

269267
runtime {
270-
docker: "us.gcr.io/broad-dsde-methods/functionalequivalence/fe_evaluation:1.0.0"
268+
docker: "us.gcr.io/broad-dsde-methods/python-data-slim-plots:1.0"
271269
preemptible: select_first([preemptible, 0])
272270
memory: machine_mem_gb + " GB"
273271
disks: "local-disk 20 HDD"

FunctionalEquivalence/subworkflows/PlotROC.wdl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ task PlotROCTask {
4747

4848
command <<<
4949
set -xeuo pipefail
50-
51-
source activate fe_evaluation
5250

5351
cat <<'EOF' > script.py
5452
import matplotlib
@@ -197,7 +195,7 @@ EOF
197195
}
198196

199197
runtime {
200-
docker: "us.gcr.io/broad-dsde-methods/functionalequivalence/fe_evaluation:1.0.0"
198+
docker: "us.gcr.io/broad-dsde-methods/python-data-slim-plots:1.0"
201199
preemptible: select_first([preemptible, 0])
202200
disks: "local-disk 200 HDD"
203201
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM us.gcr.io/broad-dsde-methods/python-data-slim:1.0
2+
RUN pip install matplotlib==3.5.3 plotly==5.10.0

Utilities/Dockers/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,12 @@ with the libraries `pandas`, `numpy`, `scipy`, `firecloud`, `fsspec` (a `fireclo
1414
* Version Notes:
1515
* 1.0: Versions are `python3` 3.9.9, `pandas` 1.3.4, `numpy` 1.21.4, `scipy` 1.7.2, `firecloud` 0.16.32,
1616
`fsspec` 2022.7.1, `gcsfs` 2022.7.1.
17+
18+
## python-data-slim-plots
19+
20+
* Directory: Python-Data-Slim-Plots
21+
* Description: Based on `python-data-slim`, this image supports plotting with [matplotlib](https://matplotlib.org/) and [Plotly](https://plotly.com/)
22+
* Location: `us.gcr.io/broad-dsde-methods/python-data-slim-plots`
23+
* Used By: [FunctionalEquivalence](../../FunctionalEquivalence/FunctionalEquivalence.wdl)
24+
* Version Notes:
25+
* 1.0: Versions are `matplotlib` 3.5.3, `plotly` 5.10.0.

0 commit comments

Comments
 (0)