diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-05 12:18:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-05 12:18:17 +0000 |
commit | 0947539ec1038d3ba1ca93e5a2ed972c2af7c12a (patch) | |
tree | dde64b447700e69763b491a76e5d364363c4b866 /pkgs/development | |
parent | 55b348fe1b0417fa20902bfb1133aebf833cae44 (diff) | |
parent | 29045c2322178bc15956cf26c659b9e98010608b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/onnxruntime/default.nix | 78 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix | 4 |
2 files changed, 2 insertions, 80 deletions
diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix deleted file mode 100644 index 06d0d194cd59..000000000000 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchFromGitHub, glibcLocales -, cmake, python3, libpng, zlib -}: - -stdenv.mkDerivation rec { - pname = "onnxruntime"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "onnxruntime"; - rev = "v${version}"; - sha256 = "0rbk1jbfc447x2wybz2hsba6w1ij0fq21996l52cqv39898lvy9d"; - # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. - # submodules increase src size and compile times significantly - # not currently feasible due to how integrated cmake build is with git - fetchSubmodules = true; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -rf $out/winml/test/collateral/models/UnicodePath/ - ''; - }; - - # TODO: build server, and move .so's to lib output - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - python3 # for shared-lib or server - ]; - - buildInputs = [ - # technically optional, but highly recommended - libpng - zlib - ]; - - cmakeDir = "../cmake"; - - cmakeFlags = [ - "-Donnxruntime_USE_OPENMP=ON" - "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_ENABLE_LTO=ON" - ]; - - # ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8" - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - ''; - doCheck = true; - - postInstall = '' - rm -r $out/bin # ctest runner - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Cross-platform, high performance scoring engine for ML models"; - longDescription = '' - ONNX Runtime is a performance-focused complete scoring engine - for Open Neural Network Exchange (ONNX) models, with an open - extensible architecture to continually address the latest developments - in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX - standard with complete implementation of all ONNX operators, and - supports all ONNX releases (1.2+) with both future and backwards - compatibility. - ''; - homepage = "https://github.com/microsoft/onnxruntime"; - changelog = "https://github.com/microsoft/onnxruntime/releases"; - # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; - }; - -} diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 7fd939e58ec2..958c088cd6a2 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_tools_versioned"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0c735w9mq49dmvkdw9ahfwh0icsk2sbhnfwmdhpibj86phfm17yj"; + sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; |