The package rpms/ensmallen.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/ensmallen.git/commit/?id=56cf82e758b... https://src.fedoraproject.org/cgit/rpms/ensmallen.git/commit/?id=5674e2580da....
Change: +%ifarch arm7hl +%ifarch armv7hl
Thanks.
Full change: ============
commit 5674e2580da4cda978f64537ac7000deac3003ca Author: Ryan Curtin ryan@ratml.org Date: Thu Sep 12 18:00:22 2019 +0000
Fix arch typo.
diff --git a/ensmallen.spec b/ensmallen.spec index e811be9..0d4124f 100644 --- a/ensmallen.spec +++ b/ensmallen.spec @@ -44,8 +44,8 @@ gradient-free optimizers, and constrained optimization. # dependencies. In addition, sometimes the tests may fail, as they are # probabilistic---so just make sure the test suite passes at least once out of # five runs. -%ifarch arm7hl -# There's an issue with the tests on arm7hl. +%ifarch armv7hl +# There's an issue with the tests on armv7hl. %else success=0; for i in `seq 1 5`; do
commit 56cf82e758bb198ef5ce59a7aca89d351e02df01 Author: Ryan Curtin ryan@ratml.org Date: Thu Sep 12 15:05:06 2019 +0000
Handle arm7hl issue.
diff --git a/ensmallen.spec b/ensmallen.spec index 9d55960..e811be9 100644 --- a/ensmallen.spec +++ b/ensmallen.spec @@ -44,6 +44,9 @@ gradient-free optimizers, and constrained optimization. # dependencies. In addition, sometimes the tests may fail, as they are # probabilistic---so just make sure the test suite passes at least once out of # five runs. +%ifarch arm7hl +# There's an issue with the tests on arm7hl. +%else success=0; for i in `seq 1 5`; do ./ensmallen_tests ~SmallLovaszThetaSdp @@ -55,6 +58,7 @@ done if [ $success -eq 0 ]; then perl -e "die()" # Force a build error. fi +%endif
%package devel Summary: Header-only C++ library for efficient mathematical optimization
commit 7c29f56729eb92e16691e0c552c6f88b50673eac Author: Ryan Curtin ryan@ratml.org Date: Thu Sep 12 02:58:48 2019 +0000
Update test strategy.
diff --git a/ensmallen.spec b/ensmallen.spec index d1b8f1a..9d55960 100644 --- a/ensmallen.spec +++ b/ensmallen.spec @@ -27,8 +27,7 @@ include full-batch gradient descent techniques, small-batch techniques, gradient-free optimizers, and constrained optimization.
%prep -%autosetup -%patch0 -p1 +%autosetup -p1
%build %cmake @@ -45,14 +44,14 @@ gradient-free optimizers, and constrained optimization. # dependencies. In addition, sometimes the tests may fail, as they are # probabilistic---so just make sure the test suite passes at least once out of # five runs. -success=0 +success=0; for i in `seq 1 5`; do ./ensmallen_tests ~SmallLovaszThetaSdp if [ $? -eq 0 ]; then - success=1 - break + success=1; + break; fi -end +done if [ $success -eq 0 ]; then perl -e "die()" # Force a build error. fi diff --git a/random_tests.patch b/random_tests.patch index 017a500..ef5de1c 100644 --- a/random_tests.patch +++ b/random_tests.patch @@ -1,5 +1,5 @@ ---- ensmallen-2.10.2/tests/main.cpp 2019-09-11 22:01:13.000000000 +0000 -+++ ensmallen-2.10.2/tests/main.cpp.2 2019-09-12 02:34:16.138912193 +0000 +--- a/tests/main.cpp 2019-09-11 22:01:13.000000000 +0000 ++++ b/tests/main.cpp 2019-09-12 02:34:16.138912193 +0000 @@ -22,9 +22,9 @@ * each run. This is good for ensuring that a test's tolerance is sufficient * across many different runs.
commit a4e83c0b4f89ce903311a9a7bb2d87dc753ad18b Author: Ryan Curtin ryan@ratml.org Date: Thu Sep 12 02:35:39 2019 +0000
Add handling for random tests.
diff --git a/ensmallen.spec b/ensmallen.spec index 0dd0fe5..d1b8f1a 100644 --- a/ensmallen.spec +++ b/ensmallen.spec @@ -12,6 +12,8 @@ BuildRequires: gcc-c++ BuildRequires: armadillo-devel >= 6.500.0 Requires: armadillo-devel >= 6.500.0
+Patch0: random_tests.patch + # ensmallen is header-only, and the build just builds the tests, so there's no # use for a debuginfo package. %global debug_package %{nil} @@ -26,6 +28,7 @@ gradient-free optimizers, and constrained optimization.
%prep %autosetup +%patch0 -p1
%build %cmake @@ -39,8 +42,20 @@ gradient-free optimizers, and constrained optimization.
%check # Disable the SmallLovaszThetaSdp test---it exposes a bug in one of ensmallen's -# dependencies. -./ensmallen_tests ~SmallLovaszThetaSdp +# dependencies. In addition, sometimes the tests may fail, as they are +# probabilistic---so just make sure the test suite passes at least once out of +# five runs. +success=0 +for i in `seq 1 5`; do + ./ensmallen_tests ~SmallLovaszThetaSdp + if [ $? -eq 0 ]; then + success=1 + break + fi +end +if [ $success -eq 0 ]; then + perl -e "die()" # Force a build error. +fi
%package devel Summary: Header-only C++ library for efficient mathematical optimization diff --git a/random_tests.patch b/random_tests.patch new file mode 100644 index 0000000..017a500 --- /dev/null +++ b/random_tests.patch @@ -0,0 +1,15 @@ +--- ensmallen-2.10.2/tests/main.cpp 2019-09-11 22:01:13.000000000 +0000 ++++ ensmallen-2.10.2/tests/main.cpp.2 2019-09-12 02:34:16.138912193 +0000 +@@ -22,9 +22,9 @@ + * each run. This is good for ensuring that a test's tolerance is sufficient + * across many different runs. + */ +- //size_t seed = std::time(NULL); +- //srand((unsigned int) seed); +- //arma::arma_rng::set_seed(seed); ++ size_t seed = std::time(NULL); ++ srand((unsigned int) seed); ++ arma::arma_rng::set_seed(seed); + + std::cout << "ensmallen version: " << ens::version::as_string() << std::endl; +
commit e38cce6fb50eb847c78ae4b8522022f082acb557 Author: Ryan Curtin ryan@ratml.org Date: Thu Sep 12 02:20:19 2019 +0000
Update to latest stable version.
diff --git a/.gitignore b/.gitignore index 819adad..bf6159b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ensmallen-1.15.1.tar.gz /ensmallen-1.16.2.tar.gz +/ensmallen-2.10.2.tar.gz diff --git a/ensmallen.spec b/ensmallen.spec index dcc4f79..0dd0fe5 100644 --- a/ensmallen.spec +++ b/ensmallen.spec @@ -1,5 +1,5 @@ Name: ensmallen -Version: 1.16.2 +Version: 2.10.2 Release: 1%{?dist} Summary: Header-only C++ library for efficient mathematical optimization
@@ -60,6 +60,9 @@ gradient-free optimizers, and constrained optimization. %{_includedir}/ensmallen_bits/
%changelog +* Wed Sep 11 2019 Ryan Curtin ryan@ratml.org - 2.10.2-1 +- Update to latest stable version. + * Fri Aug 16 2019 Ryan Curtin ryan@ratml.org - 1.16.2-1 - Update to latest stable version.
diff --git a/sources b/sources index 2b27c8a..05919b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ensmallen-1.16.2.tar.gz) = a02c2a0add82e09312937a98ed4cad7bc8a5bf3a8b492cdae4a449c19f65fccdeae70a96ec923137fa3768974aeb1114694bca210b9e156ee5731d6f4e40000e +SHA512 (ensmallen-2.10.2.tar.gz) = ef5e958d0c65e8f2d68f7f79bcfd9fd6207e660a081444f2bfda7df5811b22e27c321a68d40764cfd1e0bf6d46718b4435c8c10e9e1297f3bc97a91a6068ee1a
commit a31d337ac22e87f191ebb24066625173f7067f51 Author: Ryan Curtin ryan@ratml.org Date: Fri Aug 16 18:05:32 2019 +0000
Update to latest stable version.
diff --git a/.gitignore b/.gitignore index ac8d712..819adad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ensmallen-1.15.1.tar.gz +/ensmallen-1.16.2.tar.gz diff --git a/ensmallen.spec b/ensmallen.spec index ef40cc0..dcc4f79 100644 --- a/ensmallen.spec +++ b/ensmallen.spec @@ -1,6 +1,6 @@ Name: ensmallen -Version: 1.15.1 -Release: 2%{?dist} +Version: 1.16.2 +Release: 1%{?dist} Summary: Header-only C++ library for efficient mathematical optimization
License: BSD @@ -60,6 +60,9 @@ gradient-free optimizers, and constrained optimization. %{_includedir}/ensmallen_bits/
%changelog +* Fri Aug 16 2019 Ryan Curtin ryan@ratml.org - 1.16.2-1 +- Update to latest stable version. + * Wed Jul 24 2019 Fedora Release Engineering releng@fedoraproject.org - 1.15.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources index b77c31b..2b27c8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ensmallen-1.15.1.tar.gz) = bb43817e1dde86ac05798cacec99552d495410c7c5b5d5c9cbc7990311bac94ea618729d054929c88aef9c3f247a8751ecea5a34d5040d0019d024e371738b8a +SHA512 (ensmallen-1.16.2.tar.gz) = a02c2a0add82e09312937a98ed4cad7bc8a5bf3a8b492cdae4a449c19f65fccdeae70a96ec923137fa3768974aeb1114694bca210b9e156ee5731d6f4e40000e
arch-excludes@lists.fedoraproject.org