diff options
| author | John Hodrien <J.H.Hodrien@leeds.ac.uk> | 2022-04-26 23:13:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 17:13:37 -0500 |
| commit | 5055f5e3e29e2977f2dda21aa823b67064939ff5 (patch) | |
| tree | b7113aacb47d7c421d6e01e89bffd9763b49db1a | |
| parent | 0b26103c074157c285aed5f8cac1aad05178513f (diff) | |
| download | spack-5055f5e3e29e2977f2dda21aa823b67064939ff5.tar.gz spack-5055f5e3e29e2977f2dda21aa823b67064939ff5.tar.bz2 spack-5055f5e3e29e2977f2dda21aa823b67064939ff5.tar.xz spack-5055f5e3e29e2977f2dda21aa823b67064939ff5.zip | |
Power9 build fix for ctffind4 (#30300)
Only tested against the latest version, which is why it only applies the patch
when using 4.1.14.
Fix comes from:
https://grigoriefflab.umassmed.edu/forum/software/ctffind_ctftilt/installing_ctffind_4114_ibm_power9
| -rw-r--r-- | var/spack/repos/builtin/packages/ctffind/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ctffind/power9.patch | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ctffind/package.py b/var/spack/repos/builtin/packages/ctffind/package.py index 36ac2974c1..379c831c19 100644 --- a/var/spack/repos/builtin/packages/ctffind/package.py +++ b/var/spack/repos/builtin/packages/ctffind/package.py @@ -29,6 +29,7 @@ class Ctffind(AutotoolsPackage): depends_on('jpeg') patch('configure.patch', when='@4.1.8') + patch('power9.patch', when='@4.1.14 target=power9le') def configure_args(self): config_args = [] diff --git a/var/spack/repos/builtin/packages/ctffind/power9.patch b/var/spack/repos/builtin/packages/ctffind/power9.patch new file mode 100644 index 0000000000..6ff49a7556 --- /dev/null +++ b/var/spack/repos/builtin/packages/ctffind/power9.patch @@ -0,0 +1,16 @@ +diff -ur a/src/core/matrix.cpp b/src/core/matrix.cpp +--- a/src/core/matrix.cpp 2020-05-08 18:28:30.000000000 +0100 ++++ b/src/core/matrix.cpp 2022-04-26 14:45:23.414518732 +0100 +@@ -4,7 +4,11 @@ + // think i got it from a book i had about game programming in c.. it's probably slower than what the compiler would do these days. + + #define AL_PI 3.14159265358979323846 +-#define _AL_SINCOS(x, s, c) __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x)) ++#if defined(__i386__) || defined(__x86_64__) ++#define _AL_SINCOS(x, s, c) __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x)) ++#else ++#define _AL_SINCOS(x, s, c) s = sinf(x); c = cosf(x); ++#endif + #define FLOATSINCOS(x, s, c) _AL_SINCOS((x) * AL_PI / 128.0, s ,c) + + #define MAKE_ROTATION_f(x, y, z) |