python3Packages.qiskit: 0.25.0 -> 0.26.2 #121606

drewrisinger · 2021-05-03T17:57:03Z

Motivation for this change

Update super-package & all subpackages to the latest version. ~~https://github.com/Qiskit/qiskit/releases/tag/0.25.3~~ https://github.com/Qiskit/qiskit/releases/tag/0.26.2

Things done

r-rmcgibbo · 2021-05-03T19:02:09Z

Result of nixpkgs-review pr 121606 at 94f29042 run on aarch64-linux 1

12 packages failed to build:

2 packages built successfully:

python38Packages.yfinance
python39Packages.yfinance

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

Result of nixpkgs-review pr 121606 at 9a36c867 run on aarch64-linux 1

1 package built successfully:

zile

rmcgibbo · 2021-05-04T14:11:51Z

Perhaps these should be marked as broken on aarch64. It seems unlikely that aarch64-linux is a supported platform for upstream.

drewrisinger · 2021-05-04T17:30:18Z

@rmcgibbo it is definitely supported upstream (see e.g. aarch64 wheels on https://pypi.org/project/qiskit-terra/#files), so I'm confused by these build errors.

I'm leaning in favor of just disabling these tests, b/c the build for qiskit-terra is passing on hydra for aarch64 (well, it was until something broke it last night?).
Thoughts?

How can I get your bot to re-run aarch64 tests? I just pushed updates that should fix this.
@GrahamcOfBorg build python38Packages.qiskit

rmcgibbo · 2021-05-06T16:22:19Z

@rmcgibbo it is definitely supported upstream (see e.g. aarch64 wheels on https://pypi.org/project/qiskit-terra/#files), so I'm confused by these build errors.

I stand corrected.

How can I get your bot to re-run aarch64 tests? I just pushed updates that should fix this.

I just did it manually, but hopefully I'll add that feature soon (rmcgibbo/r-rmcgibbo#3). Edit: the bot ran and updated the prior comment, it looks like it only built a single package... Not sure what that's all about.

If the failures persist, perhaps opening an upstream for guidance would be appropriate. Or does one already exist?

rmcgibbo · 2021-05-06T17:03:02Z

@ofborg eval

drewrisinger · 2021-05-06T17:53:35Z

Whoops, missed the stdenv import. Fixed with latest force-push.

drewrisinger · 2021-05-07T19:59:23Z

Labeling as ZHF b/c of the (hopefully) fixed Darwin build of retworkx, which fixes all the downstream qiskit packages. Don't have a Darwin machine to use for testing.
ZHF: #122042

pkgs/development/python-modules/qiskit-aer/default.nix

rmcgibbo

Result of nixpkgs-review pr 121606 run on x86_64-darwin 1

10 packages marked as broken and skipped:

python38Packages.qiskit
python38Packages.qiskit-aer
python38Packages.qiskit-aqua
python38Packages.qiskit-ibmq-provider
python38Packages.qiskit-ignis
python39Packages.qiskit
python39Packages.qiskit-aer
python39Packages.qiskit-aqua
python39Packages.qiskit-ibmq-provider
python39Packages.qiskit-ignis

6 packages built:

python38Packages.qiskit-terra
python38Packages.retworkx
python38Packages.yfinance
python39Packages.qiskit-terra
python39Packages.retworkx
python39Packages.yfinance

risicle · 2021-05-13T19:33:23Z

nixpkgs-review happy for me, nixos x86_64, macos 10.15 (apart from those marked broken on darwin of course)

drewrisinger · 2021-05-14T13:53:38Z

Latest force-push ONLY updates comment on qiskit-aer patch to note that the PR was accepted. Qiskit/qiskit-aer#1250

drewrisinger · 2021-05-19T22:15:21Z

I've addressed all comments and updated to the latest version of qiskit (0.26.2), as well as squashed some of the commits together. Would you prefer a force-push to this branch or a new PR?

pkgs/development/python-modules/qiskit-aer/default.nix

drewrisinger · 2021-05-27T12:31:20Z

Result of nixpkgs-review pr 121606 run on x86_64-linux 1
4 packages failed to build:
12 packages built:

@dotlambda Due to your request to move pybind11 to nativeBuildInputs. Will revert that.

ERROR: Could not find a version that satisfies the requirement pybind11>=2.6 (from qiskit-aer)
ERROR: No matching distribution found for pybind11>=2.6

dotlambda · 2021-05-27T12:50:41Z

@drewrisinger No, this is not related to pybind11. Some test failed while building python38Packages.qiskit-aer but that might just have been a flaky test cause I can't reproduce it now.
Please put pybind11 in nativeBuildInputs again.

dotlambda · 2021-05-27T12:52:02Z

You will need to add it to qiskit's nativeBuildInputs as well.

drewrisinger · 2021-05-27T17:54:33Z

You will need to add it to qiskit's nativeBuildInputs as well.

That doesn't make sense. Here are their setup files:

qiskit-aer: https://github.com/Qiskit/qiskit-aer/blob/0.8.2/setup.py
qiskit: https://github.com/Qiskit/qiskit/blob/0.26.2/setup.py. Qiskit effectively only requires the subpackages (-terra, -aer, -aqua, -ignis).

Specifically, pybind11 is listed as both a setup_requirement and an install_requirement for qiskit-aer only, with the caveat that they admit that it's not strictly an install requirement. https://github.com/Qiskit/qiskit-aer/blob/629374cf0d1333e2f1c2f4fd38d2790d76f91911/setup.py#L72-L75. Why would we package it differently than what the original developers explicitly intended?

I have a clean build via nix-review on x86-64-linux without the changes you are suggesting @dotlambda.

16 packages built:
python38Packages.qiskit python38Packages.qiskit-aer python38Packages.qiskit-aqua python38Packages.qiskit-ibmq-provider python38Packages.qiskit-ignis python38Packages.qiskit-terra python38Packages.retworkx python38Packages.yfinance python39Packages.qiskit python39Packages.qiskit-aer python39Packages.qiskit-aqua python39Packages.qiskit-ibmq-provider python39Packages.qiskit-ignis python39Packages.qiskit-terra python39Packages.retworkx python39Packages.yfinance

dotlambda · 2021-05-27T18:34:54Z

So they even admit it's wrong. Please test whether the packages work as expected if you apply

diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix
index 82414b87813..550a61320ea 100644
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -48,16 +48,20 @@ buildPythonPackage rec {
       sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z";
     })
   ];
+
   # Remove need for cmake python package
+  # pybind11 should not be in install_requires
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'cmake!=3.17,!=3.17.0'," ""
+      --replace "'cmake!=3.17,!=3.17.0'," "" \
+      --replace "'pybind11>=2.6'" ""
   '';
 
   nativeBuildInputs = [
     cmake
     ninja
     scikit-build
+    pybind11
   ];
 
   buildInputs = [
@@ -73,7 +77,6 @@ buildPythonPackage rec {
     cvxpy
     cython  # generates some cython files at runtime that need to be cython-ized
     numpy
-    pybind11
   ];
 
   # Disable using conan for build

Maybe I'm wrong and pybind11 is actually used at runtime.

pkgs/development/python-modules/qiskit-aqua/default.nix

pkgs/development/python-modules/qiskit/default.nix

Backports changes made to retworkx in NixOS/nixpkgs#121606 to support Darwin by adding a buildInput.

Also fixes retworkx Darwin build. Fixes linker error for retworkx that required libiconv. Error log: error: linking with `/nix/store/47vpv5i10dwfg1cf5wca1k40f982g5fm-clang-wrapper-7.1.0/bin/cc` failed: exit code: 1 ... ld: library not found for -liconv clang-7: error: linker command failed with exit code 1 (use -v to see invocation) Also fix tests running on build, that didn't get converted when switched to the new way of running Cargo builds for python packages.

Also unbreak build on master by disabling tests that compare visual matplotlib images. Also remove force deletes from postCheck.

@dotlambda

Use a patch submitted via PR instead of custom substitute. Remove pybind11 install requirement, as requested by @dotlambda

Backports changes made to retworkx in NixOS/nixpkgs#121606 to support Darwin by adding a buildInput.

Also remove unused patch & unneeded docs delete (they're not in $out).

Remove unneeded docs delete, they're no longer in $out.

Add optional subpackages as arguments. Most of these are not in nixpkgs, but can be found in https://github.com/drewrisinger/nur-packages/.

drewrisinger · 2021-06-02T00:14:49Z

Addressed all comments in latest force-push.

All instances of rm -rf -> rm -r
Removed pybind11 from propagatedBuildInputs
Removed all optional inputs from python3Packages.qiskit
Updated python3Packages.retworkx 0.8.0 -> 0.9.0

SuperSandro2000 · 2021-06-03T16:53:29Z

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 121606 run on x86_64-linux 1

16 packages built:

python38Packages.qiskit
python38Packages.qiskit-aer
python38Packages.qiskit-aqua
python38Packages.qiskit-ibmq-provider
python38Packages.qiskit-ignis
python38Packages.qiskit-terra
python38Packages.retworkx
python38Packages.yfinance
python39Packages.qiskit
python39Packages.qiskit-aer
python39Packages.qiskit-aqua
python39Packages.qiskit-ibmq-provider
python39Packages.qiskit-ignis
python39Packages.qiskit-terra
python39Packages.retworkx
python39Packages.yfinance

drewrisinger requested review from FRidh and jonringer as code owners May 3, 2021 17:57

github-actions bot added the 6.topic: python label May 3, 2021

ofborg bot requested a review from pandaman64 May 3, 2021 18:07

ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels May 3, 2021

drewrisinger force-pushed the dr-pr-qiskit-bump branch from 94f2904 to a2e74e1 Compare May 4, 2021 17:29

drewrisinger force-pushed the dr-pr-qiskit-bump branch from a2e74e1 to 9a36c86 Compare May 5, 2021 20:50

drewrisinger changed the title ~~python3Packages.qiskit: 0.25.0 -> 0.25.3~~ python3Packages.qiskit: 0.25.0 -> 0.25.4 May 5, 2021

rmcgibbo mentioned this pull request May 6, 2021

Add ability for users to @r-rmcgibbo rebuild to rebuild PR rmcgibbo/r-rmcgibbo#3

Open

drewrisinger force-pushed the dr-pr-qiskit-bump branch from 9a36c86 to ea8b476 Compare May 6, 2021 17:52

dotlambda reviewed May 7, 2021

View reviewed changes

pkgs/development/python-modules/qiskit-aer/default.nix Outdated Show resolved Hide resolved

pkgs/development/python-modules/qiskit-aer/default.nix Outdated Show resolved Hide resolved

rmcgibbo approved these changes May 7, 2021

View reviewed changes

drewrisinger force-pushed the dr-pr-qiskit-bump branch from ea8b476 to 9fd346b Compare May 11, 2021 16:10

drewrisinger changed the title ~~python3Packages.qiskit: 0.25.0 -> 0.25.4~~ python3Packages.qiskit: 0.25.0 -> 0.26.0 May 11, 2021

drewrisinger force-pushed the dr-pr-qiskit-bump branch from 9fd346b to efde42b Compare May 14, 2021 13:52

dotlambda reviewed May 23, 2021

View reviewed changes

pkgs/development/python-modules/qiskit-aer/default.nix Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

drewrisinger force-pushed the dr-pr-qiskit-bump branch from efde42b to 2c65958 Compare May 24, 2021 23:03

drewrisinger changed the title ~~python3Packages.qiskit: 0.25.0 -> 0.26.0~~ python3Packages.qiskit: 0.25.0 -> 0.26.2 May 25, 2021

drewrisinger requested a review from dotlambda May 25, 2021 17:53

This comment has been minimized.

Sign in to view

drewrisinger force-pushed the dr-pr-qiskit-bump branch from 2c65958 to bdffdd7 Compare May 27, 2021 12:34

SuperSandro2000 reviewed May 31, 2021

View reviewed changes

drewrisinger added a commit to drewrisinger/nur-packages that referenced this pull request Jun 1, 2021

python3Packages.retworkx: support darwin better

3efc787

Backports changes made to retworkx in NixOS/nixpkgs#121606 to support Darwin by adding a buildInput.

drewrisinger added a commit to drewrisinger/nur-packages that referenced this pull request Jun 1, 2021

python3Packages.retworkx: support darwin better

3a2526a

Backports changes made to retworkx in NixOS/nixpkgs#121606 to support Darwin by adding a buildInput.

drewrisinger added a commit to drewrisinger/nur-packages that referenced this pull request Jun 1, 2021

python3Packages.retworkx: support darwin better

ae7457d

Backports changes made to retworkx in NixOS/nixpkgs#121606 to support Darwin by adding a buildInput.

drewrisinger added 5 commits June 1, 2021 18:27

python3Packages.yfinance: 0.1.56 -> 0.1.59

bc9d055

python3Packages.qiskit-terra: 0.17.0 -> 0.17.4

d173e91

Also unbreak build on master by disabling tests that compare visual matplotlib images. Also remove force deletes from postCheck.

python3Packages.qiskit-ibmq-provider: 0.12.2 -> 0.13.1

bf1bad9

python3Packages.qiskit-aer: 0.8.0 -> 0.8.2

2d90781

Use a patch submitted via PR instead of custom substitute. Remove pybind11 install requirement, as requested by @dotlambda

drewrisinger added a commit to drewrisinger/nur-packages that referenced this pull request Jun 1, 2021

python3Packages.retworkx: fix darwin build

b731dd8

Backports changes made to retworkx in NixOS/nixpkgs#121606 to support Darwin by adding a buildInput.

drewrisinger force-pushed the dr-pr-qiskit-bump branch from bdffdd7 to 8cd0ba9 Compare June 2, 2021 00:10

drewrisinger added 3 commits June 1, 2021 20:12

python3Packages.qiskit-ignis: fix aarch64 build

7af8900

Also remove unused patch & unneeded docs delete (they're not in $out).

python3Packages.qiskit-aqua: 0.9.0 -> 0.9.1

6171c77

Remove unneeded docs delete, they're no longer in $out.

python3Packages.qiskit: 0.25.0 -> 0.26.2

bb6aec6

Add optional subpackages as arguments. Most of these are not in nixpkgs, but can be found in https://github.com/drewrisinger/nur-packages/.

drewrisinger force-pushed the dr-pr-qiskit-bump branch from 8cd0ba9 to bb6aec6 Compare June 2, 2021 00:13

drewrisinger added the backport release-21.05 label Jun 2, 2021

SuperSandro2000 removed the backport release-21.05 label Jun 3, 2021

SuperSandro2000 merged commit 5bba6db into NixOS:master Jun 3, 2021

drewrisinger deleted the dr-pr-qiskit-bump branch June 3, 2021 18:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

python3Packages.qiskit: 0.25.0 -> 0.26.2 #121606

python3Packages.qiskit: 0.25.0 -> 0.26.2 #121606

drewrisinger commented May 3, 2021 •

edited

Loading

r-rmcgibbo commented May 3, 2021 •

edited

Loading

rmcgibbo commented May 4, 2021

drewrisinger commented May 4, 2021

rmcgibbo commented May 6, 2021 •

edited

Loading

rmcgibbo commented May 6, 2021

drewrisinger commented May 6, 2021

drewrisinger commented May 7, 2021

rmcgibbo left a comment

risicle commented May 13, 2021

drewrisinger commented May 14, 2021

drewrisinger commented May 19, 2021

This comment has been minimized.

This comment has been minimized.

drewrisinger commented May 27, 2021

dotlambda commented May 27, 2021

dotlambda commented May 27, 2021

drewrisinger commented May 27, 2021

dotlambda commented May 27, 2021

drewrisinger commented Jun 2, 2021

SuperSandro2000 commented Jun 3, 2021

python3Packages.qiskit: 0.25.0 -> 0.26.2 #121606

python3Packages.qiskit: 0.25.0 -> 0.26.2 #121606

Conversation

drewrisinger commented May 3, 2021 • edited Loading

Motivation for this change

Things done

r-rmcgibbo commented May 3, 2021 • edited Loading

rmcgibbo commented May 4, 2021

drewrisinger commented May 4, 2021

rmcgibbo commented May 6, 2021 • edited Loading

rmcgibbo commented May 6, 2021

drewrisinger commented May 6, 2021

drewrisinger commented May 7, 2021

rmcgibbo left a comment

Choose a reason for hiding this comment

risicle commented May 13, 2021

drewrisinger commented May 14, 2021

drewrisinger commented May 19, 2021

This comment has been minimized.

This comment has been minimized.

drewrisinger commented May 27, 2021

dotlambda commented May 27, 2021

dotlambda commented May 27, 2021

drewrisinger commented May 27, 2021

dotlambda commented May 27, 2021

drewrisinger commented Jun 2, 2021

SuperSandro2000 commented Jun 3, 2021

drewrisinger commented May 3, 2021 •

edited

Loading

r-rmcgibbo commented May 3, 2021 •

edited

Loading

rmcgibbo commented May 6, 2021 •

edited

Loading