[shogun] updated to new snapshot git20141224.d71e19aa5a575b2b4e52c908a694eb1db7afc973 reduced number of make-
commit 6d9b587882c6291690913092ae51b248445ab96e Author: Björn Esser bjoern.esser@gmail.com Date: Wed Dec 24 10:38:09 2014 +0100
updated to new snapshot git20141224.d71e19aa5a575b2b4e52c908a694eb1db7afc973 reduced number of make-jobs on %%{arm} conditionalized and disabled OpenCV-integration
shogun.spec | 31 ++++++++++++++++++++++++------- sources | 2 +- 2 files changed, 25 insertions(+), 8 deletions(-) --- diff --git a/shogun.spec b/shogun.spec index 3fbf4e6..33bf8a4 100644 --- a/shogun.spec +++ b/shogun.spec @@ -2,8 +2,8 @@ #%%global rel_build 1
# Settings used for build from snapshots. -%{!?rel_build:%global commit c32937574df1c560ce7c10f1b8860679ce011a8b} -%{!?rel_build:%global commit_date 20141223} +%{!?rel_build:%global commit d71e19aa5a575b2b4e52c908a694eb1db7afc973} +%{!?rel_build:%global commit_date 20141224} %{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} %{!?rel_build:%global gitver git%{commit_date}-%{shortcommit}} %{!?rel_build:%global gitrel .git%{commit_date}.%{shortcommit}} @@ -47,6 +47,9 @@ %global without_mono 1 %endif # ifnarch %%{mono_arches}
+# OpenCV integration is crappy. +%global without_opencv 1 + # Some switches to control build of SWIGed-bindings and testsuite. You still # can pass overriding defines `-D 'with_XXX 1'` or `-D 'without_XXX 1'` to # rpmbuild. @@ -55,6 +58,7 @@ %{!?without_lua: %global with_lua 1} %{!?without_mono: %global with_mono 1} %{!?without_octave: %global with_octave 1} +%{!?without_opencv: %global with_opencv 1} %{!?without_perl: %global with_perl 1} %{!?without_python: %global with_python 1} %{!?without_python3: %global with_python3 1} @@ -94,7 +98,7 @@ of it's 'no-redistribute', 'no-commercial-use' license.
Name: shogun Version: %{branch}.0.1 -Release: 0.30%{?gitrel}%{?dist} +Release: 0.31%{?gitrel}%{?dist} Summary: Large Scale Machine Learning Toolbox
# ===== License-breakdown ===== @@ -803,10 +807,10 @@ pushd %{_cmake_build_subdir} %{?with_ruby: -DRUBY_NARRAY_INCLUDE_DIR="%{narray_include}" } \ %{?with_ruby: -DRUBY_NARRAY_LIBRARY="%{narray_lib}" } \ %{?with_octave: -DOctaveModular=ON } \ +%{?with_opencv: -DOpenCV=ON } \ %{?with_perl: -DPerlModular=ON } \ %{?with_python: -DPythonModular=ON } \ %{?with_python: -DPYTHON_EXECUTABLE="%{__python2}" } \ - -DOpenCV=ON \ %{?with_r: -DRModular=ON } \ %{?with_ruby: -DRubyModular=ON } \ .. @@ -817,8 +821,12 @@ pushd %{_cmake_build_subdir} # limit parallel-make to 3 threads = 4.5 GBytes. The actual thing consuming # these amounts of memory is not the build itself, but SWIG, which eats RAM # like chocolate, when creating cpp-src. +%ifnarch %{arm} ping -c1 mldata.org && \ %{__make} %{?_smp_mflags} || %{__make} -j3 +%else # ifnarch %%{arm} +%{__make} -j2 +%endif # ifnarch %%{arm} popd
# Build the Python3-version. @@ -835,16 +843,16 @@ pushd %{py3dir}/%{_cmake_build_subdir} -DATLAS_LAPACK=%{_libdir}/atlas/libtatlas.so \ -DATLAS_LIBRARIES=%{_libdir}/atlas/libtatlas.so \ %endif -%{?with_tests: -DBUILD_DASHBOARD_REPORTS=ON } \ +%{?with_tests: -DBUILD_DASHBOARD_REPORTS=ON } \ -DBUNDLE_EIGEN=OFF \ -DBUNDLE_NLOPT=OFF \ -DBUNDLE_JSON=OFF \ -DENABLE_CCACHE=OFF \ -%{?with_tests: -DENABLE_TESTING=ON } \ +%{?with_tests: -DENABLE_TESTING=ON } \ -DUSE_SVMLIGHT=OFF \ +%{?with_opencv: -DOpenCV=ON } \ -DPythonModular=ON \ -DPYTHON_EXECUTABLE=%{__python3} \ - -DOpenCV=ON \ ..
@@ -854,8 +862,12 @@ pushd %{py3dir}/%{_cmake_build_subdir} # limit parallel-make to 3 threads = 4.5 GBytes. The actual thing consuming # these amounts of memory is not the build itself, but SWIG, which eats RAM # like chocolate, when creating cpp-src. +%ifnarch %{arm} ping -c1 mldata.org && \ %{__make} %{?_smp_mflags} || %{__make} -j3 +%else # ifnarch %%{arm} +%{__make} -j2 +%endif # ifnarch %%{arm} popd %endif #0%{?with_python3}
@@ -1067,6 +1079,11 @@ popd ###############################################################################
%changelog +* Wed Dec 24 2014 Björn Esser bjoern.esser@gmail.com - 3.2.0.1-0.31.git20141224.d71e19a +- updated to new snapshot git20141224.d71e19aa5a575b2b4e52c908a694eb1db7afc973 +- reduced number of make-jobs on %%{arm} +- conditionalized and disabled OpenCV-integration + * Tue Dec 23 2014 Björn Esser bjoern.esser@gmail.com - 3.2.0.1-0.30.git20141223.c329375 - updated to new snapshot git20141223.c32937574df1c560ce7c10f1b8860679ce011a8b - added BR: ocl-icd-devel, opencl-headers diff --git a/sources b/sources index a1feacb..006b6d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -224380c55b1e86aec88febe9164488f2 shogun-3.2.0.1-git20141223-c329375.tar.gz +0f5f2df3c84c55f94d68a73ed507fd14 shogun-3.2.0.1-git20141224-d71e19a.tar.gz 073b984d8798ea1594f5e44d85b20d66 gmock-1.7.0.zip
-
Björn 'besser82' Esser