relion: add patch to repair DoublePrec_CPU=OFF build (#35317)

* relion: add patch to repair DoublePrec_CPU=OFF build
* relion: added maintainer

Co-authored-by: Daniele Colombo <daniele.colombo@fht.org>
This commit is contained in:
Daniele Colombo 2023-02-07 00:32:06 +01:00 committed by GitHub
parent 7740b37923
commit 2516ed181a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions

View file

@ -0,0 +1,26 @@
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

View file

@ -15,6 +15,7 @@ class Relion(CMakePackage, CudaPackage):
homepage = "http://www2.mrc-lmb.cam.ac.uk/relion"
git = "https://github.com/3dem/relion.git"
url = "https://github.com/3dem/relion/archive/4.0.0.zip"
maintainers("dacolombo")
version("4.0.0", sha256="0987e684e9d2dfd630f1ad26a6847493fe9fcd829ec251d8bc471d11701d51dd")
@ -94,6 +95,7 @@ class Relion(CMakePackage, CudaPackage):
# - Gctf
# - ResMap
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")
def cmake_args(self):
args = [