From bc2425090a419e7b5568fb67b19daa352c270ae5 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Thu, 30 Sep 2021 12:14:45 +0200 Subject: [PATCH 1/2] Add relion/3.1.3 --- EM/relion/.build.swn | 0 EM/relion/README.md | 2 +- EM/relion/files/variants | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 EM/relion/.build.swn diff --git a/EM/relion/.build.swn b/EM/relion/.build.swn new file mode 100644 index 0000000..e69de29 diff --git a/EM/relion/README.md b/EM/relion/README.md index 259faaa..a03e1ac 100644 --- a/EM/relion/README.md +++ b/EM/relion/README.md @@ -6,7 +6,7 @@ Relion is installed from git. The ./build script should work for both stable (tags) and unstable (branches) versions. It should be run on Merlin6 from an admin account. -Currently only gcc/7.4.0 is used. Better performance is reported with intel icc +Currently only gcc is used. Better performance is reported with intel icc and MKL, but this would require additional openmpi variants. After running ./build, install relion scripts from the repository at diff --git a/EM/relion/files/variants b/EM/relion/files/variants index 9976d7c..16ed3ab 100644 --- a/EM/relion/files/variants +++ b/EM/relion/files/variants @@ -9,3 +9,4 @@ relion/3.1.0-1 stable gcc/7.5.0 openmpi/4.0.4_slurm cuda/10.1.105 b:cmake/3.15.5 relion/3.1.1 deprecated gcc/9.3.0 openmpi/4.0.4_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 relion/3.1.1-1 stable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 relion/3.1.2 stable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 +relion/3.1.3 unstable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 From bad1541b54ea4745ca8af9fac7b54d62db25d0ef Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Thu, 30 Sep 2021 13:58:16 +0200 Subject: [PATCH 2/2] Add relion/4.0-beta --- EM/relion/files/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/EM/relion/files/variants b/EM/relion/files/variants index 16ed3ab..bc42c22 100644 --- a/EM/relion/files/variants +++ b/EM/relion/files/variants @@ -10,3 +10,4 @@ relion/3.1.1 deprecated gcc/9.3.0 openmpi/4.0.4_slurm cuda/11.0.3 b:cmake/3.15.5 relion/3.1.1-1 stable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 relion/3.1.2 stable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 relion/3.1.3 unstable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 +relion/4.0-beta unstable gcc/9.2.0 openmpi/4.0.5_slurm cuda/11.0.3 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0