Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

onnxruntime: 1.2.0 -> 1.3.1 #91515

Merged
merged 1 commit into from Jul 1, 2020
Merged

Conversation

@jonringer
Copy link
Contributor

jonringer commented Jun 25, 2020

Motivation for this change

routine update

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
https://github.com/NixOS/nixpkgs/pull/91515
1 package built:
onnxruntime
Copy link
Member

danieldk left a comment

Builds fine here:

Result of nixpkgs-review pr 91515 1

1 package built:
- onnxruntime

The output and dev output seem to have the correct files.

Seems like darwin fails with a hash mismatch?

@jonringer
Copy link
Contributor Author

jonringer commented Jun 29, 2020

yea, i noticed that as well. Not sure what do, I will likely disable darwin platform.

@marsam
Copy link
Contributor

marsam commented Jun 30, 2020

it happens because unicode filenames yield a different hash on darwin NixOS/nix#847
I think you can either:

  1. Specify the other hash for darwin:
    --- c/pkgs/development/libraries/onnxruntime/default.nix
    +++ i/pkgs/development/libraries/onnxruntime/default.nix
    @@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
         owner = "microsoft";
         repo = "onnxruntime";
         rev = "v${version}";
    -    sha256 = "03c5h5pp67a51blc26kw08piax81116jp7l2illzrsnx0580m6ri";
    +    sha256 =
    +      if stdenv.isDarwin
    +      then "…"
    +      else "…";
         # 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
  2. Remove the offending files, so fetchFromGitHub yields the same hash:
    --- c/pkgs/development/libraries/onnxruntime/default.nix
    +++ i/pkgs/development/libraries/onnxruntime/default.nix
    @@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
         # 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 winml/test/collateral/models/UnicodePath/
    +    '';
       };
    
       # TODO: build server, and move .so's to lib output
Co-authored by: @marsam
@jonringer jonringer force-pushed the jonringer:bump-onnxruntime-1.3.1 branch from 579f8d9 to e3761b6 Jun 30, 2020
@jonringer
Copy link
Contributor Author

jonringer commented Jun 30, 2020

@GrahamcOfBorg build onnxruntime

@danieldk
Copy link
Member

danieldk commented Jul 1, 2020

Since ofborg build timed out: building on my MacBook now.

Copy link
Member

danieldk left a comment

Darwin build is also successful.

@danieldk danieldk merged commit 7887081 into NixOS:master Jul 1, 2020
20 checks passed
20 checks passed
onnxruntime on x86_64-darwin Timed out, unknown build status
Details
onnxruntime, onnxruntime.passthru.tests on x86_64-darwin Timed out, unknown build status
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e3761b6"; rev="e3761b651c635da192fc44d74cb8d165d653ac89"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
onnxruntime on aarch64-linux Success
Details
onnxruntime on x86_64-linux Success
Details
onnxruntime, onnxruntime.passthru.tests on aarch64-linux Success
Details
onnxruntime, onnxruntime.passthru.tests on x86_64-linux Success
Details
@jonringer jonringer deleted the jonringer:bump-onnxruntime-1.3.1 branch Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.