Skip to content

Commit d44971e

Browse files
committed
Update FCPS easyconfig so it's able to render the metric collector
1 parent 3a19f95 commit d44971e

File tree

6 files changed

+54
-220
lines changed

6 files changed

+54
-220
lines changed

Clustering_envmodules.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
id: clustering_example_conda
1+
id: clustering_example_envmodules
22
description: Clustering benchmark on Gagolewski's, true number of clusters plus minus 2.
33
version: 1.4
44
benchmarker: "Izaskun Mallona, Daniel Incicau, Ben Carrillo"
@@ -18,13 +18,13 @@ software_environments:
1818
conda: envs/fcps.yml
1919
apptainer: oras://registry.renkulab.io/izaskun.mallona/clustering_example/fcps:latest
2020
envmodule: fcps
21-
rmarkdown:
22-
description: "rmarkdown on R 4.4.2"
23-
envmodule: rmarkdown
21+
# rmarkdown:
22+
# description: "rmarkdown on R 4.4.2"
23+
# envmodule: rmarkdown
2424
metric_collectors:
2525
- id: plotting
2626
name: "Single-backend metric collector."
27-
software_environment: "rmarkdown"
27+
software_environment: "fcps"
2828
repository:
2929
url: https://github.com/imallona/clustering_report
3030
commit: bbb9d56

Clustering_oras.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
id: clustering_example_conda
1+
id: clustering_example_oras
22
description: Clustering benchmark on Gagolewski's, true number of clusters plus minus 2.
33
version: 1.4
44
benchmarker: "Izaskun Mallona, Daniel Incicau, Ben Carrillo"
55
storage: http://omnibenchmark.org:9000
66
benchmark_yaml_spec: 0.04
77
storage_api: S3
8-
storage_bucket_name: clusteringexampleapptainer
8+
storage_bucket_name: clusteringexampleoras
99
software_backend: apptainer
1010
software_environments:
1111
clustbench:

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OB_CMD=ob run benchmark --local --cores ${MAX_CORES} --yes
66
# prepare_apptainer_env:
77
# cd envs && bash build_singularity.sh
88

9-
all: run_with_default_conda run_with_unpinned_oras knit_report
9+
all: run_with_default_conda run_with_unpinned_oras run_with_default_envs knit_report
1010

1111
run_with_default_conda:
1212
${OB_CMD} -b Clustering_conda.yml
@@ -18,8 +18,13 @@ run_with_unpinned_oras:
1818
cp Clustering_oras.yml out
1919
mv out out_singularity_$(shell date +'%Y%m%d_%H%M')
2020

21+
run_with_default_envs:
22+
${OB_CMD} -b Clustering_envmodules.yml
23+
cp Clustering_envmodules.yml out
24+
mv out out_envmodules_$(shell date +'%Y%m%d_%H%M')
25+
2126
## derived from Mark's plots to process multiple benchmark runs at once
22-
knit_report:
27+
knit_report:
2328
## todo incorporate this report to this repo, downloading from a temporary branch `mark` is a bad idea
2429
wget -nc https://raw.githubusercontent.com/imallona/clustering_report/refs/heads/mark/07_metrics_across_backends.Rmd
2530
R -e 'rmarkdown::render("07_metrics_across_backends.Rmd", params = list(performance_bn = "performance-results.rds", metrics_bn = "metrics-results.rds", clustering_dir = "."))'

envs/fcps.eb

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,9 @@ exts_list = [
198198
('mclust', '6.1.1', {
199199
'checksums': ['ddd7018e5e6ea7f92c7fc9872b391491b7e91c2cd89ef1dcaf4408afb5116775'],
200200
}),
201-
('cclust', '0.6-26'),
201+
('cclust', '0.6-26', {
202+
'checksums': ['92ec3c55a1864e4e1a4706bfdef8ad00727c720213ac656c718e867286b29857'],
203+
}),
202204
('flowClust', '3.40.0', {
203205
'installopts': "--configure-args='--with-gsl=${EBROOTGSL} --enable-bundled-gsl=false'",
204206
'checksums': ['7e699b06e378e32144704dbec18289109980b0f5eca166180f2c30007b83e0f5'],
@@ -231,13 +233,49 @@ exts_list = [
231233
('FCPS', version, {
232234
'checksums': ['d1e5e06700a81fe529f52ef1f65977d3c786f33df262f4f89238d2622dc7ba97'],
233235
}),
236+
('codetools', '0.2-20', {
237+
'checksums': ['3be6f375ec178723ddfd559d1e8e85bfeee04a5fbaf9f53f2f844e1669fea863'],
238+
}),
239+
('iterators', '1.0.14', {
240+
'checksums': ['cef3075a0930e1408c764e4da56bbadd4f7d14315809df8f38dd51f80ccc677b'],
241+
}),
242+
('foreach', '1.5.2', {
243+
'checksums': ['56338d8753f9f68f262cf532fd8a6d0fe25a71a2ff0107f3ce378feb926bafe4'],
244+
}),
245+
('data.table', '1.17.4', {
246+
'checksums': ['396eb2a0e38249310070b60cc6c4e930f2cfc940e6ad0ac62c4c7a5b16390753'],
247+
}),
248+
('ModelMetrics', '1.2.2.2', {
249+
'checksums': ['5e06f1926aebca5654e1329c66ef19b04058376b2277ebb16e3bf8c208d73457'],
250+
}),
251+
('generics', '0.1.3', {
252+
'checksums': ['75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053'],
253+
}),
254+
('tidyselect', '1.2.1', {
255+
'checksums': ['169e97ba0bbfbcdf4a80534322751f87a04370310c40e27f04aac6525d45903c'],
256+
}),
257+
('dplyr', '1.1.4', {
258+
'checksums': ['cf730414d5d4ab387b4e9890a4b1df9d17a3903488e8da8df1cf2e11e44558cb'],
259+
}),
260+
('timechange', '0.3.0', {
261+
'checksums': ['d85c0b5514ab9578d16032e703c33f197feaed1a424c834ebfcbf0ad46ae46b4'],
262+
}),
263+
('lubridate', '1.9.3', {
264+
'checksums': ['2b6e1406d231b0a14d60b99cc406d159fea5465a5694725ad25343f12cf37fff'],
265+
}),
266+
('tidyr', '1.3.1', {
267+
'checksums': ['e820c261cb5543f572f49276a7bdc7302aa4215da4bf850b1b939a315353835d'],
268+
}),
269+
('jsonlite', '2.0.0', {
270+
'checksums': ['75eb910c82b350ec33f094779da0f87bff154c232e4ae39c9896a9b89f3ac82d'],
271+
}),
234272
]
235273

236274
modextrapaths = {'R_LIBS_SITE': ''}
237275

238276
sanity_check_paths = {
239277
'files': [],
240-
'dirs': ['FCPS', 'dbscan', 'energy', 'protoclust'],
278+
'dirs': ['FCPS', 'dbscan', 'energy', 'protoclust', 'jsonlite', 'tidyr', 'dplyr'],
241279
}
242280

243281
moduleclass = 'bio'

envs/rmarkdown.eb

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

envs/rmarkdown.yml

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

0 commit comments

Comments
 (0)