Skip to content

Update to add several fixes (seeds, updated environments) and metric collection plots (from Mark) #30

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

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e0989fb
feat: integrate dev branch and update software environments (#25)
btraven00 May 20, 2025
fb5c156
Merge Ben's
imallona May 29, 2025
5e4ecc8
Add a baseline to start incorporating stuff from #25 sequentially
imallona May 29, 2025
2596432
Remove benchmark.yml action
imallona May 29, 2025
fbfb33a
Bring the Clustering example back and the original README; reduce mic…
imallona May 29, 2025
b547540
Update singularity recipe (unpinned version)
imallona Jun 2, 2025
3f7bfa6
Attempt to simplify to tiny conda + ORAS, only
imallona Jun 2, 2025
b3cbbf9
Fix yml path
imallona Jun 2, 2025
24fd20a
miniforge/micromamba gh to workflow dispatch and scheduled; draft app…
imallona Jun 2, 2025
643d4ea
Fix backend
imallona Jun 2, 2025
93840c4
Install argparse in oras fcps, reduce benchmark scope
imallona Jun 2, 2025
341a46a
fix conda
imallona Jun 2, 2025
0d198bc
Start updating Mark's report
imallona Jun 2, 2025
5ae996f
Upgrade metric report to Mark's https://github.com/imallona/clusterin…
imallona Jun 2, 2025
d99e01a
Add seed to FCPS
imallona Jun 2, 2025
84e7185
FCPS seeds again
imallona Jun 2, 2025
7c68296
Add integrative report (Mark's derivative), space timestamps
imallona Jun 3, 2025
3a19f95
Attempting to make BioC 2.21 repro rmarkdown ebs; but still we can do…
imallona Jun 3, 2025
d44971e
Update FCPS easyconfig so it's able to render the metric collector
imallona Jun 4, 2025
059753e
Fix oras ci/cd grid and schedule it; doc the Makefile
imallona Jun 4, 2025
c641603
Align to https://github.com/imallona/clustering_report/commit/acc4d7c…
imallona Jun 4, 2025
873be9f
Add seeds as params to FCPS https://github.com/imallona/clustbench_fc…
imallona Jun 12, 2025
91a821c
Remove nondeterministic Hardcl and Softcl
imallona Jun 17, 2025
a88325d
Remove unused yamls
imallona Jun 17, 2025
d414d26
Bring Hardcl and Softcl back, fixed within run_fcps
imallona Jun 18, 2025
9f733bd
Update genieclust checksum (easyconfig)
imallona Jun 18, 2025
65262c9
Pin fcps conda versions
imallona Jun 19, 2025
dab8639
Upgrade clustbench and genieclust to v1.6, simplify
imallona Jun 19, 2025
90ecaa1
Switch to run_omnibenchmark as action handler
imallona Jun 19, 2025
e1413ff
Bring back the old ORAS workflow, to check whether there is a problem…
imallona Jun 19, 2025
7dbb9b1
Pin pydantic-core version on apptainer
imallona Jun 19, 2025
6f14c91
Track old workflows, test dev
imallona Jun 19, 2025
057c248
Move graph sources from CRAN to bioC (they moved the package)
imallona Jun 20, 2025
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
110 changes: 0 additions & 110 deletions .github/workflows/benchmark.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ name: micromamba
# cancel-in-progress: true

on:
pull_request:
# pull_request:
workflow_dispatch:
schedule:
# - cron: "*/30 * * * *" # Runs every 30 minutes for testing
- cron: "30 1 * * *" # at 1.30am
## these permissions are only for deployment to gh pages
# permissions:
Expand All @@ -22,7 +21,7 @@ jobs:
strategy:
matrix:
ob_branch: [dev, reduce_install_scope, main]
micromamba-version: ['2.1.1-0', '2.0.5-0', '1.5.12-0', '1.5.8-0']
micromamba-version: ['2.1.1-0', '1.5.12-0']
fail-fast: false
concurrency:
group: micromamba-${{ matrix.micromamba-version }}-${{ matrix.ob_branch }}
Expand Down Expand Up @@ -61,7 +60,7 @@ jobs:
shell: bash -l {0}
run: |
env
output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 )
output=$( echo "y" | ob run benchmark -b Clustering_conda.yml --local --cores 10 2>&1 )
status=$?
if echo "$output" | grep -i 'Benchmark run has finished successfully'; then
status=0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ name: clustbench_miniforge
# cancel-in-progress: true

on:
pull_request:
# pull_request:
workflow_dispatch:
schedule:
# - cron: "*/30 * * * *" # Runs every 30 minutes for testing
- cron: "30 1 * * *" # at 1.30am

## these permissions are only for deployment to gh pages
Expand Down Expand Up @@ -70,7 +69,7 @@ jobs:
shell: bash -l {0}
run: |
env
output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 )
output=$( echo "y" | ob run benchmark -b Clustering_conda.yml --local --cores 10 2>&1 )
status=$?
if echo "$output" | grep -i 'Benchmark run has finished successfully'; then
status=0
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/oras.yml.old
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: oras
# concurrency:
# group: ${{ github.head_ref || github.run_id }}
# cancel-in-progress: true

on:
# pull_request:
workflow_dispatch:
schedule:
- cron: "30 1 * * *" # at 1.30am
## these permissions are only for deployment to gh pages
# permissions:
# id-token: write
# pages: write

jobs:
run-benchmark-oras:
name: run_clustbench_oras
runs-on: ubuntu-latest
# runs-on: self-hosted
strategy:
matrix:
ob_branch: [main]
micromamba-version: ['2.1.1-0']
fail-fast: false
concurrency:
group: oras-${{ matrix.micromamba-version }}-${{ matrix.ob_branch }}
cancel-in-progress: false # true
steps:
- name: Check out repository
uses: actions/checkout@v4

- uses: eWaterCycle/setup-apptainer@v2
with:
apptainer-version: 1.4.0

- name: Install ob (with) micromamba
uses: mamba-org/setup-micromamba@v2
with:
cache-environment: false # true
micromamba-version: ${{ matrix.micromamba-version }}
download-micromamba: true
micromamba-binary-path: ${{ runner.temp }}/bin/micromamba-${{ matrix.micromamba-version }}/micromamba
environment-name: test-env-${{matrix.ob_branch }}-${{ matrix.micromamba-version }}
create-args: >-
python=3.12
pip
conda
post-cleanup: environment # all

- name: Overwrite omnibenchmark CLI to branch
shell: bash -l {0}
run: |
micromamba --version
pip install git+https://github.com/omnibenchmark/omnibenchmark.git@${{ matrix.ob_branch }}

- name: Run benchmark
shell: bash -l {0}
run: |
ob run benchmark -b Clustering_oras.yml --local --cores 10 --yes
22 changes: 22 additions & 0 deletions .github/workflows/run_conda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: run_on_conda
on:
push:
workflow_dispatch:
# schedule:
# - cron: "30 1 * * *" # at 1.30am

jobs:
run_benchmark_main:
name: Run on conda
runs-on: ubuntu-latest
# runs-on: self-hosted
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Use action
uses: omnibenchmark/run_omnibenchmark@main
with:
yaml: Clustering_conda.yml
backend: conda
omnibenchmark_branch: 'dev'
21 changes: 21 additions & 0 deletions .github/workflows/run_oras.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: run_on_oras
on:
push:
workflow_dispatch:
# schedule:
# - cron: "30 1 * * *" # at 1.30am

jobs:
run-benchmark:
name: Run on oras
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Use action
uses: omnibenchmark/run_omnibenchmark@main
with:
yaml: Clustering_oras.yml
backend: apptainer
omnibenchmark_branch: 'dev'
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# image build artifacts
envs/*.sif

# snakemake
snakemake.log
.snakemake/

# vim swaps
*.swp
*.swo
Loading
Loading