Skip to content

Commit 2536589

Browse files
authored
Update to add several fixes (seeds, updated environments) and metric collection plots (from Mark) (#30)
Update soft envs, add parameters (seeds) and incorporate Mark's plots for metric collection
1 parent 0fdb592 commit 2536589

24 files changed

+538
-1160
lines changed

.github/workflows/benchmark.yml

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

.github/workflows/micromamba.yml renamed to .github/workflows/micromamba.yml.old

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ name: micromamba
44
# cancel-in-progress: true
55

66
on:
7-
pull_request:
7+
# pull_request:
88
workflow_dispatch:
99
schedule:
10-
# - cron: "*/30 * * * *" # Runs every 30 minutes for testing
1110
- cron: "30 1 * * *" # at 1.30am
1211
## these permissions are only for deployment to gh pages
1312
# permissions:
@@ -22,7 +21,7 @@ jobs:
2221
strategy:
2322
matrix:
2423
ob_branch: [dev, reduce_install_scope, main]
25-
micromamba-version: ['2.1.1-0', '2.0.5-0', '1.5.12-0', '1.5.8-0']
24+
micromamba-version: ['2.1.1-0', '1.5.12-0']
2625
fail-fast: false
2726
concurrency:
2827
group: micromamba-${{ matrix.micromamba-version }}-${{ matrix.ob_branch }}
@@ -61,7 +60,7 @@ jobs:
6160
shell: bash -l {0}
6261
run: |
6362
env
64-
output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 )
63+
output=$( echo "y" | ob run benchmark -b Clustering_conda.yml --local --cores 10 2>&1 )
6564
status=$?
6665
if echo "$output" | grep -i 'Benchmark run has finished successfully'; then
6766
status=0

.github/workflows/miniconda_miniforge.yml renamed to .github/workflows/miniconda_miniforge.yml.old

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ name: clustbench_miniforge
44
# cancel-in-progress: true
55

66
on:
7-
pull_request:
7+
# pull_request:
88
workflow_dispatch:
99
schedule:
10-
# - cron: "*/30 * * * *" # Runs every 30 minutes for testing
1110
- cron: "30 1 * * *" # at 1.30am
1211

1312
## these permissions are only for deployment to gh pages
@@ -70,7 +69,7 @@ jobs:
7069
shell: bash -l {0}
7170
run: |
7271
env
73-
output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 )
72+
output=$( echo "y" | ob run benchmark -b Clustering_conda.yml --local --cores 10 2>&1 )
7473
status=$?
7574
if echo "$output" | grep -i 'Benchmark run has finished successfully'; then
7675
status=0

.github/workflows/oras.yml.old

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: oras
2+
# concurrency:
3+
# group: ${{ github.head_ref || github.run_id }}
4+
# cancel-in-progress: true
5+
6+
on:
7+
# pull_request:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: "30 1 * * *" # at 1.30am
11+
## these permissions are only for deployment to gh pages
12+
# permissions:
13+
# id-token: write
14+
# pages: write
15+
16+
jobs:
17+
run-benchmark-oras:
18+
name: run_clustbench_oras
19+
runs-on: ubuntu-latest
20+
# runs-on: self-hosted
21+
strategy:
22+
matrix:
23+
ob_branch: [main]
24+
micromamba-version: ['2.1.1-0']
25+
fail-fast: false
26+
concurrency:
27+
group: oras-${{ matrix.micromamba-version }}-${{ matrix.ob_branch }}
28+
cancel-in-progress: false # true
29+
steps:
30+
- name: Check out repository
31+
uses: actions/checkout@v4
32+
33+
- uses: eWaterCycle/setup-apptainer@v2
34+
with:
35+
apptainer-version: 1.4.0
36+
37+
- name: Install ob (with) micromamba
38+
uses: mamba-org/setup-micromamba@v2
39+
with:
40+
cache-environment: false # true
41+
micromamba-version: ${{ matrix.micromamba-version }}
42+
download-micromamba: true
43+
micromamba-binary-path: ${{ runner.temp }}/bin/micromamba-${{ matrix.micromamba-version }}/micromamba
44+
environment-name: test-env-${{matrix.ob_branch }}-${{ matrix.micromamba-version }}
45+
create-args: >-
46+
python=3.12
47+
pip
48+
conda
49+
post-cleanup: environment # all
50+
51+
- name: Overwrite omnibenchmark CLI to branch
52+
shell: bash -l {0}
53+
run: |
54+
micromamba --version
55+
pip install git+https://github.com/omnibenchmark/omnibenchmark.git@${{ matrix.ob_branch }}
56+
57+
- name: Run benchmark
58+
shell: bash -l {0}
59+
run: |
60+
ob run benchmark -b Clustering_oras.yml --local --cores 10 --yes

.github/workflows/run_conda.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: run_on_conda
2+
on:
3+
push:
4+
workflow_dispatch:
5+
# schedule:
6+
# - cron: "30 1 * * *" # at 1.30am
7+
8+
jobs:
9+
run_benchmark_main:
10+
name: Run on conda
11+
runs-on: ubuntu-latest
12+
# runs-on: self-hosted
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
17+
- name: Use action
18+
uses: omnibenchmark/run_omnibenchmark@main
19+
with:
20+
yaml: Clustering_conda.yml
21+
backend: conda
22+
omnibenchmark_branch: 'dev'

.github/workflows/run_oras.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: run_on_oras
2+
on:
3+
push:
4+
workflow_dispatch:
5+
# schedule:
6+
# - cron: "30 1 * * *" # at 1.30am
7+
8+
jobs:
9+
run-benchmark:
10+
name: Run on oras
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
16+
- name: Use action
17+
uses: omnibenchmark/run_omnibenchmark@main
18+
with:
19+
yaml: Clustering_oras.yml
20+
backend: apptainer
21+
omnibenchmark_branch: 'dev'

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# image build artifacts
2+
envs/*.sif
3+
4+
# snakemake
5+
snakemake.log
6+
.snakemake/
7+
8+
# vim swaps
9+
*.swp
10+
*.swo

0 commit comments

Comments
 (0)