summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Junghans <junghans@votca.org>2017-03-19 17:24:00 -0600
committerChristoph Junghans <junghans@votca.org>2017-03-19 17:24:00 -0600
commit73c363b51120fc5ab565abbb9b04a60e9952bef5 (patch)
tree3d5943ecd7e41d40af6338ee60d8efc02284edc8
parent064fca69a2007734278b9d149a3a0f06bb707d24 (diff)
downloadfedora-review-73c363b51120fc5ab565abbb9b04a60e9952bef5.zip
fedora-review-73c363b51120fc5ab565abbb9b04a60e9952bef5.tar.gz
fedora-review-73c363b51120fc5ab565abbb9b04a60e9952bef5.tar.xz
legion: fixed tests
-rw-r--r--legion/232.patch22
-rw-r--r--legion/legion.spec25
2 files changed, 42 insertions, 5 deletions
diff --git a/legion/232.patch b/legion/232.patch
new file mode 100644
index 0000000..c7bf2a2
--- /dev/null
+++ b/legion/232.patch
@@ -0,0 +1,22 @@
+From f53cbeec3d0d7dc370d83ca4450663f3e4b64e59 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@lanl.gov>
+Date: Sun, 19 Mar 2017 08:24:37 -0600
+Subject: [PATCH] Realm::get_bd_sibling_id: fix return for single thread
+
+Fixes #230
+---
+ runtime/realm/threads.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/runtime/realm/threads.cc b/runtime/realm/threads.cc
+index 2e56039..73d90c3 100644
+--- a/runtime/realm/threads.cc
++++ b/runtime/realm/threads.cc
+@@ -1343,6 +1343,7 @@ namespace Realm {
+ f = fopen(str, "r");
+ if(!f) {
+ std::cout << "can't read '" << str << "' - skipping";
++ return -1;
+ }
+ int sib_core_id;
+ int count = fscanf(f, "%d", &sib_core_id);
diff --git a/legion/legion.spec b/legion/legion.spec
index 5a76ec3..0608b7f 100644
--- a/legion/legion.spec
+++ b/legion/legion.spec
@@ -1,12 +1,14 @@
Name: legion
Version: 17.02.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A data-centric parallel programming system
License: ASL 2.0
Url: http://legion.stanford.edu/
Source0: https://github.com/StanfordLegion/legion/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM - 229.patch - add make test to cmake build system
Patch0: https://patch-diff.githubusercontent.com/raw/StanfordLegion/legion/pull/229.patch
+# PATCH-FIX-UPSTREAM - 232.patch - fix segfault on single thread systems
+Patch1: https://patch-diff.githubusercontent.com/raw/StanfordLegion/legion/pull/232.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -93,6 +95,7 @@ This package contains development headers and libraries for the legion library
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
mkdir serial openmpi mpich
@@ -134,12 +137,20 @@ popd
%{_mpich_unload}
%check
-make -C serial test
+#some tests are broken on ppc64
+#https://github.com/StanfordLegion/legion/issues/233
+%ifarch ppc64
+%define testargs ARGS='-V -E \\(ghost\\|ghost_pull\\|custom_mapper\\)'
+%else
+%define testargs ARGS='-V'
+%endif
+
+make -C serial test %{testargs}
%{_openmpi_load}
-make -C openmpi test
+make -C openmpi test %{testargs}
%{_openmpi_unload}
%{_mpich_load}
-make -C mpich test
+make -C mpich test %{testargs}
%{_mpich_unload}
#move cmake files in a place where cmake can find them
@@ -176,8 +187,12 @@ mv %{buildroot}{%{_datadir}/Legion,%{_libdir}/cmake/%{name}}
%{_libdir}/mpich*/lib/lib*.so.1
%changelog
+* Mon Mar 13 2017 Christoph Junghans <junghans@votca.org> - 17.02.0-3
+- Added 232.patch to fix segfault for test on 1 thread systems
+- Disable some broken tests on ppc64
+
* Mon Mar 13 2017 Christoph Junghans <junghans@votca.org> - 17.02.0-2
-- Added 229.patch to support "make check" in cmake
+- Added 229.patch to support "make check" in cmake
- Minor changes from review (bug #1382755)
* Fri Feb 24 2017 Christoph Junghans <junghans@votca.org> - 17.02.0-1