The package rpms/arbor.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/arbor.git/commit/?id=77288ee3fbf9....
Change:
+ExcludeArch: mips64r2 mips32r2 s390 s390x
Thanks.
Full change:
============
commit 77288ee3fbf9a1800f6aed8ca1975fbc7bc074a0
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Wed Feb 26 15:08:20 2020 +0000
Update to new commit: fix 32bit builds
diff --git a/.gitignore b/.gitignore
index aa03300..80f2251 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/arbor-0.2.2.tar.gz
/arbor-f12f934.tar.gz
+/arbor-fb5d4ea.tar.gz
diff --git a/0001-Correct-isnan-invocation.patch b/0001-Correct-isnan-invocation.patch
deleted file mode 100644
index 5c44296..0000000
--- a/0001-Correct-isnan-invocation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3207c57635f44f7d38a2e630739d846369779297 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
-Date: Sun, 23 Feb 2020 15:49:21 +0000
-Subject: [PATCH] Correct isnan invocation
-
----
- arbor/include/arbor/simd/neon.hpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arbor/include/arbor/simd/neon.hpp b/arbor/include/arbor/simd/neon.hpp
-index 22ae0e7..3857999 100644
---- a/arbor/include/arbor/simd/neon.hpp
-+++ b/arbor/include/arbor/simd/neon.hpp
-@@ -397,8 +397,8 @@ struct neon_double2 : implbase<neon_double2> {
- auto is_small = cmp_lt(x, broadcast(exp_minarg));
-
- bool a[2];
-- a[0] = isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-- a[1] = isnan(vgetq_lane_f64(x, 1)) == 0 ? 0 : 1;
-+ a[0] = std::isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-+ a[1] = std::isnan(vgetq_lane_f64(x, 1)) == 0 ? 0 : 1;
-
- auto is_nan = mask_copy_from(a);
-
-@@ -445,8 +445,8 @@ struct neon_double2 : implbase<neon_double2> {
- auto is_small = cmp_lt(x, broadcast(expm1_minarg));
-
- bool a[2];
-- a[0] = isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-- a[1] = isnan(vgetq_lane_f64(x, 1)) == 0 ? 0 : 1;
-+ a[0] = std::isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-+ a[1] = std::isnan(vgetq_lane_f64(x, 1)) == 0 ? 0 : 1;
-
- auto is_nan = mask_copy_from(a);
-
-@@ -515,8 +515,8 @@ struct neon_double2 : implbase<neon_double2> {
- auto is_domainerr = cmp_lt(x, broadcast(0));
-
- bool a[2];
-- a[0] = isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-- a[1] = isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-+ a[0] = std::isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-+ a[1] = std::isnan(vgetq_lane_f64(x, 0)) == 0 ? 0 : 1;
-
- auto is_nan = mask_copy_from(a);
- is_domainerr = logical_or(is_nan, is_domainerr);
---
-2.24.1
-
diff --git a/arbor.spec b/arbor.spec
index 5231c99..3b3dae4 100644
--- a/arbor.spec
+++ b/arbor.spec
@@ -19,14 +19,14 @@ Documentation is available at
https://arbor.readthedocs.io/en/latest/
%bcond_without tests
-%global commit f12f934f365d9e68f01bfd857982be80da2ddd10
-%global checkoutdate 20200223
+%global commit fb5d4ea736282dce14c3284bc5db748b082db957
+%global checkoutdate 20200225
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: arbor
Version: 0.2.2
-Release: 5.%{checkoutdate}git%{commit}%{?dist}
+Release: 6.%{checkoutdate}git%{commit}%{?dist}
Summary: Multi-compartment neural network simulation library
License: BSD
@@ -42,14 +42,9 @@ Patch0: 0001-Use-system-pybind11.patch
# Include missing header
#
https://github.com/arbor-sim/arbor/pull/963
Patch1: 0001-Include-required-header.patch
-# Correct isnan invocation
-#
https://github.com/arbor-sim/arbor/pull/964
-Patch2: 0001-Correct-isnan-invocation.patch
# Random123 does not support these
-# arbor fails to build on i686: error: static assertion failed: size_t is not the same as
unsigned long or unsigned long long
-#
https://github.com/arbor-sim/arbor/issues/920
-ExcludeArch: mips64r2 mips32r2 s390 s390x i686 armv7hl
+ExcludeArch: mips64r2 mips32r2 s390 s390x
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -144,7 +139,7 @@ find . -type f -name "CMakeLists.txt" -exec sed -i -e
's/ext-tclap//' -e 's/ext-
# Correct Python shebangs in all files
find . -type f -name "*" -exec sed -i 's|^#![
]*/usr/bin/env.*python.*$|#!/usr/bin/python3|' {} 2>/dev/null ';'
# We set it, remove the hard coded bits from CMakeLists.txt
-sed -i '/set(ARB_PYEXECDIR/ d' python/CMakeLists.txt
+sed -i '/set(arb_pyexecdir/ d' python/CMakeLists.txt
# builddir for serial
mkdir build-serial
@@ -188,7 +183,7 @@ pushd build$MPI_COMPILE_TYPE &&
-DARB_ARCH:STRING="native" \\\
-DCMAKE_INSTALL_LIBDIR=%{_lib} \\\
-DARB_WITH_PYTHON:BOOL=ON \\\
- -DARB_PYEXECDIR:STRING=$MPI_PYTHON3_SITEARCH \\\
+ -Darb_pyexecdir:STRING=$MPI_PYTHON3_SITEARCH \\\
%if "%{_lib}" == "lib64"
-DLIB_SUFFIX=64 .. &&
%else
@@ -324,7 +319,7 @@ popd
%license LICENSE
%doc README.md
%{_bindir}/modcc
-%{python3_sitearch}/%{name}.cpython-%{python3_version_nodots}*.so
+%{python3_sitearch}/%{name}
%files devel
@@ -344,7 +339,7 @@ popd
%doc README.md
%license LICENSE
%{_libdir}/mpich/bin/modcc_mpich
-%{python3_sitearch}/mpich/%{name}.cpython-%{python3_version_nodots}*.so
+%{python3_sitearch}/mpich/%{name}
%files mpich-devel
%{_libdir}/mpich/include/%{name}
@@ -359,7 +354,7 @@ popd
%doc README.md
%license LICENSE
%{_libdir}/openmpi/bin/modcc_openmpi
-%{python3_sitearch}/openmpi/%{name}.cpython-%{python3_version_nodots}*.so
+%{python3_sitearch}/openmpi/%{name}
%files openmpi-devel
%{_libdir}/openmpi/include/%{name}
@@ -370,6 +365,11 @@ popd
%endif
%changelog
+* Wed Feb 26 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> -
0.2.2-5.20200226gitfb5d4ea736282dce14c3284bc5db748b082db957
+- Use new snapshot that fixes errors on 32 bit systems
+- No longer excludes i686 and armv7hl
+- Drop unneeded patch.
+
* Sun Feb 23 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> -
0.2.2-5.20200223gitf12f934f365d9e68f01bfd857982be80da2ddd10
- Build from latest upstream snapshot
- Freshen patch
diff --git a/sources b/sources
index 8aa8f1f..1d28e53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (arbor-f12f934.tar.gz) =
a08e192ab627939159862c597dd00267f7cfad9bf27e7eca674e9598ac758e9eda2a573bbb47ece839f5d8f9604551bf274f9ced873d98e9b93ffa3bc2efdaae
+SHA512 (arbor-fb5d4ea.tar.gz) =
d514ad36a63820cab543b19adf1f63218decfa7d6e9f8726178d90668c59952bde4daba91699c93b9678da4f42313050a8799ec58a5e78ef7d7f86a681ffc8b0