From 3d0560a0f31480a3c16c887542a43282f7c84be2 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Wed, 18 Nov 2020 21:05:31 +0100 Subject: [PATCH] Release relion 3.1.1 --- EM/relion/build | 6 ++++-- EM/relion/files/variants | 1 + EM/relion/modulefile | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/EM/relion/build b/EM/relion/build index 720a59f..e4e5da2 100755 --- a/EM/relion/build +++ b/EM/relion/build @@ -22,7 +22,9 @@ pbuild::pre_configure() { pbuild::add_configure_args CudaTexture=ON pbuild::add_configure_args ALTCPU=ON pbuild::add_configure_args FORCE_OWN_TBB=ON - # Requires intel compiler - #pbuild::add_configure_args MKLFFT=ON + if [[ -n "$INTEL_VERSION" ]]; then + # Requires intel compiler + pbuild::add_configure_args MKLFFT=ON + fi } diff --git a/EM/relion/files/variants b/EM/relion/files/variants index 85f610e..c3633bf 100644 --- a/EM/relion/files/variants +++ b/EM/relion/files/variants @@ -4,4 +4,5 @@ relion/3.0.8 stable gcc/7.4.0 openmpi/3.1.4_merlin6 cuda/9.2.148 b:cmake/3.14.0 relion/3.1-beta unstable gcc/7.4.0 openmpi/3.1.4_merlin6 cuda/9.2.148 b:cmake/3.14.0 b:tiff/4.0.9 relion/3.1.0 stable gcc/7.5.0 openmpi/4.0.4_slurm cuda/10.0.130 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 relion/3.1.0-1 unstable gcc/7.5.0 openmpi/4.0.4_slurm cuda/10.1.105 b:cmake/3.15.5 b:tiff/4.0.9 b:git/2.22.0 +relion/3.1.1 unstable 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 diff --git a/EM/relion/modulefile b/EM/relion/modulefile index 7dc0903..9adae5c 100644 --- a/EM/relion/modulefile +++ b/EM/relion/modulefile @@ -43,6 +43,5 @@ setenv RELION_GCTF_EXECUTABLE /opt/psi/EM/Gctf/1.06/bin/Gctf setenv RELION_RESMAP_EXECUTABLE /opt/psi/EM/ResMap/1.1.4/bin/ResMap # Version-specific variables -setenv RELION_QSUB_TEMPLATE /opt/psi/EM/relion/3.1-beta/scripts/multi_gpu.sh -setenv RELION_MOTIONCOR2_EXECUTABLE /opt/psi/EM/MotionCor2/1.3.0/bin/MotionCor2_1.3.0-Cuda92 - +setenv RELION_QSUB_TEMPLATE /opt/psi/EM/relion/$V/scripts/multi_gpu.sh +setenv RELION_MOTIONCOR2_EXECUTABLE /opt/psi/EM/MotionCor2/1.4.0/bin/MotionCor2_1.4.0_Cuda110 -- GitLab