Add job_time #160

KetpuntoG · 2021-11-19T15:58:59Z

…iskit into job_time

codecov · 2021-11-19T16:03:00Z

Codecov Report

Merging #160 (c2223bc) into master (a96e313) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##            master      #160   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            7         7           
  Lines          300       313   +13     
=========================================
+ Hits           300       313   +13

Impacted Files	Coverage Δ
pennylane_qiskit/ibmq.py	`100.00% <100.00%> (ø)`
pennylane_qiskit/qiskit_device.py	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a96e313...c2223bc. Read the comment docs.

antalszava · 2021-11-19T21:54:26Z

[sc-11508]

rmoyard

@KetpuntoG Thanks for the PR, it is working as expected but I don't like the empty function for qiskit_device. Could we delete _track_run in the qiskit_device and redefine batch_execute in the IBMQDevice. Something like

def batch_execute(self, circuits):
         super().(circuits)
         if self.tracker.active:
                  self._track_run()

should be working, let me know if it is the case !

rmoyard · 2021-11-23T18:54:06Z

tests/test_ibmq.py

+        return qml.probs(wires=0)
+
+    circuit()
+    assert "job_time" in dev.tracker.history


Could we check that the element job_time in dev.tracker.history have the expected form? (Dictionary containing creating, validating, queued and running)

rmoyard · 2021-11-23T19:01:58Z

pennylane_qiskit/qiskit_device.py

@@ -397,6 +396,9 @@ def batch_execute(self, circuits):
        self._current_job = self.backend.run(compiled_circuits, shots=self.shots, **self.run_args)
        result = self._current_job.result()

+        if self.tracker.active:


Could we move this to line 416?

if self.tracker.active: self._track_run() self.tracker.update(batches=1, batch_len=len(circuits)) self.tracker.record()

rmoyard · 2021-11-24T16:02:24Z

@KetpuntoG Great changes, can you just add it to the changelog 💯

KetpuntoG · 2021-11-24T16:27:30Z

Now I'll add to the chagelog :) I find it strange that I pass the tests in python 3.7 and 3.9 but not in 3.8, do you know why it could be @rmoyard ?

KetpuntoG · 2021-11-24T17:44:19Z

#109

rmoyard

Thanks @KetpuntoG it looks good to me 👍

* commit * black * test * checking coverage * reset test * qasm_simulator * test * test * change * update * record * Romain changes * Update ibmq.py * final change * Update test_ibmq.py * Update CHANGELOG.md Co-authored-by: Romain <[email protected]>

* Small change. * Update header.html * Add native support for the SX gate (#158) * Add SX support * changelog * SX inverse tests * Define the `QiskitDevice.batch_execute` method (#156) * first draft * license * apply; compile in the method * statevector & batch generate samples * docstrings * tests * batch_params check & check call count for batch_execute * IBMQ check * docstrings * batch execution pipeline test for gradient computation * IBMQ grad test * state * no single tape case; re-add basis state prep to the test * name and docstring * renames * comment * docstrings, names * remove unnecessary reset * Update pennylane_qiskit/qiskit_device.py Co-authored-by: Romain <[email protected]> * Update pennylane_qiskit/qiskit_device.py Co-authored-by: Romain <[email protected]> Co-authored-by: Romain <[email protected]> * Update the batch execution tests to use the new QNode (#159) * batch execute call counter * get PennyLane master * comment * flaky * Update test_expval.py * more flaky Co-authored-by: Romain <[email protected]> * Change token for IBMQ tests (#161) * Small change. * Change token. * Add env. * Not device test. * Batch execute twice * Add job_time (#160) * commit * black * test * checking coverage * reset test * qasm_simulator * test * test * change * update * record * Romain changes * Update ibmq.py * final change * Update test_ibmq.py * Update CHANGELOG.md Co-authored-by: Romain <[email protected]> * Add the `qml.Identity` operation to PennyLane-Qiskit (#162) * Add the qml.Identity gate to the Qiskit plugin * Add Identity to converter test * Fix pylint:f-string in qiskit_device.py * Changelog & additional test * Update CHANGELOG.md Co-authored-by: Romain <[email protected]> * Fix `batch_execute` output type for QNodes with multiple outputs (#163) * asarray * check type * changelog * Update the tracker used with batch execution (#167) * tracker test * changelog * Update tests/test_integration.py Co-authored-by: Romain <[email protected]> Co-authored-by: Romain <[email protected]> * Update header.html * Python 3.10 (#170) * changelog & tests * changelog * Version bump (#168) * Version bump s Please enter the commit message for your changes. Lines starting * add pl version Co-authored-by: Josh Izaac <[email protected]> * v0.21.0-dev version bump (#172) * inc version * add flaky * Improve token-specified login flow. (#169) * Test that we can create multiple IBMQ devices using an environment token. * Improve token-specified login flow. * Fix formatting. * extend skipping logic * Test token login elision. * Temporarily restrict code coverage analysis. * Update changelog. * Fix formatting. * more no cover for the IBMQ device * Update tests/test_ibmq.py Co-authored-by: antalszava <[email protected]> * Update tests/test_ibmq.py Co-authored-by: antalszava <[email protected]> * Update test_ibmq.py Co-authored-by: Antal Szava <[email protected]> * Change IBMQ login (#175) * Small change. * Change test. * Test. * Update. * Change tests. * Fix bugs for the trainable arguments update (#177) * Small change. * Tests * Exchange. * Update. * Update. * Add circuit-runner, sampler and custom VQE programs from Qiskit-Runtime (#157) * Small change. * First commit * Working circuit runner. * Sampler * Sampler * VQE is working. * Headers. * Update for batches. * Update docstrigs. * CodeFactor. * Add tests for runtime. * Tests. * Test. * Test circuit runner. * Test Sampler. * Correct generate_samples * Add entry points. * More shots. * Add token arg. * Change import * Change Sampler sample. * Circuit runner kwargs test. * Shots kwargs * Change import. * Add kwargs Sampler test. * Import. * Impport again. * Import change * Add test tracker. * Update track tests. * Update tracker runtime. * Update tracker. * Update. * Codfactor changes. * Update. * Update codefactor * More codefactor. * Add callback * Update * Move vqe * Update. * Add test VQE. * Update. * delete * Update VQE test. * Add shots. * Update test * Update delete * Unused import. * More iteration. * m * Change tol. * More VQE tests. * Black * Update. * Update. * Update * Update pennylane_qiskit/vqe/__init__.py Co-authored-by: antalszava <[email protected]> * Update from review. * Update tests. * Typo. * Update from tests. * Runtime updated. * Runtime updated. * Update vqe * Update * Update from Antal review. * Update * Black. * More test. * Update parameters * Codefactor update. * Update. * Update. * Change order jac. * Typo. * Params. * Update tests. * ValueError. * print * Update. * Tol. * Update review. * Add doc. * Unused variable. * Update tests. * Update params. * Update review. * Readd mthree * Typo. * Path. * Black * Change path. * Update runtime_programs/vqe_runtime_program.py * Update doc/devices/runtime.rst Co-authored-by: antalszava <[email protected]> * Update review. * coverarc * coverarc omit + skip IBMQ and Runtime tests * Changelog Co-authored-by: antalszava <[email protected]> * Add and change some docstrings for a better quality (#174) * Small change. * First check. * Typo. * Add link. * Change. * Change. * Update pennylane_qiskit/qiskit_device.py * Update from review. * Typo * Update docstring transpiler. * Update. Co-authored-by: antalszava <[email protected]> * Changes. * Review * Review * Wrong changelog number Co-authored-by: Josh Izaac <[email protected]> Co-authored-by: antalszava <[email protected]> Co-authored-by: Guillermo Alonso-Linaje <[email protected]> Co-authored-by: David Ittah <[email protected]> Co-authored-by: Jay Soni <[email protected]> Co-authored-by: Tanner Rogalsky <[email protected]>

* changelog and bump version * Change callback function for Sicpy intermediate results (#187) * Small change. * Update header.html * Add native support for the SX gate (#158) * Add SX support * changelog * SX inverse tests * Define the `QiskitDevice.batch_execute` method (#156) * first draft * license * apply; compile in the method * statevector & batch generate samples * docstrings * tests * batch_params check & check call count for batch_execute * IBMQ check * docstrings * batch execution pipeline test for gradient computation * IBMQ grad test * state * no single tape case; re-add basis state prep to the test * name and docstring * renames * comment * docstrings, names * remove unnecessary reset * Update pennylane_qiskit/qiskit_device.py Co-authored-by: Romain <[email protected]> * Update pennylane_qiskit/qiskit_device.py Co-authored-by: Romain <[email protected]> Co-authored-by: Romain <[email protected]> * Update the batch execution tests to use the new QNode (#159) * batch execute call counter * get PennyLane master * comment * flaky * Update test_expval.py * more flaky Co-authored-by: Romain <[email protected]> * Change token for IBMQ tests (#161) * Small change. * Change token. * Add env. * Not device test. * Batch execute twice * Add job_time (#160) * commit * black * test * checking coverage * reset test * qasm_simulator * test * test * change * update * record * Romain changes * Update ibmq.py * final change * Update test_ibmq.py * Update CHANGELOG.md Co-authored-by: Romain <[email protected]> * Add the `qml.Identity` operation to PennyLane-Qiskit (#162) * Add the qml.Identity gate to the Qiskit plugin * Add Identity to converter test * Fix pylint:f-string in qiskit_device.py * Changelog & additional test * Update CHANGELOG.md Co-authored-by: Romain <[email protected]> * Fix `batch_execute` output type for QNodes with multiple outputs (#163) * asarray * check type * changelog * Update the tracker used with batch execution (#167) * tracker test * changelog * Update tests/test_integration.py Co-authored-by: Romain <[email protected]> Co-authored-by: Romain <[email protected]> * Update header.html * Python 3.10 (#170) * changelog & tests * changelog * Version bump (#168) * Version bump s Please enter the commit message for your changes. Lines starting * add pl version Co-authored-by: Josh Izaac <[email protected]> * v0.21.0-dev version bump (#172) * inc version * add flaky * Improve token-specified login flow. (#169) * Test that we can create multiple IBMQ devices using an environment token. * Improve token-specified login flow. * Fix formatting. * extend skipping logic * Test token login elision. * Temporarily restrict code coverage analysis. * Update changelog. * Fix formatting. * more no cover for the IBMQ device * Update tests/test_ibmq.py Co-authored-by: antalszava <[email protected]> * Update tests/test_ibmq.py Co-authored-by: antalszava <[email protected]> * Update test_ibmq.py Co-authored-by: Antal Szava <[email protected]> * Change IBMQ login (#175) * Small change. * Change test. * Test. * Update. * Change tests. * Fix bugs for the trainable arguments update (#177) * Small change. * Tests * Exchange. * Update. * Update. * Add circuit-runner, sampler and custom VQE programs from Qiskit-Runtime (#157) * Small change. * First commit * Working circuit runner. * Sampler * Sampler * VQE is working. * Headers. * Update for batches. * Update docstrigs. * CodeFactor. * Add tests for runtime. * Tests. * Test. * Test circuit runner. * Test Sampler. * Correct generate_samples * Add entry points. * More shots. * Add token arg. * Change import * Change Sampler sample. * Circuit runner kwargs test. * Shots kwargs * Change import. * Add kwargs Sampler test. * Import. * Impport again. * Import change * Add test tracker. * Update track tests. * Update tracker runtime. * Update tracker. * Update. * Codfactor changes. * Update. * Update codefactor * More codefactor. * Add callback * Update * Move vqe * Update. * Add test VQE. * Update. * delete * Update VQE test. * Add shots. * Update test * Update delete * Unused import. * More iteration. * m * Change tol. * More VQE tests. * Black * Update. * Update. * Update * Update pennylane_qiskit/vqe/__init__.py Co-authored-by: antalszava <[email protected]> * Update from review. * Update tests. * Typo. * Update from tests. * Runtime updated. * Runtime updated. * Update vqe * Update * Update from Antal review. * Update * Black. * More test. * Update parameters * Codefactor update. * Update. * Update. * Change order jac. * Typo. * Params. * Update tests. * ValueError. * print * Update. * Tol. * Update review. * Add doc. * Unused variable. * Update tests. * Update params. * Update review. * Readd mthree * Typo. * Path. * Black * Change path. * Update runtime_programs/vqe_runtime_program.py * Update doc/devices/runtime.rst Co-authored-by: antalszava <[email protected]> * Update review. * coverarc * coverarc omit + skip IBMQ and Runtime tests * Changelog Co-authored-by: antalszava <[email protected]> * Add and change some docstrings for a better quality (#174) * Small change. * First check. * Typo. * Add link. * Change. * Change. * Update pennylane_qiskit/qiskit_device.py * Update from review. * Typo * Update docstring transpiler. * Update. Co-authored-by: antalszava <[email protected]> * Changes. * Review * Review * Wrong changelog number Co-authored-by: Josh Izaac <[email protected]> Co-authored-by: antalszava <[email protected]> Co-authored-by: Guillermo Alonso-Linaje <[email protected]> Co-authored-by: David Ittah <[email protected]> Co-authored-by: Jay Soni <[email protected]> Co-authored-by: Tanner Rogalsky <[email protected]> * Update CHANGELOG.md Co-authored-by: Romain <[email protected]> Co-authored-by: Josh Izaac <[email protected]> Co-authored-by: Guillermo Alonso-Linaje <[email protected]> Co-authored-by: David Ittah <[email protected]> Co-authored-by: Jay Soni <[email protected]> Co-authored-by: Tanner Rogalsky <[email protected]>

KetpuntoG added 4 commits November 19, 2021 16:57

commit

7600b17

Merge branch 'master' into job_time

ac57002

black

e5e35af

Merge branch 'job_time' of https://github.com/PennyLaneAI/pennylane-q…

65d5ff4

…iskit into job_time

KetpuntoG and others added 8 commits November 22, 2021 09:52

test

c76cd07

checking coverage

63064b4

reset test

dc2da00

qasm_simulator

380d071

test

d2b77f6

test

a8e8345

change

132f5bb

Merge branch 'master' into job_time

a350d33

rmoyard self-requested a review November 22, 2021 20:02

KetpuntoG added 2 commits November 23, 2021 11:40

update

e3228b6

record

b4f189d

rmoyard changed the title ~~[WIP] add job_time~~ Add job_time Nov 23, 2021

rmoyard reviewed Nov 23, 2021

View reviewed changes

KetpuntoG added 4 commits November 24, 2021 15:09

Romain changes

75ea1fe

Update ibmq.py

23da2fc

final change

90fc6d5

Update test_ibmq.py

2a62542

Update CHANGELOG.md

c2223bc

rmoyard approved these changes Nov 24, 2021

View reviewed changes

rmoyard merged commit d6eff6e into master Nov 24, 2021

rmoyard deleted the job_time branch November 24, 2021 20:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add job_time #160

Add job_time #160

KetpuntoG commented Nov 19, 2021 •

edited by antalszava

Loading

codecov bot commented Nov 19, 2021 •

edited

Loading

antalszava commented Nov 19, 2021

rmoyard left a comment

rmoyard Nov 23, 2021

rmoyard Nov 23, 2021

rmoyard commented Nov 24, 2021

KetpuntoG commented Nov 24, 2021

KetpuntoG commented Nov 24, 2021

rmoyard left a comment

Add job_time #160

Add job_time #160

Conversation

KetpuntoG commented Nov 19, 2021 • edited by antalszava Loading

codecov bot commented Nov 19, 2021 • edited Loading

Codecov Report

antalszava commented Nov 19, 2021

rmoyard left a comment

Choose a reason for hiding this comment

rmoyard Nov 23, 2021

Choose a reason for hiding this comment

rmoyard Nov 23, 2021

Choose a reason for hiding this comment

rmoyard commented Nov 24, 2021

KetpuntoG commented Nov 24, 2021

KetpuntoG commented Nov 24, 2021

rmoyard left a comment

Choose a reason for hiding this comment

KetpuntoG commented Nov 19, 2021 •

edited by antalszava

Loading

codecov bot commented Nov 19, 2021 •

edited

Loading