Hello community, here is the log from the commit of package caffe for openSUSE:Factory checked in at 2019-06-06 18:19:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caffe (Old) and /work/SRC/openSUSE:Factory/.caffe.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caffe" Thu Jun 6 18:19:33 2019 rev:2 rq:708133 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/caffe/caffe.changes 2018-11-20 22:43:12.462265752 +0100 +++ /work/SRC/openSUSE:Factory/.caffe.new.4811/caffe.changes 2019-06-06 18:19:37.864645463 +0200 @@ -1,0 +2,20 @@ +Thu Jun 6 11:20:37 UTC 2019 - Guillaume GARDET <[email protected]> + +- Add _constraints to avoid OOM + +------------------------------------------------------------------- +Thu Jun 6 10:44:10 UTC 2019 - Christian Goll <[email protected]> + +- hpc modules were not loaded in check section + +------------------------------------------------------------------- +Tue May 28 12:35:03 UTC 2019 - Guillaume GARDET <[email protected]> + +- Run tests in %check + +------------------------------------------------------------------- +Mon May 27 05:00:59 UTC 2019 - Guillaume GARDET <[email protected]> + +- Package %{p_includedir}/proto/caffe.pb.cc + +------------------------------------------------------------------- New: ---- _constraints ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caffe.spec ++++++ --- /var/tmp/diff_new_pack.0GaRmr/_old 2019-06-06 18:19:38.780645196 +0200 +++ /var/tmp/diff_new_pack.0GaRmr/_new 2019-06-06 18:19:38.780645196 +0200 @@ -1,7 +1,7 @@ # -# spec file for package caffe-cpu +# spec file for package caffe # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %define pname caffe @@ -75,6 +76,7 @@ %endif BuildRequires: cmake >= 2.8.7 BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glog-devel BuildRequires: leveldb-devel @@ -82,24 +84,23 @@ BuildRequires: lmdb-devel BuildRequires: ninja BuildRequires: pkgconfig -BuildRequires: pkgconfig(gflags) -BuildRequires: pkgconfig(opencv) -BuildRequires: pkgconfig(protobuf) BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: snappy-devel -BuildRequires: fdupes +BuildRequires: pkgconfig(gflags) +BuildRequires: pkgconfig(opencv) +BuildRequires: pkgconfig(protobuf) %if %{without hpc} BuildRequires: hdf5-devel BuildRequires: openblas-devel BuildRequires: python3-numpy-devel %else -BuildRequires: lua-lmod -BuildRequires: suse-hpc >= 0.4 BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: hdf5-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: libopenblas-%{compiler_family}%{?c_f_ver}-hpc-devel +BuildRequires: lua-lmod BuildRequires: python3-numpy-%{compiler_family}%{?c_f_ver}-hpc-devel +BuildRequires: suse-hpc >= 0.4 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -113,9 +114,9 @@ Summary: Shared libraries for Caffe Group: System/Libraries %if %{with hpc} -Requires: lua-lmod Requires: libhdf5%{hpc_package_name_tail} Requires: libopenblas%{hpc_package_name_tail} +Requires: lua-lmod %endif %description -n lib%{name}%{?so_name} @@ -186,6 +187,15 @@ %install %{?with_hpc:%hpc_setup} %cmake_install + +# Add caffe.pb.cc as required by some packages (e.g. armnn) +cp build/include/caffe/proto/caffe.pb.cc \ +%if %{without hpc} +%{buildroot}%{p_includedir}/proto/caffe.pb.cc +%else +%{buildroot}%{p_includedir}/caffe/proto/caffe.pb.cc +%endif + # copy the examples mkdir -p %{buildroot}%{_docdir}/%{name} # Contains URLs to possibly copyrighted material @@ -268,6 +278,12 @@ %endif %fdupes %{buildroot}/%{_docdir} +%check +cd build +export LD_LIBRARY_PATH="%{buildroot}%{p_libdir}" +%{?with_hpc:%hpc_setup} +%cmake_build runtest + %if %{without hpc} %post -n lib%{name}%{?so_name} -p /sbin/ldconfig @@ -298,7 +314,6 @@ %{p_bindir}/upgrade_net_proto_text %{p_bindir}/upgrade_solver_proto_text - %files -n lib%{name}%{?so_name} %{?hpc_modules_files} %{?hpc_dirs} ++++++ _constraints ++++++ <constraints> <hardware> <memory> <size unit="G">4</size> </memory> <disk> <size unit="G">3</size> </disk> </hardware> </constraints>
