b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python310Packages.onnx: 0.13.1 -> 0.14.0

Browse source 
https://github.com/onnx/onnx/releases/tag/v1.14.0

Fixes the build on aarch64-linux as well as on both darwins.
This commit is contained in:
Martin Weinelt 2023-05-20 20:17:55 +02:00
parent 532f8cd016
commit bb22f9fe0a
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkgs/development/python-modules/onnx/default.nix
View file

@ -1,55 +1,50 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, python3
, bash
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, gtest , gtest
, isPy27
, nbval , nbval
, numpy , numpy
, parameterized
, protobuf , protobuf
, pybind11 , pybind11
, pytestCheckHook , pytestCheckHook
, six , pythonOlder
, tabulate , tabulate
, typing-extensions , typing-extensions
, pythonRelaxDepsHook
}: }:
let let
gtestStatic = gtest.override { static = true; }; gtestStatic = gtest.override { static = true; };
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "onnx"; pname = "onnx";
version = "1.13.1"; version = "1.14.0";
format = "setuptools"; format = "setuptools";
disabled = isPy27; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-10MH23XpAv/uDW/2tRFGS2lKU8hnaNBwbIBIgVc7Jpk="; hash = "sha256-f+s25Y/jGosaSdoZY6PE3j6pENkfDcD+IQndrbtuzWg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pythonRelaxDepsHook
pybind11 pybind11
]; ];
pythonRelaxDeps = [ "protobuf" ];
propagatedBuildInputs = [ propagatedBuildInputs = [
protobuf protobuf
numpy numpy
six
typing-extensions typing-extensions
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
nbval nbval
parameterized
pytestCheckHook pytestCheckHook
tabulate tabulate
]; ];
@ -72,7 +67,6 @@ in buildPythonPackage rec {
# Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
# to lib64 and cmake incorrectly looks for the protobuf library in lib64 # to lib64 and cmake incorrectly looks for the protobuf library in lib64
export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
'' + lib.optionalString doCheck ''
export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include"
export ONNX_BUILD_TESTS=1 export ONNX_BUILD_TESTS=1
''; '';
@ -89,14 +83,18 @@ in buildPythonPackage rec {
# The setup.py does all the configuration # The setup.py does all the configuration
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
doCheck = true;
preCheck = '' preCheck = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
# detecting source dir as a python package confuses pytest # detecting source dir as a python package confuses pytest
mv onnx/__init__.py onnx/__init__.py.hidden mv onnx/__init__.py onnx/__init__.py.hidden
''; '';
pytestFlagsArray = [ "onnx/test" "onnx/examples" ];
pytestFlagsArray = [
"onnx/test"
"onnx/examples"
];
disabledTests = [ disabledTests = [
# attempts to fetch data from web # attempts to fetch data from web
"test_bvlc_alexnet_cpu" "test_bvlc_alexnet_cpu"
@ -108,11 +106,25 @@ in buildPythonPackage rec {
"test_squeezenet_cpu" "test_squeezenet_cpu"
"test_vgg19_cpu" "test_vgg19_cpu"
"test_zfnet512_cpu" "test_zfnet512_cpu"
] ++ lib.optionals stdenv.isAarch64 [
# AssertionError: Output 0 of test 0 in folder
"test__pytorch_converted_Conv2d_depthwise_padded"
"test__pytorch_converted_Conv2d_dilated"
"test_dft"
"test_dft_axis"
# AssertionError: Mismatch in test 'test_Conv2d_depthwise_padded'
"test_xor_bcast4v4d"
# AssertionError: assert 1 == 0
"test_ops_tested"
]; ];
disabledTestPaths = [ disabledTestPaths = [
# Unexpected output fields from running code: {'stderr'} # Unexpected output fields from running code: {'stderr'}
"onnx/examples/np_array_tensorproto.ipynb" "onnx/examples/np_array_tensorproto.ipynb"
]; ];
__darwinAllowLocalNetworking = true;
postCheck = '' postCheck = ''
# run "cpp" tests # run "cpp" tests
.setuptools-cmake-build/onnx_gtests .setuptools-cmake-build/onnx_gtests