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=11034a1a063....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 11034a1a0632c327674d208bc9cb25a185c88236
Author: Ryan Curtin <ryan(a)ratml.org>
Date: Wed Oct 26 14:15:44 2022 +0000
Update to mlpack 4.0.0.
diff --git a/.gitignore b/.gitignore
index 069d1ca..289bfb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/python_cxxflags.patch
/mlpack-3.4.1.tar.gz
/mlpack-3.4.2.tar.gz
+/mlpack-4.0.0.tar.gz
diff --git a/mlpack.spec b/mlpack.spec
index 1c51b5c..e864334 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,27 +1,13 @@
Name: mlpack
-Version: 3.4.2
-Release: 18%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
URL:
http://www.mlpack.org
Source0:
http://www.mlpack.org/files/%{name}-%{version}.tar.gz
-# By default the mlpack Doxyfile excludes all files in the directory pattern
-# */build/*. Well, on Koji, that's everything. So we need to not exclude
-# that.
-Patch0: no_exclude_build.patch
-# Backported from:
-#
https://github.com/mlpack/mlpack/commit/775a3b55f73eb595c03baf78e6901c9e2...
-Patch1: setuptools_compatibility.patch
-
-# Fix OpenMP build.
-#Patch1: omp.patch
-
-# Make sure CXXFLAGS get set for Python binding builds.
-#Patch1: python_cxxflags.patch
-
-BuildRequires: make
+BuildRequires: make
BuildRequires: gcc-c++
# Use cmake28 package on RHEL.
%if 0%{?rhel} && 0%{?rhel} <= 7
@@ -30,9 +16,10 @@ BuildRequires: cmake28 >= 2.8.5
BuildRequires: cmake >= 2.8.5
%endif
-BuildRequires: armadillo-devel >= 8.400.0
+BuildRequires: armadillo-devel >= 9.800.0
BuildRequires: ensmallen-devel >= 2.10.0
-BuildRequires: boost-devel, cli11-devel, boost-math, boost-serialization >= 1.49
+BuildRequires: cli11-devel
+BuildRequires: cereal-devel
BuildRequires: pkg-config
# Header-only libraries (-static is for tracking per guidelines)
@@ -53,19 +40,16 @@ BuildRequires: stb_image_write-static
# pages, generated offline, as a patch to this SRPM, but txt2man seems to exist
# in repos.
BuildRequires: txt2man
-# For generation of Doxygen HTML documentation.
-BuildRequires: doxygen
-BuildRequires: graphviz
# Required for building Python bindings.
-BuildRequires: python3-devel, python3-Cython, python3-setuptools, python3-numpy,
+BuildRequires: python3-devel, python3-Cython, python3-setuptools, python3-numpy
BuildRequires: python3-pandas, python3-pytest-runner
# something doesn't like size_t being unsigned long on s390
ExcludeArch: s390
# The s390x builders don't currently have enough RAM to build mlpack.
# (Check again for mlpack 4.0, which should require much less RAM.)
-ExcludeArch: s390x
+#ExcludeArch: s390x
%description
mlpack is a C++ machine learning library with emphasis on scalability, speed,
@@ -93,10 +77,9 @@ methods and related documentation.
%package devel
Summary: Development headers for mlpack (C++ machine learning library)
Requires: %{name} = %{version}-%{release}
-Requires: armadillo-devel >= 8.400.0
+Requires: armadillo-devel >= 9.800.0
Requires: ensmallen-devel >= 2.10.0
-Requires: boost-devel, boost-program-options, boost-math
-Requires: libxml2-devel
+Requires: cereal-devel
Requires: lapack-devel
Requires: pkg-config
Requires: stb_image-devel%{?_isa} >= %{min_stb_image}
@@ -113,17 +96,6 @@ mlpack.
-%package doc
-Summary: Doxygen documentation for mlpack (C++ machine learning library)
-
-%description doc
-mlpack is a C++ machine learning library with emphasis on scalability, speed,
-and ease-of-use. Its aim is to make machine learning possible for novice users
-by means of a simple, consistent API, while simultaneously exploiting C++
-language features to provide maximum performance and maximum flexibility for
-expert users. mlpack outperforms competing machine learning libraries by large
-margins. This package provides the Doxygen-generated documentation for mlpack.
-
%package python3
Summary: Python 3 bindings for mlpack (C++ machine learning library)
Requires: python3
@@ -150,15 +122,12 @@ margins. This package provides the Python bindings for mlpack.
%prep
%autosetup -p1
-# Disable Doxygen warnings being fatal.
-sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/' Doxyfile;
-
%build
%if 0%{?rhel} && 0%{?rhel} <= 7
# 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 BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which
python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D
STB_IMAGE_INCLUDE_DIR=%{_includedir}
+%{cmake28} -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=%{_includedir}
%else
%{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=%{_includedir}
%endif
@@ -178,10 +147,6 @@ cd ..;
# 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).
-cd %{_vpath_builddir};
-make doc
-cd ..;
%install
%{cmake_install}
@@ -195,19 +160,13 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%ldconfig_scriptlets
-
-%files
-%{_libdir}/libmlpack.so.3
-%{_libdir}/libmlpack.so.3.4
-%{our_docdir}/LICENSE.txt
-
%files bin
+%{our_docdir}/LICENSE.txt
%{_bindir}/mlpack_adaboost
%{_bindir}/mlpack_approx_kfn
%{_bindir}/mlpack_bayesian_linear_regression
%{_bindir}/mlpack_cf
%{_bindir}/mlpack_dbscan
-%{_bindir}/mlpack_decision_stump
%{_bindir}/mlpack_decision_tree
%{_bindir}/mlpack_det
%{_bindir}/mlpack_emst
@@ -256,7 +215,6 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{_mandir}/mlpack_bayesian_linear_regression.1*
%{_mandir}/mlpack_cf.1*
%{_mandir}/mlpack_dbscan.1*
-%{_mandir}/mlpack_decision_stump.1*
%{_mandir}/mlpack_decision_tree.1*
%{_mandir}/mlpack_det.1*
%{_mandir}/mlpack_emst.1*
@@ -302,22 +260,21 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{_mandir}/mlpack_sparse_coding.1*
%files devel
-%{_libdir}/libmlpack.so
+%{our_docdir}/LICENSE.txt
+%{_includedir}/mlpack.hpp
%{_includedir}/mlpack/
%{_libdir}/pkgconfig/mlpack.pc
-%{_libdir}/cmake/mlpack/mlpack-config-version.cmake
-%{_libdir}/cmake/mlpack/mlpack-config.cmake
-%{_libdir}/cmake/mlpack/mlpack-targets-noconfig.cmake
-%{_libdir}/cmake/mlpack/mlpack-targets.cmake
-
-%files doc
-%{our_docdir}
%files python3
%{python3_sitearch}/mlpack/
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Wed Oct 26 2022 Ryan Curtin <ryan(a)ratml.org> - 4.0.0-1
+- Update to latest stable version.
+- doc subpackage is no longer produced (mlpack 4.0.0 has no Doxygen support anymore).
+- Remove boost dependency, replace with cereal.
+
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.2-18
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 5403f11..4e823d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (mlpack-3.4.2.tar.gz) =
05a66b73cba8d83f630b0999023913e7a4a3214632930ff3c598d964d52bcae4eab113018eecf385130c0e7e9c16c25380b31dd62a2e0ecf419b4bf3856b34b0
-SHA512 (stb_image.h) =
afc420720aa6e210b2434c451e7b09b23655c91a8163a9d09bd8df3cc254b1168a6b0fddf715e0fbc2ce6b40488ceb142338c34d3421f5447c4fb6e39f924272
-SHA512 (stb_image_write.h) =
1951c20aa9adafcdeed4eb35b69a1868dcf3cce0652cbc761ff029f11566213002dc391027bed804bb7c6061bb6bdbde3296c1278b2e9e535406a3c983344312
+SHA512 (mlpack-4.0.0.tar.gz) =
74eda2196ba8ac195ac7e22b83aadc22448ebdc4331ccf42ca5dde03560446c1fae309cd1085157e0af22d878129d85105a981f70def26da5b8e5fd026976ab4
commit 17667c259d8f8912e2100bd984cc9b73580db109
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 21 23:27:09 2022 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/mlpack.spec b/mlpack.spec
index c210740..1c51b5c 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -318,6 +318,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.2-18
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Tue Jun 21 2022 Lumír Balhar <lbalhar(a)redhat.com> - 3.4.2-17
- Fix build by BR python3-devel
- Fix compatibility with latest setuptools
commit 9eac272520517cced66075658365c2d9d4f6210b
Author: Lumir Balhar <lbalhar(a)redhat.com>
Date: Tue Jun 21 13:28:04 2022 +0200
Fix build by BR python3-devel
diff --git a/mlpack.spec b/mlpack.spec
index b43e4b1..c210740 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -11,6 +11,9 @@ Source0:
http://www.mlpack.org/files/%{name}-%{version}.tar.gz
# */build/*. Well, on Koji, that's everything. So we need to not exclude
# that.
Patch0: no_exclude_build.patch
+# Backported from:
+#
https://github.com/mlpack/mlpack/commit/775a3b55f73eb595c03baf78e6901c9e2...
+Patch1: setuptools_compatibility.patch
# Fix OpenMP build.
#Patch1: omp.patch
@@ -55,9 +58,8 @@ BuildRequires: doxygen
BuildRequires: graphviz
# Required for building Python bindings.
-BuildRequires: python3, python3-Cython, python3-setuptools, python3-numpy,
+BuildRequires: python3-devel, python3-Cython, python3-setuptools, python3-numpy,
BuildRequires: python3-pandas, python3-pytest-runner
-BuildRequires: python-rpm-macros
# something doesn't like size_t being unsigned long on s390
ExcludeArch: s390
@@ -316,6 +318,10 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Tue Jun 21 2022 Lumír Balhar <lbalhar(a)redhat.com> - 3.4.2-17
+- Fix build by BR python3-devel
+- Fix compatibility with latest setuptools
+
* Wed Jun 15 2022 Python Maint <python-maint(a)redhat.com> - 3.4.2-16
- Rebuilt for Python 3.11
diff --git a/setuptools_compatibility.patch b/setuptools_compatibility.patch
new file mode 100644
index 0000000..e276a50
--- /dev/null
+++ b/setuptools_compatibility.patch
@@ -0,0 +1,175 @@
+From 64e1f75b65f8710a1f293c473470ab0991107c69 Mon Sep 17 00:00:00 2001
+From: shubham1206agra <tt1191044(a)iitd.ac.in>
+Date: Wed, 27 Apr 2022 19:11:02 +0530
+Subject: [PATCH 1/6] trying config file
+
+---
+ src/mlpack/bindings/python/setup.cfg | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mlpack/bindings/python/setup.cfg b/src/mlpack/bindings/python/setup.cfg
+index b7e478982cc..cd73819e204 100644
+--- a/src/mlpack/bindings/python/setup.cfg
++++ b/src/mlpack/bindings/python/setup.cfg
+@@ -1,2 +1,4 @@
+ [aliases]
+ test=pytest
++[install]
++install-platlib=libxxx
+
+From fef34ea8db04060479255608d2e226468d8b5b13 Mon Sep 17 00:00:00 2001
+From: shubham1206agra <tt1191044(a)iitd.ac.in>
+Date: Wed, 27 Apr 2022 19:25:31 +0530
+Subject: [PATCH 2/6] trying something else
+
+---
+ src/mlpack/bindings/python/copy_artifacts.py | 2 ++
+ src/mlpack/bindings/python/setup.cfg | 2 --
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mlpack/bindings/python/copy_artifacts.py
b/src/mlpack/bindings/python/copy_artifacts.py
+index ab62a403c55..12fe34c1e7f 100644
+--- a/src/mlpack/bindings/python/copy_artifacts.py
++++ b/src/mlpack/bindings/python/copy_artifacts.py
+@@ -11,6 +11,8 @@
+ import shutil
+ import os
+
++print(sysconfig.get_config_var('ext_suffix'))
++
+ directory = 'build/lib.' + \
+ sysconfig.get_platform() + \
+ '-' + \
+diff --git a/src/mlpack/bindings/python/setup.cfg b/src/mlpack/bindings/python/setup.cfg
+index cd73819e204..b7e478982cc 100644
+--- a/src/mlpack/bindings/python/setup.cfg
++++ b/src/mlpack/bindings/python/setup.cfg
+@@ -1,4 +1,2 @@
+ [aliases]
+ test=pytest
+-[install]
+-install-platlib=libxxx
+
+From 577cc2d6929d6b22d671f314a49756815d99b4c1 Mon Sep 17 00:00:00 2001
+From: shubham1206agra <tt1191044(a)iitd.ac.in>
+Date: Thu, 28 Apr 2022 10:33:02 +0530
+Subject: [PATCH 3/6] new directory structure using glob
+
+---
+ src/mlpack/bindings/python/copy_artifacts.py | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/mlpack/bindings/python/copy_artifacts.py
b/src/mlpack/bindings/python/copy_artifacts.py
+index 12fe34c1e7f..f5bc15b802e 100644
+--- a/src/mlpack/bindings/python/copy_artifacts.py
++++ b/src/mlpack/bindings/python/copy_artifacts.py
+@@ -10,16 +10,19 @@
+ import sysconfig
+ import shutil
+ import os
++import glob
+
+-print(sysconfig.get_config_var('ext_suffix'))
++# directory = 'build/lib.' + \
++# sysconfig.get_platform() + \
++# '-' + \
++# str(sys.version_info[0]) + \
++# '.' + \
++# str(sys.version_info[1]) + \
++# '/mlpack/'
+
+-directory = 'build/lib.' + \
+- sysconfig.get_platform() + \
+- '-' + \
+- str(sys.version_info[0]) + \
+- '.' + \
+- str(sys.version_info[1]) + \
+- '/mlpack/'
++# New directory structure
++directory = glob.glob('build/lib.' + sysconfig.get_platform() +
'*/mlpack')[0]
++directory = directory.replace('\\', '/')
+
+ # Now copy all the files from the directory to the desired location.
+ for f in os.listdir(directory):
+
+From feab906927dca5a88a19ec00dea281263e4be35d Mon Sep 17 00:00:00 2001
+From: shubham1206agra <tt1191044(a)iitd.ac.in>
+Date: Thu, 28 Apr 2022 11:28:32 +0530
+Subject: [PATCH 4/6] missing '/' added
+
+---
+ src/mlpack/bindings/python/copy_artifacts.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mlpack/bindings/python/copy_artifacts.py
b/src/mlpack/bindings/python/copy_artifacts.py
+index f5bc15b802e..672260acf6e 100644
+--- a/src/mlpack/bindings/python/copy_artifacts.py
++++ b/src/mlpack/bindings/python/copy_artifacts.py
+@@ -21,7 +21,7 @@
+ # '/mlpack/'
+
+ # New directory structure
+-directory = glob.glob('build/lib.' + sysconfig.get_platform() +
'*/mlpack')[0]
++directory = glob.glob('build/lib.' + sysconfig.get_platform() +
'*/mlpack/')[0]
+ directory = directory.replace('\\', '/')
+
+ # Now copy all the files from the directory to the desired location.
+
+From 3cfbb4e65d9822df8a25c5625d189ac734665c7b Mon Sep 17 00:00:00 2001
+From: shubham1206agra <tt1191044(a)iitd.ac.in>
+Date: Thu, 28 Apr 2022 12:36:51 +0530
+Subject: [PATCH 5/6] cleanup
+
+---
+ src/mlpack/bindings/python/copy_artifacts.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/mlpack/bindings/python/copy_artifacts.py
b/src/mlpack/bindings/python/copy_artifacts.py
+index 672260acf6e..ed28718302b 100644
+--- a/src/mlpack/bindings/python/copy_artifacts.py
++++ b/src/mlpack/bindings/python/copy_artifacts.py
+@@ -6,20 +6,11 @@
+ # terms of the 3-clause BSD license. You should have received a copy of the
+ # 3-clause BSD license along with mlpack. If not, see
+ #
http://www.opensource.org/licenses/BSD-3-Clause for more information.
+-import sys
+ import sysconfig
+ import shutil
+ import os
+ import glob
+
+-# directory = 'build/lib.' + \
+-# sysconfig.get_platform() + \
+-# '-' + \
+-# str(sys.version_info[0]) + \
+-# '.' + \
+-# str(sys.version_info[1]) + \
+-# '/mlpack/'
+-
+ # New directory structure
+ directory = glob.glob('build/lib.' + sysconfig.get_platform() +
'*/mlpack/')[0]
+ directory = directory.replace('\\', '/')
+
+From 54e2914430ed4862ecdbde557790e828d9e6a7af Mon Sep 17 00:00:00 2001
+From: Shubham Agrawal <58412969+shubham1206agra(a)users.noreply.github.com>
+Date: Fri, 29 Apr 2022 10:20:14 +0530
+Subject: [PATCH 6/6] Update src/mlpack/bindings/python/copy_artifacts.py
+
+Co-authored-by: Ryan Curtin <ryan(a)ratml.org>
+---
+ src/mlpack/bindings/python/copy_artifacts.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mlpack/bindings/python/copy_artifacts.py
b/src/mlpack/bindings/python/copy_artifacts.py
+index ed28718302b..969be65451a 100644
+--- a/src/mlpack/bindings/python/copy_artifacts.py
++++ b/src/mlpack/bindings/python/copy_artifacts.py
+@@ -11,7 +11,7 @@
+ import os
+ import glob
+
+-# New directory structure
++# Match any lib.$platform*/mlpack/ directory.
+ directory = glob.glob('build/lib.' + sysconfig.get_platform() +
'*/mlpack/')[0]
+ directory = directory.replace('\\', '/')
+
commit 5081601b066272fca38f28f137df39e0c96a6855
Author: Python Maint <python-maint(a)redhat.com>
Date: Wed Jun 15 14:00:37 2022 +0200
Rebuilt for Python 3.11
diff --git a/mlpack.spec b/mlpack.spec
index 1d2f4c9..b43e4b1 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -316,6 +316,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Wed Jun 15 2022 Python Maint <python-maint(a)redhat.com> - 3.4.2-16
+- Rebuilt for Python 3.11
+
* Wed May 04 2022 Thomas Rodgers <trodgers(a)redhat.com> - 3.4.2-15
- Rebuilt for Boost 1.78
commit 52edfbac91f4194117ca0f9860673d4a56126b57
Author: Thomas Rodgers <trodgers(a)redhat.com>
Date: Wed May 4 11:40:25 2022 +0200
Rebuilt for Boost 1.78
diff --git a/mlpack.spec b/mlpack.spec
index 55de767..1d2f4c9 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -316,6 +316,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Wed May 04 2022 Thomas Rodgers <trodgers(a)redhat.com> - 3.4.2-15
+- Rebuilt for Boost 1.78
+
* Sat Apr 23 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 3.4.2-14
- Security fix for CVE-2022-28041