The package rpms/legion.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/legion.git/commit/?id=fd5a2a2c1fc....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit fd5a2a2c1fc3d997e5f892bce910c0bd2c62677c
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Sat May 27 08:05:06 2017 -0600
Version bump to 17.05.0 (bug #1456066)
diff --git a/.gitignore b/.gitignore
index 6cf1ecd..8f335e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/legion-17.02.0.tar.gz
/legion*.src.rpm
+/legion-17.05.0.tar.gz
diff --git a/229.patch b/229.patch
deleted file mode 100644
index 00f9c94..0000000
--- a/229.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From ac1a14f39dd424da3a5a9d62f02c0a581a460c3f Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans(a)lanl.gov>
-Date: Mon, 13 Mar 2017 11:57:33 -0600
-Subject: [PATCH] cmake: enable testing
-
----
- CMakeLists.txt | 4 ++++
- examples/attach_file/CMakeLists.txt | 3 +++
- examples/circuit/CMakeLists.txt | 3 +++
- examples/dynamic_registration/CMakeLists.txt | 3 +++
- examples/ghost/CMakeLists.txt | 3 +++
- examples/ghost_pull/CMakeLists.txt | 3 +++
- examples/realm_saxpy/CMakeLists.txt | 3 +++
- examples/spmd_cgsolver/CMakeLists.txt | 3 +++
- test/attach_file_mini/CMakeLists.txt | 3 +++
- tutorial/00_hello_world/CMakeLists.txt | 3 +++
- tutorial/01_tasks_and_futures/CMakeLists.txt | 3 +++
- tutorial/02_index_tasks/CMakeLists.txt | 3 +++
- tutorial/03_global_vars/CMakeLists.txt | 3 +++
- tutorial/04_logical_regions/CMakeLists.txt | 3 +++
- tutorial/05_physical_regions/CMakeLists.txt | 3 +++
- tutorial/06_privileges/CMakeLists.txt | 3 +++
- tutorial/07_partitioning/CMakeLists.txt | 3 +++
- tutorial/08_multiple_partitions/CMakeLists.txt | 3 +++
- tutorial/09_custom_mapper/CMakeLists.txt | 3 +++
- 19 files changed, 58 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index afd0b97..51e18c9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,6 +213,10 @@ option(Legion_BUILD_APPS "Build Legion sample
applications" OFF)
- option(Legion_BUILD_EXAMPLES "Build Legion examples" OFF)
- option(Legion_BUILD_TUTORIAL "Build Legion tutorial" OFF)
- option(Legion_BUILD_TESTS "Build Legion tests" OFF)
-+option(Legion_ENABLE_TESTING "Build and copy testing stuff" OFF)
-+if(Legion_ENABLE_TESTING)
-+ enable_testing()
-+endif()
- if(Legion_BUILD_APPS OR Legion_BUILD_EXAMPLES OR Legion_BUILD_TUTORIAL OR
Legion_BUILD_TESTS)
- # Make a namespaced alias so in-build examples can use it the same way as if
- # it were imported
-diff --git a/examples/attach_file/CMakeLists.txt b/examples/attach_file/CMakeLists.txt
-index 6cef9f7..0beb900 100644
---- a/examples/attach_file/CMakeLists.txt
-+++ b/examples/attach_file/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(attach_file attach_file.cc)
- target_link_libraries(attach_file Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME attach_file COMMAND $<TARGET_FILE:attach_file>)
-+endif()
-diff --git a/examples/circuit/CMakeLists.txt b/examples/circuit/CMakeLists.txt
-index 0dbac5a..eaf97ae 100644
---- a/examples/circuit/CMakeLists.txt
-+++ b/examples/circuit/CMakeLists.txt
-@@ -34,3 +34,6 @@ else()
- add_executable(circuit ${CPU_SOURCES})
- endif()
- target_link_libraries(circuit Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME circuit COMMAND $<TARGET_FILE:circuit>)
-+endif()
-diff --git a/examples/dynamic_registration/CMakeLists.txt
b/examples/dynamic_registration/CMakeLists.txt
-index d91d76c..2695ce5 100644
---- a/examples/dynamic_registration/CMakeLists.txt
-+++ b/examples/dynamic_registration/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(dynamic_registration dynamic_registration.cc)
- target_link_libraries(dynamic_registration Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME dynamic_registration COMMAND $<TARGET_FILE:dynamic_registration>)
-+endif()
-diff --git a/examples/ghost/CMakeLists.txt b/examples/ghost/CMakeLists.txt
-index afb110a..ccd1fe6 100644
---- a/examples/ghost/CMakeLists.txt
-+++ b/examples/ghost/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(ghost ghost.cc)
- target_link_libraries(ghost Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME ghost COMMAND $<TARGET_FILE:ghost> -ll:cpu 4)
-+endif()
-diff --git a/examples/ghost_pull/CMakeLists.txt b/examples/ghost_pull/CMakeLists.txt
-index 21dd283..7bfd3f9 100644
---- a/examples/ghost_pull/CMakeLists.txt
-+++ b/examples/ghost_pull/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(ghost_pull ghost.cc)
- target_link_libraries(ghost_pull Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME ghost_pull COMMAND $<TARGET_FILE:ghost_pull> -ll:cpu 4)
-+endif()
-diff --git a/examples/realm_saxpy/CMakeLists.txt b/examples/realm_saxpy/CMakeLists.txt
-index 5986e9b..c02837b 100644
---- a/examples/realm_saxpy/CMakeLists.txt
-+++ b/examples/realm_saxpy/CMakeLists.txt
-@@ -30,3 +30,6 @@ else()
- add_executable(realm_saxpy ${CPU_SOURCES})
- endif()
- target_link_libraries(realm_saxpy Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME realm_saxpy COMMAND $<TARGET_FILE:realm_saxpy>)
-+endif()
-diff --git a/examples/spmd_cgsolver/CMakeLists.txt
b/examples/spmd_cgsolver/CMakeLists.txt
-index 9f8a671..3373cf5 100644
---- a/examples/spmd_cgsolver/CMakeLists.txt
-+++ b/examples/spmd_cgsolver/CMakeLists.txt
-@@ -28,3 +28,6 @@ add_executable(spmd_cgsolver
- cgtasks.h cgtasks.cc
- )
- target_link_libraries(spmd_cgsolver Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME spmd_cgsolver COMMAND $<TARGET_FILE:spmd_cgsolver>)
-+endif()
-diff --git a/test/attach_file_mini/CMakeLists.txt b/test/attach_file_mini/CMakeLists.txt
-index 9183a68..1f49ee1 100644
---- a/test/attach_file_mini/CMakeLists.txt
-+++ b/test/attach_file_mini/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(attach_file_mini attach_file_mini.cc)
- target_link_libraries(attach_file_mini Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME attach_file_mini COMMAND $<TARGET_FILE:attach_file_mini>)
-+endif()
-diff --git a/tutorial/00_hello_world/CMakeLists.txt
b/tutorial/00_hello_world/CMakeLists.txt
-index e003957..027bacd 100644
---- a/tutorial/00_hello_world/CMakeLists.txt
-+++ b/tutorial/00_hello_world/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(hello_world hello_world.cc)
- target_link_libraries(hello_world Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME hello_world COMMAND $<TARGET_FILE:hello_world>)
-+endif()
-diff --git a/tutorial/01_tasks_and_futures/CMakeLists.txt
b/tutorial/01_tasks_and_futures/CMakeLists.txt
-index 5c9c580..68e9dfc 100644
---- a/tutorial/01_tasks_and_futures/CMakeLists.txt
-+++ b/tutorial/01_tasks_and_futures/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(tasks_and_futures tasks_and_futures.cc)
- target_link_libraries(tasks_and_futures Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME tasks_and_futures COMMAND $<TARGET_FILE:tasks_and_futures>)
-+endif()
-diff --git a/tutorial/02_index_tasks/CMakeLists.txt
b/tutorial/02_index_tasks/CMakeLists.txt
-index ad7caf9..e44f6c1 100644
---- a/tutorial/02_index_tasks/CMakeLists.txt
-+++ b/tutorial/02_index_tasks/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(index_tasks index_tasks.cc)
- target_link_libraries(index_tasks Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME index_tasks COMMAND $<TARGET_FILE:index_tasks>)
-+endif()
-diff --git a/tutorial/03_global_vars/CMakeLists.txt
b/tutorial/03_global_vars/CMakeLists.txt
-index 79cb7fa..2d0f5e3 100644
---- a/tutorial/03_global_vars/CMakeLists.txt
-+++ b/tutorial/03_global_vars/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(global_vars global_vars.cc)
- target_link_libraries(global_vars Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME global_vars COMMAND $<TARGET_FILE:global_vars>)
-+endif()
-diff --git a/tutorial/04_logical_regions/CMakeLists.txt
b/tutorial/04_logical_regions/CMakeLists.txt
-index 5ed6877..5ef3bde 100644
---- a/tutorial/04_logical_regions/CMakeLists.txt
-+++ b/tutorial/04_logical_regions/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(logical_regions logical_regions.cc)
- target_link_libraries(logical_regions Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME logical_regions COMMAND $<TARGET_FILE:logical_regions>)
-+endif()
-diff --git a/tutorial/05_physical_regions/CMakeLists.txt
b/tutorial/05_physical_regions/CMakeLists.txt
-index 73b5a94..06ee29e 100644
---- a/tutorial/05_physical_regions/CMakeLists.txt
-+++ b/tutorial/05_physical_regions/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(physical_regions physical_regions.cc)
- target_link_libraries(physical_regions Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME physical_regions COMMAND $<TARGET_FILE:physical_regions>)
-+endif()
-diff --git a/tutorial/06_privileges/CMakeLists.txt
b/tutorial/06_privileges/CMakeLists.txt
-index 2b3bcc7..f6f8927 100644
---- a/tutorial/06_privileges/CMakeLists.txt
-+++ b/tutorial/06_privileges/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(privileges privileges.cc)
- target_link_libraries(privileges Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME privileges COMMAND $<TARGET_FILE:privileges>)
-+endif()
-diff --git a/tutorial/07_partitioning/CMakeLists.txt
b/tutorial/07_partitioning/CMakeLists.txt
-index 0decf16..7ac8d0d 100644
---- a/tutorial/07_partitioning/CMakeLists.txt
-+++ b/tutorial/07_partitioning/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(partitioning partitioning.cc)
- target_link_libraries(partitioning Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME partitioning COMMAND $<TARGET_FILE:partitioning>)
-+endif()
-diff --git a/tutorial/08_multiple_partitions/CMakeLists.txt
b/tutorial/08_multiple_partitions/CMakeLists.txt
-index 730b5df..7decbcc 100644
---- a/tutorial/08_multiple_partitions/CMakeLists.txt
-+++ b/tutorial/08_multiple_partitions/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(multiple_partitions multiple_partitions.cc)
- target_link_libraries(multiple_partitions Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME multiple_partitions COMMAND $<TARGET_FILE:multiple_partitions>)
-+endif()
-diff --git a/tutorial/09_custom_mapper/CMakeLists.txt
b/tutorial/09_custom_mapper/CMakeLists.txt
-index a555b2f..d46a5d2 100644
---- a/tutorial/09_custom_mapper/CMakeLists.txt
-+++ b/tutorial/09_custom_mapper/CMakeLists.txt
-@@ -24,3 +24,6 @@ endif()
-
- add_executable(custom_mapper custom_mapper.cc)
- target_link_libraries(custom_mapper Legion::Legion)
-+if(Legion_ENABLE_TESTING)
-+ add_test(NAME custom_mapper COMMAND $<TARGET_FILE:custom_mapper>)
-+endif()
diff --git a/232.patch b/232.patch
deleted file mode 100644
index c7bf2a2..0000000
--- a/232.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f53cbeec3d0d7dc370d83ca4450663f3e4b64e59 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans(a)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.spec b/legion.spec
index 5f1287c..83777d7 100644
--- a/legion.spec
+++ b/legion.spec
@@ -1,19 +1,18 @@
Name: legion
-Version: 17.02.0
-Release: 5%{?dist}
+Version: 17.05.0
+Release: 1%{?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.g...
-# PATCH-FIX-UPSTREAM - 229.patch - add make test to cmake build system
-Patch0:
https://patch-diff.githubusercontent.com/raw/StanfordLegion/legion/pull/2...
-# PATCH-FIX-UPSTREAM - 232.patch - fix segfault on single thread systems
-Patch1:
https://patch-diff.githubusercontent.com/raw/StanfordLegion/legion/pull/2...
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: hwloc-devel
+#no gasnet on s390x (bug #1453092)
+%ifnarch s390x
BuildRequires: gasnet-devel
+%endif
BuildRequires: %{?fedora:cmake >= 3.1}%{?rhel:cmake3 >= 3.1}
%description
@@ -29,6 +28,7 @@ data in the memory hierarchy and assignment of tasks to processors in a
way that
is orthogonal to correctness, thereby enabling easy porting and tuning of Legion
applications to new architectures.
+%ifnarch s390x
%package openmpi
Summary: Legion Open MPI binaries and libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -70,14 +70,17 @@ is orthogonal to correctness, thereby enabling easy porting and tuning
of Legion
applications to new architectures.
Legion compiled with MPICH, package incl. binaries and libraries
+%endif
%package devel
Summary: Development headers and libraries for %{name} library
Requires: %{name}%{?_isa} = %{version}-%{release}
+%ifnarch s390x
Requires: %{name}-openmpi%{?_isa} = %{version}
Requires: %{name}-mpich%{?_isa} = %{version}
Requires: mpich-devel
Requires: openmpi-devel
+%endif
%description devel
Legion is a data-centric parallel programming system for writing portable
@@ -96,8 +99,6 @@ 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
@@ -109,6 +110,7 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
%make_build
popd
+%ifnarch s390x
pushd openmpi
%{_openmpi_load}
export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
@@ -128,32 +130,37 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
%make_build
%{_mpich_unload}
popd
+%endif
%install
%make_install -C serial
+%ifnarch s390x
%{_openmpi_load}
%make_install -C openmpi
%{_openmpi_unload}
%{_mpich_load}
%make_install -C mpich
%{_mpich_unload}
+%endif
%check
#some tests are broken on ppc64
#https://github.com/StanfordLegion/legion/issues/233
-%ifarch ppc64
-%global testargs ARGS='-V -E \\(ghost\\|ghost_pull\\|custom_mapper\\)'
+%ifarch ppc64 s390x
+%global testargs ARGS='-V -E
\\(ghost\\|ghost_pull\\|custom_mapper\\|spmd_cgsolver\\|mpi_interop\\)'
%else
%global testargs ARGS='-V'
%endif
make -C serial test %{testargs}
+%ifnarch s390x
%{_openmpi_load}
make -C openmpi test %{testargs}
%{_openmpi_unload}
%{_mpich_load}
make -C mpich test %{testargs}
%{_mpich_unload}
+%endif
#move cmake files in a place where cmake can find them
mkdir -p %{buildroot}%{_libdir}/cmake
@@ -178,17 +185,23 @@ mv %{buildroot}{%{_datadir}/Legion,%{_libdir}/cmake/%{name}}
%{_includedir}/mappers
%{_includedir}/realm
%{_libdir}/lib*.so
+%{_libdir}/cmake/%{name}
+%ifnarch s390x
%{_libdir}/openmpi*/lib/lib*.so
%{_libdir}/mpich*/lib/lib*.so
-%{_libdir}/cmake/%{name}
%files openmpi
%{_libdir}/openmpi*/lib/lib*.so.1
%files mpich
%{_libdir}/mpich*/lib/lib*.so.1
+%endif
%changelog
+* Fri May 26 2017 Christoph Junghans <junghans(a)votca.org> - 17.05.0-1
+- Version bump to 17.05.0 (bug #1456066)
+- Drop 229.patch and 232.patch - merged upstream
+
* Tue Mar 28 2017 Christoph Junghans <junghans(a)votca.org> - 17.02.0-5
- Rebuilt for gasnet-1.28.2
diff --git a/sources b/sources
index 48c4636..6238944 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (legion-17.02.0.tar.gz) =
0c6ee53953ec2e5072d39b1c1260a1783393feaf7064f381bb1733cf9cdb1be8fd521a35e0a452ebc9e9509d117fdc6f3e472cdb6c633ba00c987c880a33bc2d
+SHA512 (legion-17.05.0.tar.gz) =
51532f043eea1467a2b8ff17004f224c763f411eb5940d0a4dc5d8eb6503d758964aba26eb4977c68264c7344fcf269682a428e86a2c1a756f91cc9c50d04677