43 Commits

Author SHA1 Message Date
8028b2ded5 Test changes to README.md 2025-05-08 13:37:04 +02:00
a5328e47aa Merge branch '1-cryosparc_no_cuda' into 'master'
Resolve "cryosparc_no_cuda"

Closes #1

See merge request lsm-hpce/merlin-cryosparc!1
v3.0.0
2024-04-17 13:20:42 +02:00
b1f6ec0643 no cuda changes 2024-04-17 13:18:57 +02:00
6b8f9bfe74 Release v2.1.0 2023-04-26 12:54:23 +02:00
47453db925 Add A5000 to GPU list for gpu-big 2023-04-21 16:55:35 +02:00
03306cb683 Update README with dev/update_version.sh 2023-04-21 16:55:03 +02:00
f529f11f58 Handle cryosparc2_ vs cryosparc_ in paths
Breaking change: Remove '2' from default worker paths.

Pulling this change into old installations that still us
`cryosparc2_worker` in the path will temporarily break the worker. To
fix, run `dev/update_version.sh` followed by `./connect_all.sh`.

- new dev/update_versions.sh script to fix your config
- use cryosparcm wrapper, which handles alternate CRYOSPARC_HOME
  correctly
2023-04-21 16:41:34 +02:00
93d47f36b1 Update script defaults to cuda/11.5.1 gcc/7.5.0 2023-03-14 20:26:22 +01:00
aa6417ac12 Release v2.0.2 v2.0.2 2022-12-16 11:33:10 +01:00
147323314e Set SRUN_CPUS_PER_TASK accurately for slurm 22.05 in gpu jobs 2022-12-16 09:47:42 +01:00
2e7a7bbd1b Release v2.0.1 v2.0.1 2022-12-15 14:44:56 +01:00
795ff49d8e Updating scripts for slurm 22.05 2022-12-15 14:44:33 +01:00
8cbdbfd6a2 Remove slurm logs
(mistakenly checked in)
2022-01-20 16:30:46 +01:00
94c565625d Minor README formatting 2021-06-04 14:59:17 +02:00
8998d4685c Release v2.0.0 v2.0.0 2021-06-01 21:28:07 +02:00
51569c5eff Major changes
- Separated CPU and GPU lanes
- Add --cluster parameter to all lanes (Fix bug running on new gmerlin6
  cluster)
- Rename all lanes to mirror (somewhat) the partition names
- Add remove_old_lanes.sh to clean up the renames
2021-06-01 21:24:50 +02:00
c2f1ba9000 Release v1.5.0 v1.5.0 2021-05-28 01:11:20 +02:00
867a9c68d2 Merge branch 'filters' 2021-05-28 01:10:50 +02:00
5ac19aa064 Update README to suggest everyone install filters
Run the smudge filter on new checkouts
2021-05-28 01:02:07 +02:00
c83e4128b2 Updated scripts for the new gmerlin6 cluster and other slurm changes 2021-05-28 00:32:55 +02:00
8ddf6f755f Add new filter to smudge/clean usernames from info scripts 2021-02-25 11:34:39 +01:00
a687c18af4 Fix minor typo in connect_all.sh
Typo was causing an unneccessary warning
2021-02-25 07:54:06 +01:00
bbcad2e6fd Update merlin6 scripts to use --gpu
In particular, this fixes a bug where rtx2080ti gpus were being excluded
v1.4.0
2021-02-24 21:30:17 +01:00
84ec47f273 Add merlin6-rtx2080ti lane 2020-08-19 17:53:22 +02:00
e93c31e6ee Better logging
log slurm job id, nodelist, & exit code
v1.3.1
2020-07-15 14:47:23 +02:00
d82a61069a Release v1.3.0 v1.3.0 2020-07-14 16:38:27 +02:00
a0706dfbca Update merlin6-big lane to include RTX2080Ti
Eventually there will be a feature for this, but for now it has to be done by excluding
GTX1080 nodes.
2020-07-14 16:35:13 +02:00
a5edcf582c Update README with new repository link 2020-03-27 15:12:45 +01:00
34885b9514 Release v1.2.1 v1.2.1 2020-03-27 14:32:43 +01:00
4870878cc9 Add dev/mkrelease.sh
This updates version numbers
2020-03-27 14:32:23 +01:00
a149534e46 Add --time to merlin6-big lane 2020-03-26 16:15:54 +01:00
f84b96a183 Release 1.2.0: Add merlin6-short lane
The short lane is suitable for rapid or interactive workflows. It runs
on the gpu-short and hourly queues.

Features:
- gpu-short lane
- connect_all.sh script for updating
- README

Bug fixes:
- purge pre-loaded modules (e.g. from .bashrc)
v1.2.0
2020-02-25 16:36:57 +01:00
a51d737b76 Release 1.1.0
Switch from setting --ntasks to setting --cpus-per-task

CryoSparc expects a single multi-threaded job.
v1.1.0
2020-02-03 14:13:28 +01:00
64a341448d Add version 1.0.0 numbers! v1.0.0 2019-09-18 15:24:42 +02:00
953770528c Add merlin6 and merlin6-big tracks
- Default to merlin6. Allows sharing of nodes.
- Use merlin6-big for large-memory jobs. Forces exclusive use, allocates
  the maximum memory, and uses GTX 1080Ti cards.
2019-09-18 14:50:22 +02:00
c791c39a49 remove too-long job name 2019-07-22 15:36:14 +02:00
5b42c5f1e5 Merge branch 'master' of /data/project/bio/software/cryoSPARC/v2/config 2019-07-22 14:32:58 +02:00
d540b868e2 Fix bug in merlin6 cluster_script with CPU partition 2019-07-22 14:29:54 +02:00
d14a8641c8 Merge remote-tracking branch 'dist/master' 2019-07-22 11:40:20 +02:00
4098b5fe48 Removing top-level scripts
Scripts will split into several cluster lanes
2019-07-22 11:39:12 +02:00
b27bc1348d Initial cryosparc scripts
This is suited for merlin6 shared gpu cluster usage.

This has known bugs.
2019-07-22 10:49:21 +02:00
52bc294eea Dima's version from /gpfs/data/OPT/cryoSPARC/v2/config/ 2018-12-05 15:53:58 +01:00
1cecf79865 cryosparcm cluster example slurm 2018-12-05 15:47:01 +01:00