relion: use patch from github for relion 4.0 (#38432)
This commit is contained in:
parent
a45d129f86
commit
6ffc11c46d
@ -1,26 +0,0 @@
|
|||||||
From 2daa7447c1c871be062cce99109b6041955ec5e9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takanori Nakane <nakane.t@gmail.com>
|
|
||||||
Date: Thu, 29 Sep 2022 17:10:09 +0900
|
|
||||||
Subject: [PATCH] Repair DoublePrec_CPU=OFF build (as reported by @FilipeMaia).
|
|
||||||
|
|
||||||
---
|
|
||||||
src/ml_optimiser.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/ml_optimiser.cpp b/src/ml_optimiser.cpp
|
|
||||||
index b1148ceb..5643b092 100644
|
|
||||||
--- a/src/ml_optimiser.cpp
|
|
||||||
+++ b/src/ml_optimiser.cpp
|
|
||||||
@@ -6491,7 +6491,7 @@ void MlOptimiser::precalculateShiftedImagesCtfsAndInvSigma2s(bool do_also_unmask
|
|
||||||
|
|
||||||
if (do_subtomo_correction)
|
|
||||||
{
|
|
||||||
- MultidimArray<double> STmult;
|
|
||||||
+ MultidimArray<RFLOAT> STmult;
|
|
||||||
windowFourierTransform(exp_STMulti[img_id], STmult, exp_current_image_size);
|
|
||||||
|
|
||||||
if (is_for_store_wsums)
|
|
||||||
--
|
|
||||||
2.18.4
|
|
||||||
|
|
||||||
|
|
@ -95,7 +95,11 @@ class Relion(CMakePackage, CudaPackage):
|
|||||||
# - Gctf
|
# - Gctf
|
||||||
# - ResMap
|
# - ResMap
|
||||||
patch("0002-Simple-patch-to-fix-intel-mkl-linking.patch", when="@:3.1.1 os=ubuntu18.04")
|
patch("0002-Simple-patch-to-fix-intel-mkl-linking.patch", when="@:3.1.1 os=ubuntu18.04")
|
||||||
patch("0003-Repair-DoublePrec_CPU-OFF-build-as-reported-by-Filip.patch", when="@4.0.0")
|
patch(
|
||||||
|
"https://github.com/3dem/relion/commit/2daa7447c1c871be062cce99109b6041955ec5e9.patch?full_index=1",
|
||||||
|
sha256="4995b0d4bc24a1ec99042a4b73e9db84918eb6f622dacb308b718146bfb6a5ea",
|
||||||
|
when="@4.0.0",
|
||||||
|
)
|
||||||
|
|
||||||
def cmake_args(self):
|
def cmake_args(self):
|
||||||
args = [
|
args = [
|
||||||
|
Loading…
Reference in New Issue
Block a user