-
Notifications
You must be signed in to change notification settings - Fork 375
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
Remove aqua from benchmark #1189
Open
hhorii
wants to merge
16
commits into
Qiskit:main
Choose a base branch
from
hhorii:remove_aqua_from_benchmark
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
fdb25e0
remove aqua from benchmark
hhorii 56a6a64
Merge remote-tracking branch 'upstream/main' into remove_aqua_from_be…
hhorii b2948af
disable truncation
hhorii e6b9940
use aer_simulator correctly in benchmark
hhorii ba52df4
enable vqe application
hhorii aa87fdb
change asv files
hhorii 4d5b29c
fix typo and asv conf bugs
hhorii 63a05ef
remove unnecessary fileds from benchmarks
hhorii a27314e
support recent change related to noise model
hhorii 03999bd
renewed benchmarks
hhorii 90e860d
Merge remote-tracking branch 'upstream/main' into remove_aqua_from_be…
hhorii ba603f7
update benchmark document and correct units of time
hhorii 43a1b20
use time methods of asv
hhorii 429a6bf
Merge branch 'main' into remove_aqua_from_benchmark
hhorii c8ffe4a
Merge branch 'main' into remove_aqua_from_benchmark
hhorii d3d282d
Merge branch 'main' into remove_aqua_from_benchmark
hhorii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,27 +33,19 @@ | |
"install_command": [ | ||
"python -c \"import shutil; shutil.rmtree('{build_dir}/qiskit', True)\"", | ||
"python -c \"import shutil; shutil.rmtree('{build_dir}/qiskit_aer.egg-info', True)\"", | ||
"pip install git+https://github.com/Qiskit/qiskit-terra", | ||
"pip install git+https://github.com/Qiskit/qiskit-aqua", | ||
"pip install -U qiskit-terra", | ||
"python -mpip install {wheel_file}" | ||
], | ||
"uninstall_command": [ | ||
"return-code=any python -mpip uninstall -y qiskit-terra", | ||
"return-code=any python -mpip uninstall -y qiskit-aqua", | ||
"return-code=any python -mpip uninstall -y {project}" | ||
], | ||
"build_command": [ | ||
"python -mpip install -U scikit-build", | ||
"pip install git+https://github.com/Qiskit/qiskit-terra", | ||
"pip install git+https://github.com/Qiskit/qiskit-aqua", | ||
"pip install pyscf", | ||
"pip install matplotlib", | ||
"python setup.py bdist_wheel --dist-dir={build_cache_dir} -- -DCMAKE_CXX_COMPILER=g++ -- -j" | ||
], | ||
|
||
// List of branches to benchmark. If not provided, defaults to "main" | ||
// (for git) or "default" (for mercurial). | ||
// "branches": ["main"], // for git | ||
"branches": ["main"], // for git | ||
// "branches": ["default"], // for mercurial | ||
|
||
// The DVCS being used. If not set, it will be automatically | ||
|
@@ -155,15 +147,15 @@ | |
// The directory (relative to the current directory) that the html tree | ||
// should be written to. If not provided, defaults to "html". | ||
// "html_dir": "html", | ||
"html_dir": ".asv/html" | ||
"html_dir": ".asv/html", | ||
|
||
// The number of characters to retain in the commit hashes. | ||
// "hash_length": 8, | ||
|
||
// `asv` will cache results of the recent builds in each | ||
// environment, making them faster to install next time. This is | ||
// the number of builds to keep, per environment. | ||
// "build_cache_size": 2, | ||
"build_cache_size": 100000 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Heh, that's a lot of builds There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good catch :-) |
||
|
||
// The commits after which the regression search in `asv publish` | ||
// should start looking for regressions. Dictionary whose keys are | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,183 @@ | ||
// To use this configuration for running the benchmarks, we have to run asv like this: | ||
// $ asv --connfig asv.linux.conf.json | ||
{ | ||
// The version of the config file format. Do not change, unless | ||
// you know what you are doing. | ||
"version": 1, | ||
|
||
// The name of the project being benchmarked | ||
"project": "qiskit-aer", | ||
|
||
// The project's homepage | ||
"project_url": "http://qiskit.org/aer", | ||
|
||
// The URL or local path of the source code repository for the | ||
// project being benchmarked | ||
"repo": "../", | ||
|
||
// The Python project's subdirectory in your repo. If missing or | ||
// the empty string, the project is assumed to be located at the root | ||
// of the repository. | ||
// "repo_subdir": "", | ||
|
||
// Customizable commands for building, installing, and | ||
// uninstalling the project. See asv.conf.json documentation. | ||
// | ||
// "install_command": ["python -mpip install {wheel_file}"], | ||
// "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"], | ||
// "build_command": [ | ||
// "python setup.py build", | ||
// "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" | ||
// ], | ||
|
||
"install_command": [ | ||
"python -c \"import shutil; shutil.rmtree('{build_dir}/qiskit', True)\"", | ||
"python -c \"import shutil; shutil.rmtree('{build_dir}/qiskit_aer.egg-info', True)\"", | ||
"pip install -U qiskit-terra", | ||
"python -mpip install {wheel_file}" | ||
], | ||
"uninstall_command": [ | ||
"return-code=any python -mpip uninstall -y {project}" | ||
], | ||
"build_command": [ | ||
"python setup.py bdist_wheel --dist-dir={build_cache_dir} -- -DCMAKE_CXX_COMPILER=clang++ -- -j8" | ||
], | ||
|
||
// List of branches to benchmark. If not provided, defaults to "main" | ||
// (for git) or "default" (for mercurial). | ||
"branches": ["main"], // for git | ||
// "branches": ["default"], // for mercurial | ||
|
||
// The DVCS being used. If not set, it will be automatically | ||
// determined from "repo" by looking at the protocol in the URL | ||
// (if remote), or by looking for special directories, such as | ||
// ".git" (if local). | ||
// "dvcs": "git", | ||
|
||
// The tool to use to create environments. May be "conda", | ||
// "virtualenv" or other value depending on the plugins in use. | ||
// If missing or the empty string, the tool will be automatically | ||
// determined by looking for tools on the PATH environment | ||
// variable. | ||
"environment_type": "conda", | ||
|
||
// timeout in seconds for installing any dependencies in environment | ||
// defaults to 10 min | ||
//"install_timeout": 600, | ||
|
||
// the base URL to show a commit for the project. | ||
// "show_commit_url": "http://github.com/owner/project/commit/", | ||
|
||
// The Pythons you'd like to test against. If not provided, defaults | ||
// to the current version of Python used to run `asv`. | ||
// "pythons": ["3.7", "3.8", "3.9"], | ||
|
||
// The list of conda channel names to be searched for benchmark | ||
// dependency packages in the specified order | ||
// "conda_channels": ["conda-forge", "defaults"] | ||
|
||
// The matrix of dependencies to test. Each key is the name of a | ||
// package (in PyPI) and the values are version numbers. An empty | ||
// list or empty string indicates to just test against the default | ||
// (latest) version. null indicates that the package is to not be | ||
// installed. If the package to be tested is only available from | ||
// PyPi, and the 'environment_type' is conda, then you can preface | ||
// the package name by 'pip+', and the package will be installed via | ||
// pip (with all the conda available packages installed first, | ||
// followed by the pip installed packages). | ||
// | ||
// "matrix": { | ||
// "numpy": ["1.6", "1.7"], | ||
// "six": ["", null], // test with and without six installed | ||
// "pip+emcee": [""], // emcee is only available for install with pip. | ||
// }, | ||
|
||
//"matrix": { | ||
// "pip+qiskit-terra": [""], | ||
//}, | ||
|
||
// Combinations of libraries/python versions can be excluded/included | ||
// from the set to test. Each entry is a dictionary containing additional | ||
// key-value pairs to include/exclude. | ||
// | ||
// An exclude entry excludes entries where all values match. The | ||
// values are regexps that should match the whole string. | ||
// | ||
// An include entry adds an environment. Only the packages listed | ||
// are installed. The 'python' key is required. The exclude rules | ||
// do not apply to includes. | ||
// | ||
// In addition to package names, the following keys are available: | ||
// | ||
// - python | ||
// Python version, as in the *pythons* variable above. | ||
// - environment_type | ||
// Environment type, as above. | ||
// - sys_platform | ||
// Platform, as in sys.platform. Possible values for the common | ||
// cases: 'linux2', 'win32', 'cygwin', 'darwin'. | ||
// | ||
// "exclude": [ | ||
// {"python": "3.2", "sys_platform": "win32"}, // skip py3.2 on windows | ||
// {"environment_type": "conda", "six": null}, // don't run without six on conda | ||
// ], | ||
// | ||
// "include": [ | ||
// // additional env for python2.7 | ||
// {"python": "2.7", "numpy": "1.8"}, | ||
// // additional env if run on windows+conda | ||
// {"platform": "win32", "environment_type": "conda", "python": "2.7", "libpython": ""}, | ||
// ], | ||
|
||
// The directory (relative to the current directory) that benchmarks are | ||
// stored in. If not provided, defaults to "benchmarks" | ||
"benchmark_dir": "benchmark", | ||
|
||
|
||
// The directory (relative to the current directory) to cache the Python | ||
// environments in. If not provided, defaults to "env" | ||
// "env_dir": "env", | ||
"env_dir": ".asv/envs", | ||
|
||
// The directory (relative to the current directory) that raw benchmark | ||
// results are stored in. If not provided, defaults to "results". | ||
// "results_dir": "results", | ||
"results_dir": ".asv/results", | ||
|
||
// The directory (relative to the current directory) that the html tree | ||
// should be written to. If not provided, defaults to "html". | ||
// "html_dir": "html", | ||
"html_dir": ".asv/html", | ||
|
||
// The number of characters to retain in the commit hashes. | ||
// "hash_length": 8, | ||
|
||
// `asv` will cache results of the recent builds in each | ||
// environment, making them faster to install next time. This is | ||
// the number of builds to keep, per environment. | ||
"build_cache_size": 100000 | ||
|
||
// The commits after which the regression search in `asv publish` | ||
// should start looking for regressions. Dictionary whose keys are | ||
// regexps matching to benchmark names, and values corresponding to | ||
// the commit (exclusive) after which to start looking for | ||
// regressions. The default is to start from the first commit | ||
// with results. If the commit is `null`, regression detection is | ||
// skipped for the matching benchmark. | ||
// | ||
// "regressions_first_commits": { | ||
// "some_benchmark": "352cdf", // Consider regressions only after this commit | ||
// "another_benchmark": null, // Skip regression detection altogether | ||
// }, | ||
|
||
// The thresholds for relative change in results, after which `asv | ||
// publish` starts reporting regressions. Dictionary of the same | ||
// form as in ``regressions_first_commits``, with values | ||
// indicating the thresholds. If multiple entries match, the | ||
// maximum is taken. If no entry matches, the default is 5%. | ||
// | ||
// "regressions_thresholds": { | ||
// "some_benchmark": 0.01, // Threshold of 1% | ||
// "another_benchmark": 0.5, // Threshold of 50% | ||
// }, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +0,0 @@ | ||
from .simulator_benchmark import SimulatorBenchmarkSuite | ||
from .basic import BasicSimulatorBenchmarkSuite | ||
from .noise import NoiseSimulatorBenchmarkSuite | ||
from .output import OutputSimulatorBenchmarkSuite | ||
from .circuit_library_circuits import CircuitLibraryCircuits | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm wondering if we want to use
matrix
here to list qiskit-terra at a specific version so the benchmark results are tied to the qiskit-terra version (so if we bump the terra version in the matrix it shows as different from earlier runs).