From b3f221185e1d4c56bbb38c8b7669beec2885bb06 Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Tue, 2 Aug 2022 13:02:00 -0700 Subject: butterflypack %oneapi: patch CMakeLists to solve issue #31818 (#31848) * butterflypack %oneapi: patch CMakeLists to solve issue #31818 * uncomment builds affected by failing butterflypack Co-authored-by: e --- var/spack/repos/builtin/packages/butterflypack/package.py | 3 +++ .../builtin/packages/butterflypack/qopenmp-for-oneapi.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 var/spack/repos/builtin/packages/butterflypack/qopenmp-for-oneapi.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/butterflypack/package.py b/var/spack/repos/builtin/packages/butterflypack/package.py index 6459f6ed50..624be61b2f 100644 --- a/var/spack/repos/builtin/packages/butterflypack/package.py +++ b/var/spack/repos/builtin/packages/butterflypack/package.py @@ -44,6 +44,9 @@ class Butterflypack(CMakePackage): depends_on("scalapack") depends_on("arpack-ng") + # https://github.com/spack/spack/issues/31818 + patch("qopenmp-for-oneapi.patch", when="@2.1.1 %oneapi") + patch("longline.patch", when="%fj") patch("fjfortran.patch", when="%fj") patch("isnan.patch", when="%fj") diff --git a/var/spack/repos/builtin/packages/butterflypack/qopenmp-for-oneapi.patch b/var/spack/repos/builtin/packages/butterflypack/qopenmp-for-oneapi.patch new file mode 100644 index 0000000000..30272afce3 --- /dev/null +++ b/var/spack/repos/builtin/packages/butterflypack/qopenmp-for-oneapi.patch @@ -0,0 +1,12 @@ +diff -ruN spack-src/CMakeLists.txt spack-src-patched/CMakeLists.txt +--- spack-src/CMakeLists.txt 2022-03-04 09:05:03.000000000 -0800 ++++ spack-src-patched/CMakeLists.txt 2022-08-01 13:04:11.771748644 -0700 +@@ -99,7 +99,7 @@ + set(CMAKE_Fortran_FLAGS "-fno-range-check -fbacktrace -fbounds-check -Wconversion ${CMAKE_Fortran_FLAGS}") + endif() + endif() +-check_fortran_compiler_flag("-no-prec-div" COMPILER_Intel) ++check_fortran_compiler_flag("-qopenmp" COMPILER_Intel) + if (COMPILER_Intel) + set(CMAKE_Fortran_FLAGS "-cpp -DIntel ${CMAKE_Fortran_FLAGS}") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") -- cgit v1.2.3-60-g2f50