Hello community,
here is the log from the commit of package tensorflow for openSUSE:Factory
checked in at 2019-12-14 12:18:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tensorflow (Old)
and /work/SRC/openSUSE:Factory/.tensorflow.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tensorflow"
Sat Dec 14 12:18:45 2019 rev:10 rq:756839 version:1.13.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/tensorflow/tensorflow.changes 2019-11-27
13:55:08.556304624 +0100
+++ /work/SRC/openSUSE:Factory/.tensorflow.new.4691/tensorflow.changes
2019-12-14 12:23:32.779197808 +0100
@@ -1,0 +2,5 @@
+Fri Dec 13 12:25:57 UTC 2019 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Increase a bit %limit_build to avoid OOM errors seen on x86_64
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tensorflow.spec ++++++
--- /var/tmp/diff_new_pack.UnU8mC/_old 2019-12-14 12:23:36.455197253 +0100
+++ /var/tmp/diff_new_pack.UnU8mC/_new 2019-12-14 12:23:36.455197253 +0100
@@ -21,121 +21,106 @@
%define vers 1.13.2
%define _vers 1_13_2
%define python_ver_hack python3.[0-9]
-
%global flavor @BUILD_FLAVOR@%{nil}
-
# Build tensorflow, not Tensorflow-lite
%define is_lite 0
-
%if "%{flavor}" == "standard"
%bcond_with cuda
%bcond_with mpi
%bcond_with opencl
%endif
-
%if "%{flavor}" == "lite"
%define is_lite 1
+%define package_suffix -lite
%bcond_with cuda
%bcond_with mpi
%bcond_with opencl
-%define package_suffix -lite
%endif
-
%if "%{flavor}" == "hpc"
+%define compiler_family gnu
%bcond_with cuda
%bcond_with mpi
%bcond_with opencl
%bcond_with avx2
%bcond_without hpc
-%define compiler_family gnu
%endif
-
%if "%{flavor}" == "avx2"
+%define package_suffix -avx2
%bcond_with cuda
%bcond_with mpi
%bcond_with opencl
%bcond_without avx2
-%define package_suffix -avx2
%endif
-
%if "%{flavor}" == "hpc-avx2"
+%define compiler_family gnu
+%define ext avx2
%bcond_with cuda
%bcond_with mpi
%bcond_with opencl
%bcond_without hpc
%bcond_without avx2
-%define compiler_family gnu
-%define ext avx2
%endif
-
%if "%{flavor}" == "hpc-avx2-openmpi3"
%define mpi_flavor openmpi
%define mpi_vers 3
+%define compiler_family gnu
+%define ext avx2
%bcond_with cuda
%bcond_without mpi
%bcond_with opencl
%bcond_without hpc
%bcond_without avx2
-%define compiler_family gnu
-%define ext avx2
%endif
-
%if "%{flavor}" == "hpc-avx2-openmpi2"
%define mpi_flavor openmpi
%define mpi_vers 2
+%define compiler_family gnu
+%define ext avx2
%bcond_with cuda
%bcond_without mpi
%bcond_with opencl
%bcond_without hpc
%bcond_without avx2
-%define compiler_family gnu
-%define ext avx2
%endif
-
%if "%{flavor}" == "hpc-avx2-mvapich2"
%define mpi_flavor mvapich2
+%define compiler_family gnu
+%define ext avx2
%bcond_with cuda
%bcond_without mpi
%bcond_with opencl
%bcond_without hpc
%bcond_without avx2
-%define compiler_family gnu
-%define ext avx2
%endif
-
%if "%{flavor}" == "hpc-openmpi2"
%define mpi_flavor openmpi
%define mpi_vers 2
+%define compiler_family gnu
%bcond_with cuda
%bcond_without mpi
%bcond_with opencl
%bcond_without hpc
%bcond_with avx2
-%define compiler_family gnu
%endif
-
%if "%{flavor}" == "hpc-mvapich2"
%define mpi_flavor mvapich2
+%define compiler_family gnu
%bcond_with cuda
%bcond_without mpi
%bcond_with opencl
%bcond_without hpc
%bcond_with avx2
-%define compiler_family gnu
%endif
-
%if "%{flavor}" == "cuda-9.0"
%bcond_without cuda
%bcond_with mpi
%bcond_with opencl
%endif
-
%if "%{flavor}" == "opencl"
%bcond_without opencl
%bcond_with cuda
%bcond_with mpi
%endif
-
%if %{with hpc}
%{!?compiler_family:%global compiler_family gnu}
%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v
%{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
@@ -157,7 +142,10 @@
%define package_libdir %_libdir
%define libname(l:s:) lib%{pname}%{!-l:%{-s:-}}%{-l*}%{-s*}%{?package_suffix}
%endif
-
+%if %{with avx2}
+%define copts --copt=-mavx --copt=-mavx2 --copt=-mfma --copt=-mfpmath=both
--copt=-msse4.2
+ExclusiveArch: x86_64
+%endif
Name: %{package_name}
Version: %vers
Release: 0
@@ -246,51 +234,16 @@
Patch4: tensorflow-fix_lite.patch
Patch5: remove-keras.patch
Patch6: grpc-namespace-corrections.patch
-
-Requires: python3
-Requires: python3-Keras-Applications
-Requires: python3-Keras-Preprocessing
-Requires: python3-abseil
-Requires: python3-astor
-Requires: python3-gast
-Requires: python3-protobuf
-Requires: python3-termcolor
-%if %{with hpc}
-Requires: python3-numpy-%{compiler_family}%{?c_f_ver}-hpc
-%else
-Requires: python3-numpy
-%endif
-Requires: python3-pip
-%if %{with hpc}
-Provides: python3-tensorflow-%{compiler_family}%{?c_f_ver}-hpc
-%else
-Provides: python3-tensorflow
-%endif
-BuildRequires: bazel == 0.19.2
+BuildRequires: bazel = 0.19.2
BuildRequires: curl
-%if %{with cuda}
-Requires: cuda-9.0
-BuildRequires: cuda-9.0
-%endif
-%if %{with opencl}
-Requires: Mesa-libOpenCL
-BuildRequires: opencl-cpp-headers
-BuildRequires: opencl-headers
-%endif
BuildRequires: curl-devel
BuildRequires: fdupes
-%if %{is_lite}
-BuildRequires: flatbuffers-devel
-%endif
BuildRequires: fftw3-devel
BuildRequires: giflib-devel
BuildRequires: grpc-devel
BuildRequires: jemalloc-devel
-BuildRequires: libjpeg-turbo
-%if 0%{?suse_version} < 1550
-BuildRequires: libjpeg62-turbo
-%endif
BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo
BuildRequires: libjpeg62-devel
BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel
@@ -321,27 +274,55 @@
BuildRequires: swig
BuildRequires: unzip
BuildRequires: zlib-devel
+Requires: python3
+Requires: python3-Keras-Applications
+Requires: python3-Keras-Preprocessing
+Requires: python3-abseil
+Requires: python3-astor
+Requires: python3-gast
+Requires: python3-pip
+Requires: python3-protobuf
+Requires: python3-termcolor
+%if %{with hpc}
+Requires: python3-numpy-%{compiler_family}%{?c_f_ver}-hpc
+%else
+Requires: python3-numpy
+%endif
+%if %{with hpc}
+Provides: python3-tensorflow-%{compiler_family}%{?c_f_ver}-hpc
+%else
+Provides: python3-tensorflow
+%endif
+%if %{with cuda}
+BuildRequires: cuda-9.0
+Requires: cuda-9.0
+%endif
+%if %{with opencl}
+BuildRequires: opencl-cpp-headers
+BuildRequires: opencl-headers
+Requires: Mesa-libOpenCL
+%endif
+%if %{is_lite}
+BuildRequires: flatbuffers-devel
+%endif
+%if 0%{?suse_version} < 1550
+BuildRequires: libjpeg62-turbo
+%endif
%if %{with hpc}
-%hpc_requires
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: lua-lmod
BuildRequires: suse-hpc
+%hpc_requires
%if %{with mpi}
BuildRequires:
%{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
%endif
%endif
-
# just use rpmlint
# there are some serious compiler warnings, regarding
no-return-in-nonvoid-function
#!BuildRequires: -post-build-checks
-
%if "%flavor" == ""
ExclusiveArch: do_not_build
%endif
-%if %{with avx2}
-ExclusiveArch: x86_64
-%define copts --copt=-mavx --copt=-mavx2 --copt=-mfma --copt=-mfpmath=both
--copt=-msse4.2
-%endif
%description
This open source software library for numerical computation is used for data
@@ -469,7 +450,7 @@
%build
%if !%{is_lite}
-%limit_build -m 6000
+%limit_build -m 6100
%endif
%if %{is_lite}
@@ -490,7 +471,7 @@
export TEST_TMPDIR=%{bazeldir}
export PYTHON_LIB_PATH=%{python3_sitearch}
-export PYTHON_BIN_PATH=/usr/bin/python3
+export PYTHON_BIN_PATH=%{_bindir}/python3
export CC_OPT_FLAGS=-O2
export TF_NEED_JEMALLOC=0
export TF_NEED_GCP=0
@@ -638,6 +619,7 @@
%if %{is_lite}
%files
%{package_bindir}/*
+
%files -n %{package_name}-devel
%{package_libdir}/libtensorflow-lite.a
%dir %{_includedir}/tensorflow/lite/schema/
@@ -653,9 +635,11 @@
%if %{with hpc}
%hpc_modules_files
%endif
+
%files -n %{package_name}-devel
%{package_python_sitelib}/tensorflow/include
%{package_libdir}/libtensorflow*.so
+
%files -n %{package_name}-doc
%{package_python_sitelib}/tensorflow/examples
