From 0e3e1836ff9f19664766299314f4afd1fbde08c0 Mon Sep 17 00:00:00 2001 From: t-karatsu <49965247+t-karatsu@users.noreply.github.com> Date: Tue, 22 Oct 2019 08:27:39 +0900 Subject: arpack-ng: Fixed error that is not compatible with isnan. (#13246) --- .../arpack-ng/incompatible_isnan_fix.patch | 22 ++++++++++++++++++++++ .../repos/builtin/packages/arpack-ng/package.py | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 var/spack/repos/builtin/packages/arpack-ng/incompatible_isnan_fix.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arpack-ng/incompatible_isnan_fix.patch b/var/spack/repos/builtin/packages/arpack-ng/incompatible_isnan_fix.patch new file mode 100644 index 0000000000..a2290e4cc5 --- /dev/null +++ b/var/spack/repos/builtin/packages/arpack-ng/incompatible_isnan_fix.patch @@ -0,0 +1,22 @@ +diff -ur arpack-ng-3.7.0_org/TESTS/bug_58_double.f arpack-ng-3.7.0/TESTS/bug_58_double.f +--- arpack-ng-3.7.0_org/TESTS/bug_58_double.f 2019-10-17 12:17:22.496987817 +0900 ++++ arpack-ng-3.7.0/TESTS/bug_58_double.f 2019-10-17 17:12:37.669353870 +0900 +@@ -69,7 +69,7 @@ + & workev(3*maxncv), + & workl(3*maxncv*maxncv+6*maxncv), + & dd(maxn), dl(maxn), du(maxn), +- & du2(maxn), a(maxn,maxn), c(maxn,maxn) ++ & du2(maxn), a(maxn,maxn), c(maxn,maxn), rslt + c + c %---------------% + c | Local Scalars | +@@ -417,7 +417,8 @@ + print *, ' ' + c + end if +- if (isnan(v(1,1))) then ++ rslt = v(1,1) ++ if (rslt .ne. rslt) then + stop 1 + end if + c diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index f7628cc5ae..d283403515 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -59,6 +59,10 @@ class ArpackNg(Package): patch('make_install.patch', when='@3.4.0') patch('parpack_cmake.patch', when='@3.4.0') + # Fujitsu compiler does not support 'isnan' function. + # isnan: function that determines whether it is NaN. + patch('incompatible_isnan_fix.patch', when='%fj') + depends_on('blas') depends_on('lapack') depends_on('automake', when='@3.3.0', type='build') -- cgit v1.2.3-70-g09d2