Skip to content

integrate dev branch and update software environments #25

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

Merged
merged 60 commits into from
May 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
4a3fdc3
run dev branch
btraven00 May 8, 2025
e89adda
docs: use the public repo URI
btraven00 Mar 17, 2025
52ebb55
chore: add convenience target to build singularity env
Mar 18, 2025
83c6f0b
feat: parametrize num threads on the makefile
Mar 18, 2025
dc2d629
chore: ignore common temporary outputs and image build artifacts
Mar 18, 2025
f91603a
feat: parametrize num threads on the makefile
Mar 18, 2025
bea2a75
fix: use --cores, --task-timeout
May 5, 2025
67e8cf8
update .eb files to easybuild 5.0
btraven00 May 7, 2025
931389f
remove remote storage
btraven00 May 8, 2025
60ac47b
do not run artifact if not in main repo
btraven00 May 8, 2025
1b972bf
Update Makefile
btraven00 May 8, 2025
49646db
streamline envmodules yaml
btraven00 May 8, 2025
fc53991
update clustbench
btraven00 May 8, 2025
54b7279
add rmarkdown-python bundles, without checksums
btraven00 May 10, 2025
1b57e44
inject checksums to rmarkdown easyconfig
btraven00 May 10, 2025
dfd5b93
update sklearn singularity definition
btraven00 May 11, 2025
0056b7f
factorize sklearn singularity pip block
btraven00 May 11, 2025
cef3a6b
extract variable in build script
btraven00 May 11, 2025
2ee17ca
revert include, should use m4
btraven00 May 11, 2025
c4cbe5c
update python version
btraven00 May 11, 2025
21bdd66
do a little bit of cleanup with the multiple envs
btraven00 May 11, 2025
e8e0f7e
escape
btraven00 May 11, 2025
a8336fb
install updated python
btraven00 May 11, 2025
518c2f6
sync the two build recipes
btraven00 May 11, 2025
2f4131f
delete source folder
btraven00 May 11, 2025
c72eb27
add microbenchmark for numpy operations
btraven00 May 11, 2025
937e455
fix path
btraven00 May 11, 2025
b0bd85a
default reps
btraven00 May 11, 2025
83f9b07
refs
btraven00 May 11, 2025
744c978
duplicate the apptainer clustering yaml
btraven00 May 12, 2025
ec18dcf
update the oras yaml. not working, just to keep in sync
btraven00 May 12, 2025
cf52a2c
update the rmarkdown environment
btraven00 May 12, 2025
934ce8b
update makefile
btraven00 May 12, 2025
3890cb4
add apptainer definition for rmarkdown
btraven00 May 12, 2025
c80adc1
remove unneeded dependencies
btraven00 May 12, 2025
b19a489
update makefile
btraven00 May 12, 2025
ebd69b7
cleanup r/fcps deps
btraven00 May 12, 2025
1afaa2f
cleanup image
btraven00 May 12, 2025
9e2168a
update readme
btraven00 May 12, 2025
6199c0a
fixes
btraven00 May 12, 2025
b017cb0
apptainer smoketest
btraven00 May 12, 2025
98777a5
add git in the image
btraven00 May 12, 2025
f4ae29d
try to debug fastcluster problem
btraven00 May 12, 2025
72cdc59
fail if the exit code fails
btraven00 May 14, 2025
01243de
use conda short for test
btraven00 May 14, 2025
7b213c9
remove rmarkdown dedicated singularity image
btraven00 May 16, 2025
ce34ee2
remove wget dependency from apptainer, add upload script
btraven00 May 16, 2025
0fe20a6
remove python3-wget
btraven00 May 16, 2025
d673143
add yaml for registry runs
btraven00 May 16, 2025
765e418
bump clustering-benchmarks to 1.1.6
btraven00 May 16, 2025
365f2a0
templatize
btraven00 May 19, 2025
3a17865
mv folders to timestamped names
btraven00 May 19, 2025
f6caebd
add --yes flag
btraven00 May 19, 2025
f72d0ca
update readmes
btraven00 May 19, 2025
eef58c4
extract modules with yq
btraven00 May 19, 2025
f076b83
envmodules short
btraven00 May 20, 2025
478ef27
bump version in README
btraven00 May 20, 2025
0896ffa
track main branch
btraven00 May 20, 2025
1c6179f
blah blah
btraven00 May 20, 2025
b64949e
add comment
btraven00 May 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
15 changes: 6 additions & 9 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
run-benchmark:
name: Run Benchmark
runs-on: ubuntu-latest
## runs-on: self-hosted
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -49,27 +48,26 @@ jobs:
shell: bash -l {0}
run: |
mamba install -y pip
pip install git+https://github.com/omnibenchmark/omnibenchmark.git@reduce_install_scope
pip install git+https://github.com/omnibenchmark/omnibenchmark.git@main

- name: Load benchmark cache
id: cache-benchmark
uses: actions/cache@v3
with:
path: out/
key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering.yaml') }}
key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering_conda_short.yml') }}

- name: Run benchmark
shell: bash -l {0}
continue-on-error: true
continue-on-error: false
run: |
echo "y" | ob run benchmark -b Clustering.yaml --local --cores 3 --continue-on-error
ob run benchmark -b Clustering_conda_short.yml --local --cores 3 --continue-on-error --yes

upload-artifact:
name: Benchmark Artifact
runs-on: ubuntu-latest
## runs-on: self-hosted
needs: run-benchmark
if: always()
if: github.ref == 'refs/heads/main' && github.repository_owner == 'omnibenchmark'
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -100,12 +98,11 @@ jobs:

- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v4

- name: Create Job Summary
if: always()
run: |
echo "### Reports" >> $GITHUB_STEP_SUMMARY
echo "- [Plotting Report](https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }})" >> $GITHUB_STEP_SUMMARY
echo "### All Outputs" >> $GITHUB_STEP_SUMMARY
echo "- [Complete Benchmark Output](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts)" >> $GITHUB_STEP_SUMMARY

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
232 changes: 0 additions & 232 deletions Clustering.yaml

This file was deleted.

Loading
Loading