The package rpms/mlpack.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/mlpack.git/commit/?id=a631a4e064681b....
Change: +%ifarch i686
Thanks.
Full change: ============
commit a631a4e064681b210ccd9f07ebb88fd48336ae0b Author: Ryan Curtin ryan@ratml.org Date: Thu Sep 10 02:46:59 2020 +0000
Attempt to reduce RAM usage for i686.
diff --git a/mlpack.spec b/mlpack.spec index c6cb9cc..5abe8e9 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -155,6 +155,12 @@ cmake -D CMAKE_C_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param cd ..; %endif
+%ifarch i686 +cd %{_vpath_builddir}; +cmake -D CMAKE_C_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param ggc-min-heapsize=32768 --param ggc-min-expand=1/'`" -D CMAKE_CXX_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param ggc-min-heapsize=32768 --param ggc-min-expand=1/'`" . +cd ..; +%endif + # Don't use %make because it could use too much RAM with multiple cores on Koji... %{cmake_build} # Build documentation ('doc' is not in the list of default targets).
commit 9e8b00c376e0c0a400fcad6bf8ef230814a4c2d6 Author: Ryan Curtin ryan@ratml.org Date: Wed Sep 9 22:56:34 2020 +0000
Enable Python bindings.
diff --git a/mlpack.spec b/mlpack.spec index 4185ec8..c6cb9cc 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -143,9 +143,9 @@ sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/' Doxyfile; # On RHEL6, the Boost CMake scripts fail for some reason. I don't have the # time (or patience) to investigate, but if we force CMake to find Boost "the # hard way" by specifying Boost_NO_BOOST_CMAKE=1, it works. -%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ +%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ %else -%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ +%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ %endif
# Try and reduce RAM usage.
commit 5f8bcf4622b31fbd5f0dc8e6af0063cf54cb2808 Author: Ryan Curtin ryan@ratml.org Date: Wed Sep 9 22:26:26 2020 +0000
Fix typo.
diff --git a/mlpack.spec b/mlpack.spec index a843e2c..4185ec8 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -225,7 +225,7 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{_bindir}/mlpack_preprocess_binarize %{_bindir}/mlpack_preprocess_describe %{_bindir}/mlpack_preprocess_imputer -%{_bindir}/mlpack_preprocess_one_hot_encode +%{_bindir}/mlpack_preprocess_one_hot_encoding %{_bindir}/mlpack_preprocess_scale %{_bindir}/mlpack_preprocess_split %{_bindir}/mlpack_radical @@ -274,7 +274,7 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{_mandir}/mlpack_preprocess_binarize.1* %{_mandir}/mlpack_preprocess_describe.1* %{_mandir}/mlpack_preprocess_imputer.1* -%{_mandir}/mlpack_preprocess_one_hot_encode.1* +%{_mandir}/mlpack_preprocess_one_hot_encoding.1* %{_mandir}/mlpack_preprocess_scale.1* %{_mandir}/mlpack_preprocess_split.1* %{_mandir}/mlpack_radical.1*
commit e14d74c1652e9b1b5e8b91eb7b6ad0c91b90e1e6 Author: Ryan Curtin ryan@ratml.org Date: Wed Sep 9 21:02:37 2020 +0000
Update to latest stable version.
diff --git a/.gitignore b/.gitignore index 969eede..3d2d6c7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /mlpack-3.3.2.tar.gz /no_exclude_build.patch /python_cxxflags.patch +/mlpack-3.4.1.tar.gz diff --git a/mlpack.spec b/mlpack.spec index b427a33..a843e2c 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -1,6 +1,6 @@ Name: mlpack -Version: 3.3.2 -Release: 4%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Scalable, fast C++ machine learning library
License: BSD @@ -30,7 +30,7 @@ BuildRequires: cmake >= 2.8.5
BuildRequires: armadillo-devel >= 8.400.0 BuildRequires: ensmallen-devel >= 2.10.0 -BuildRequires: boost-devel, boost-program-options, boost-math, boost-serialization >= 1.49 +BuildRequires: boost-devel, cli11-devel, boost-math, boost-serialization >= 1.49 BuildRequires: pkg-config
# For generating man pages (CMake configuration takes care of this assuming @@ -180,12 +180,13 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%files %{_libdir}/libmlpack.so.3 -%{_libdir}/libmlpack.so.3.3 +%{_libdir}/libmlpack.so.3.4 %{our_docdir}/LICENSE.txt
%files bin %{_bindir}/mlpack_adaboost %{_bindir}/mlpack_approx_kfn +%{_bindir}/mlpack_bayesian_linear_regression %{_bindir}/mlpack_cf %{_bindir}/mlpack_dbscan %{_bindir}/mlpack_decision_stump @@ -224,6 +225,7 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{_bindir}/mlpack_preprocess_binarize %{_bindir}/mlpack_preprocess_describe %{_bindir}/mlpack_preprocess_imputer +%{_bindir}/mlpack_preprocess_one_hot_encode %{_bindir}/mlpack_preprocess_scale %{_bindir}/mlpack_preprocess_split %{_bindir}/mlpack_radical @@ -233,6 +235,7 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{_bindir}/mlpack_sparse_coding %{_mandir}/mlpack_adaboost.1* %{_mandir}/mlpack_approx_kfn.1* +%{_mandir}/mlpack_bayesian_linear_regression.1* %{_mandir}/mlpack_cf.1* %{_mandir}/mlpack_dbscan.1* %{_mandir}/mlpack_decision_stump.1* @@ -271,6 +274,7 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{_mandir}/mlpack_preprocess_binarize.1* %{_mandir}/mlpack_preprocess_describe.1* %{_mandir}/mlpack_preprocess_imputer.1* +%{_mandir}/mlpack_preprocess_one_hot_encode.1* %{_mandir}/mlpack_preprocess_scale.1* %{_mandir}/mlpack_preprocess_split.1* %{_mandir}/mlpack_radical.1* @@ -298,6 +302,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{python3_sitearch}/mlpack-*.egg-info
%changelog +* Wed Sep 09 2020 Ryan Curtin ryan@ratml.org - 3.4.1-1 +- Update to latest stable version. + * Tue Aug 04 2020 Ryan Curtin ryan@ratml.org - 3.3.2-4 - Update for CMake out-of-source build fixes.
diff --git a/sources b/sources index 1d1b1c8..1b95cc3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (mlpack-3.3.2.tar.gz) = 0da84f01d70b3d29a1d65e35c8ade06f7c90b2d6f507d84be8fb7eb94da244e4b3e1fde26e8abd93b3ebe8a47d06877754d1420865b763e2009566800b59005c +SHA512 (mlpack-3.4.1.tar.gz) = 53de83c2ca36829a0ae952357b25bee44bf85d01c2414848fe2c5f09ebe4732bd0a1d3c72de202646345fa66964fbc3247ddeb6a327e87459c036a215fe55fc2 SHA512 (stb_image.h) = afc420720aa6e210b2434c451e7b09b23655c91a8163a9d09bd8df3cc254b1168a6b0fddf715e0fbc2ce6b40488ceb142338c34d3421f5447c4fb6e39f924272 SHA512 (stb_image_write.h) = 1951c20aa9adafcdeed4eb35b69a1868dcf3cce0652cbc761ff029f11566213002dc391027bed804bb7c6061bb6bdbde3296c1278b2e9e535406a3c983344312 SHA512 (python_cxxflags.patch) = 16d6038c3302909600603fc08fc3fcda31d8dba5627f560ebadb41bc9e8cfbd4badfaa5d6c24ada2a0f53d63c13e3de3a9bbd2e2aa2d8ed284e44cba45824250
commit af836544cf233e2aa5fb54cdf09403e6af0d2db6 Author: Ryan Curtin ryan@ratml.org Date: Thu Aug 6 17:53:40 2020 +0000
Try disabling LTO for builds.
diff --git a/mlpack.spec b/mlpack.spec index 158eeaa..b427a33 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -125,6 +125,9 @@ margins. This package provides the Python bindings for mlpack. # %%{_pkgdocdir} if on F20 and %%{_docdir}/%%{name}-%%{version} otherwise. %global our_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+# Disable LTO: it takes too much memory. +%define _lto_cflags %{nil} + %prep %autosetup -p1
commit fcb650571870704685235c30f969a02ab4765a79 Author: Ryan Curtin ryan@ratml.org Date: Tue Aug 4 18:43:13 2020 +0000
First attempt to fix FTBFS.
diff --git a/mlpack.spec b/mlpack.spec index f0c1d8b..158eeaa 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -1,6 +1,6 @@ Name: mlpack Version: 3.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Scalable, fast C++ machine learning library
License: BSD @@ -140,23 +140,27 @@ sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/' Doxyfile; # On RHEL6, the Boost CMake scripts fail for some reason. I don't have the # time (or patience) to investigate, but if we force CMake to find Boost "the # hard way" by specifying Boost_NO_BOOST_CMAKE=1, it works. -%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ . +%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ %else -%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ . +%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ %endif
# Try and reduce RAM usage. %ifarch armv7hl +cd %{_vpath_builddir}; cmake -D CMAKE_C_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param ggc-min-heapsize=32768 --param ggc-min-expand=1/'`" -D CMAKE_CXX_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param ggc-min-heapsize=32768 --param ggc-min-expand=1/'`" . +cd ..; %endif
# Don't use %make because it could use too much RAM with multiple cores on Koji... -make +%{cmake_build} # Build documentation ('doc' is not in the list of default targets). +cd %{_vpath_builddir}; make doc +cd ..;
%install -make DESTDIR=$RPM_BUILD_ROOT install +%{cmake_install}
cp stb/stb_image.h $RPM_BUILD_ROOT/%{_includedir}/; cp stb/stb_image_write.h $RPM_BUILD_ROOT/%{_includedir}/; @@ -291,6 +295,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{python3_sitearch}/mlpack-*.egg-info
%changelog +* Tue Aug 04 2020 Ryan Curtin ryan@ratml.org - 3.3.2-4 +- Update for CMake out-of-source build fixes. + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 3.3.2-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit ea45982689f118aa2e0ef3da7dcd591c5e21cc5c Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Aug 1 04:31:26 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/mlpack.spec b/mlpack.spec index 119c600..f0c1d8b 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -1,6 +1,6 @@ Name: mlpack Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scalable, fast C++ machine learning library
License: BSD @@ -291,6 +291,10 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{python3_sitearch}/mlpack-*.egg-info
%changelog +* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 3.3.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering releng@fedoraproject.org - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 0ad5355028ca065f811ebc81387ec6d90bdfcda7 Author: Fedora Release Engineering releng@fedoraproject.org Date: Tue Jul 28 08:11:02 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/mlpack.spec b/mlpack.spec index 6107c48..119c600 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -1,6 +1,6 @@ Name: mlpack Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scalable, fast C++ machine learning library
License: BSD @@ -291,6 +291,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{python3_sitearch}/mlpack-*.egg-info
%changelog +* Tue Jul 28 2020 Fedora Release Engineering releng@fedoraproject.org - 3.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 21 2020 Ryan Curtin ryan@ratml.org - 3.3.2-1 - Update to latest stable version.
arch-excludes@lists.fedoraproject.org