Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-onnx for openSUSE:Factory checked in at 2021-02-15 23:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-onnx (Old) and /work/SRC/openSUSE:Factory/.python-onnx.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-onnx" Mon Feb 15 23:20:59 2021 rev:10 rq:872639 version:1.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-onnx/python-onnx.changes 2020-08-17 12:10:00.030848746 +0200 +++ /work/SRC/openSUSE:Factory/.python-onnx.new.28504/python-onnx.changes 2021-02-15 23:23:12.876015430 +0100 @@ -1,0 +2,36 @@ +Mon Feb 15 18:25:39 UTC 2021 - Ben Greiner <c...@bnavigator.de> + +- NEP 29: Tumbleweed does not have python36-numpy and depending + packages anymore. Skip python36 build. +- Make setup.py cmake call and %cmake macros compatible, even for + multiple python3 flavors (when we get python39) +- Fix boo#1182258 + +------------------------------------------------------------------- +Fri Feb 5 08:50:45 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Update to 1.8.1: https://github.com/onnx/onnx/releases/tag/v1.8.1 + * Bug fixes: + - #3169 To resolve memory crash on Windows, register python exceptions and update exceptions handling + - #3171 Fix bugs in external data helpers and add add size thresholds for converting + - #2961 Fix build issues on some distributions of linux due to hard dependency on python2 + - #3221 Fix mypy wrapper error while using ONNX as a submodule +- Changes from skipped 1.8.0: https://github.com/onnx/onnx/releases/tag/v1.8.0 + * Training + - Added Differentiable tags to make Gradient operator better defined #2723, #2893, #2911, #2954 + - Removed GraphCall; eliminated need to implement GraphCall #2964 + - Created a tool and example for users to use TrainingInfoProto for training #3008 + * Shape Inference and Checker + - Large model (>2GB model) support added for checker and shape_inference #2744 + - Graph level shape inference fixes to patch the IR gap introduced since IR version 4 #3023 + - Node level shape inference fixes for operators + * Version Converter + - More operators supported #2664 + * General Features + - Added serialization for inputs and outputs of Sequence and Map data types #2581 + - Added programmatic access to version-table and extend make-model #2918 + - Added size check to make_tensor #2987 +- Drop patch as the related problem has been fixed upstream: + * using-onnxruntime-proto.patch + +------------------------------------------------------------------- Old: ---- onnx-1.7.0.tar.gz using-onnxruntime-proto.patch New: ---- onnx-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-onnx.spec ++++++ --- /var/tmp/diff_new_pack.lsuY1D/_old 2021-02-15 23:23:13.460016302 +0100 +++ /var/tmp/diff_new_pack.lsuY1D/_new 2021-02-15 23:23:13.464016308 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-onnx # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,10 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +# Tumbleweed does not have a python36-numpy anymore: NEP 29 dropped Python 3.6 for NumPy 1.20 +%define skip_python36 1 Name: python-onnx -Version: 1.7.0 +Version: 1.8.1 Release: 0 Summary: Open Neural Network eXchange License: MIT @@ -27,7 +29,6 @@ Source0: https://github.com/onnx/onnx/archive/v%{version}.tar.gz#/onnx-%{version}.tar.gz Source1: %{name}-rpmlintrc Patch1: no-python2.patch -Patch2: using-onnxruntime-proto.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy} BuildRequires: %{python_module protobuf} @@ -50,7 +51,7 @@ Requires: python-six Requires: python-typing_extensions >= 3.6.2.1 Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: python-onnx-devel = %{version}-%{release} Obsoletes: python-onnx-devel < %{version}-%{release} %python_subpackages @@ -97,37 +98,26 @@ %description -n onnx-backend-test This packages includes the data for testing the backend. - %prep %setup -q -n onnx-%{version} # avoid bundles rm -rf third_party %autopatch -p1 -# say that the cmake was already built (we used our macros) -sed -i -e 's:built = False:built = True:g' setup.py +# build inside python_expand shuffled build dir also used by the cmake macro instead of upstream's custom dirname +sed -i "/^CMAKE_BUILD_DIR = / s/TOP_DIR, '.setuptools-cmake-build'/TOP_DIR, 'build'/" setup.py # do not require extra pytest modules sed -i -e '/addopts/d' setup.cfg # do not pull in pytest-runner as it is deprecated sed -i -e '/pytest-runner/d' setup.py %build -# define same folder like is used for the setup.py later -%define __builddir .setuptools-cmake-build -# FIXME: you should use %%cmake macros -# Force the cmake to build static libs as otherwise we end -# up with unresolvable package. -%{python_expand # we need to generate for each python -%cmake \ - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON \ - -DONNX_WERROR=OFF \ - -DBUILD_ONNX_PYTHON=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=OFF \ - -DPYTHON_EXECUTABLE="%{_bindir}/$python" \ - -DPY_EXT_SUFFIX="`$python-config --extension-suffix`" \ - %{nil} -%cmake_build ; cd .. +%{python_expand # Generate the build system using the distro macro, configuring everything to taste for every python flavor. +%cmake -DONNX_USE_PROTOBUF_SHARED_LIBS:BOOL=ON \ + -DONNX_WERROR:BOOL=OFF +# the macro stays in build/ +cd .. } +# let setup.py do the cmake build call (for every flavor) %python_build %install @@ -136,19 +126,34 @@ %python_clone -a %{buildroot}%{_bindir}/backend-test-tools %python_clone -a %{buildroot}%{_bindir}/check-node %python_clone -a %{buildroot}%{_bindir}/check-model -%python_expand %fdupes %{buildroot}%{$python_sitearch} -shebang_files="%{python_sitearch}/onnx/backend/test/stat_coverage.py %{python_sitearch}/onnx/defs/gen_doc.py %{python_sitearch}/onnx/gen_proto.py" +%{python_expand # fix shebang +shebang_files="%{$python_sitearch}/onnx/backend/test/stat_coverage.py %{$python_sitearch}/onnx/defs/gen_doc.py %{$python_sitearch}/onnx/gen_proto.py" for file in $shebang_files ; do - sed -i 's@%{_bindir}/env python@%{_bindir}/python3@' %{buildroot}/$file + sed -i 's|%{_bindir}/env python.*$|%{_bindir}/$python|' %{buildroot}/$file chmod 755 %{buildroot}/$file done +} +%{?python_compileall} +%python_expand %fdupes %{buildroot}%{$python_sitearch} %check -export PYTHONDONTWRITEBYTECODE=1 -# copy inplace for tests -cp %{__builddir}/*cpp2py* ./onnx/ +export LD_LIBRARY_PATH="%{buildroot}%{_libdir}" +# copy tests into clean subdir and test the installed lib in sitearch +mkdir cleantestdir +cp -r onnx/test onnx/examples cleantestdir/ +pushd cleantestdir # skip online tests -%pytest_arch -n auto -k 'not (test_bvlc_alexnet_cpu or test_shufflenet_cpu or test_densenet121_cpu or test_squeezenet_cpu or test_inception_v1_cpu or test_vgg19_cpu or test_inception_v2_cpu or test_zfnet512_cpu or test_resnet50_cpu)' +donttest=" test_bvlc_alexnet_cpu \ + or test_shufflenet_cpu \ + or test_densenet121_cpu \ + or test_squeezenet_cpu \ + or test_inception_v1_cpu \ + or test_vgg19_cpu \ + or test_inception_v2_cpu \ + or test_zfnet512_cpu \ + or test_resnet50_cpu" +%pytest_arch -n auto -k "not ($donttest)" -ra +popd %post %python_install_alternative backend-test-tools @@ -183,6 +188,7 @@ %files -n libonnx %{_libdir}/libonnx.so + %files -n libonnx_proto %{_libdir}/libonnx_proto.so ++++++ onnx-1.7.0.tar.gz -> onnx-1.8.1.tar.gz ++++++ ++++ 46271 lines of diff (skipped)
