From 61044571b76d87a2eec42d36c9b7addf3e66e000 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Feb 2023 03:55:42 +0000 Subject: gentoo auto-resync : 26:02:2023 - 03:55:42 --- dev-python/qiskit-aer/Manifest | 3 +- .../files/qiskit-aer-0.11.2-terra-test.patch | 45 ++++++++++++++++++++++ dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild | 36 +++++++++-------- 3 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch (limited to 'dev-python/qiskit-aer') diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest index 7f1eb358be78..8dec90289572 100644 --- a/dev-python/qiskit-aer/Manifest +++ b/dev-python/qiskit-aer/Manifest @@ -1,4 +1,5 @@ AUX qiskit-aer-0.10.3-remove-cmake-dependency.patch 253 BLAKE2B 7b5da68c4a6c64ea4b3f0a0ff1a52294783762d8b34f3b7facbbe5bb2657b5cbe0e502ed01ea6c1b4135985391c5d6bc8fccfc34164bb6a88bbaf1e3aa9b3968 SHA512 6d9a14d7c04292efcbb3f7f8abdfa1f1efeeeb081b5775f01162f95fcc9c0f6465863058dd88374b0bb2525dc4fdc3b7408100b3ac990109554b2d77b3a93223 +AUX qiskit-aer-0.11.2-terra-test.patch 1728 BLAKE2B bafee3006858ff064285f95a6c275ef83794eb6650b02964b043a6a3f0bd0c3aeaeffc854404ce19d89277328374486e5483d78c22583485b93ffa65b877420d SHA512 9d84dec047247d152aaad053633d0d88cc3cc02e621a1a409a73aa84f502748609abe57657058bf2bc6c0818b6385734556d1ef60a2ea2cfa9019c74208286b1 DIST qiskit-aer-0.11.2.gh.tar.gz 6707283 BLAKE2B ae32a469d23a31f202b9f970c59e9efb76c290243bce6179b0a58590d671f6dec0428245131e7cb2966b818dae9fbe7e7078a63fac107572e9e7d4a66e47a539 SHA512 48b28f6c54c898bb3984062ec772373e90899fd436c8e00f0c4abd57b6b98ea6c647283445fe551bd516483b66d25c9861ef519f01a0d1ddc6b3ddbce07bc56a -EBUILD qiskit-aer-0.11.2-r1.ebuild 2653 BLAKE2B e289b50039ca081b83034f044d0e9bb392d92bf2172e5211693cd4bb2b4ac55712bc81dbb241362a3025c0809a82c88462d8a5a233218b2c92b451195752b41e SHA512 44cbaa0a59e72b11ad91c21b6eff01110b330d39be108b227d1faa6462ada34b8f55f46265994708e6137f0366a4cb5579a1c631a9c73c2e0315169d232d2d8b +EBUILD qiskit-aer-0.11.2-r1.ebuild 3018 BLAKE2B b3f17b2018fa0f22f427632010430e4b1dde4a26e2b5636ded1b391656590fed5322ab8ef014b928a34f69b5ea41b20acc9a4c59d6b60056d27a505bd0130d9c SHA512 dde6e31c11fa5892500a6ae06f3d46a1fc0bf5d2441004eef47bf31f9af878403008afc90d920e6d8343b5d51d7a5493e0445957566fe84ea14eb08b310245de MISC metadata.xml 1049 BLAKE2B e2118dc211ac8f42115959dde943a32331b4186524ef4a5a1343d8798a329e1d0de5f9a52a9c1212ec6af39392993378c6422424488782747ffbf4ab1e63d25e SHA512 bc4c9a19376938e973bedbdff0bbe95edb98c78b75d03f2a12985558a5cd5d0ceb934c43371438dd597a8d4fb8879d5483aeb8d806ac4d9b73b704d1232086b8 diff --git a/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch b/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch new file mode 100644 index 000000000000..e9f65dd6a42a --- /dev/null +++ b/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch @@ -0,0 +1,45 @@ +https://github.com/Qiskit/qiskit-aer/commit/cec5c11513118fa8d701e2bef1376dc3db7263c3 + +From cec5c11513118fa8d701e2bef1376dc3db7263c3 Mon Sep 17 00:00:00 2001 +From: Jun Doi +Date: Fri, 27 Jan 2023 18:55:59 +0900 +Subject: [PATCH] Fix test_aer_statevector (#1710) + +* fix test_aer_statevector + +* add plot directive to docs + +* fix test_aer_statevector and remove reno + +Co-authored-by: Hiroshi Horii +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -67,6 +67,7 @@ extensions = [ + 'sphinx_tabs.tabs', + 'jupyter_sphinx', + 'reno.sphinxext', ++ 'matplotlib.sphinxext.plot_directive', + ] + html_static_path = ['_static'] + templates_path = ['_templates'] +--- a/test/terra/states/test_aer_statevector.py ++++ b/test/terra/states/test_aer_statevector.py +@@ -1347,13 +1347,14 @@ class TestAerStatevector(common.QiskitAerTestCase): + ([-1, 1j], ["-", "+i"]), + ([1e-16 + 1j], ["i"]), + ([-1 + 1e-16 * 1j], ["-"]), +- ([-1, -1 - 1j], ["-", "+ (-1 - i)"]), ++ ([-1, -1 - 1j], ["-", "+(-1 - i)"]), + ([np.sqrt(2) / 2, np.sqrt(2) / 2], ["\\frac{\\sqrt{2}}{2}", "+\\frac{\\sqrt{2}}{2}"]), + ([1 + np.sqrt(2)], ["(1 + \\sqrt{2})"]), + ] +- for numbers, latex_terms in cases: +- terms = numbers_to_latex_terms(numbers) +- self.assertListEqual(terms, latex_terms) ++ with self.assertWarns(DeprecationWarning): ++ for numbers, latex_terms in cases: ++ terms = numbers_to_latex_terms(numbers, 15) ++ self.assertListEqual(terms, latex_terms) + + def test_statevector_draw_latex_regression(self): + """Test numerical rounding errors are not printed""" diff --git a/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild index f9de54e64534..07d45fbdb52d 100644 --- a/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild +++ b/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 +inherit distutils-r1 multiprocessing DESCRIPTION="High performance simulator for quantum circuits that includes noise models" HOMEPAGE=" @@ -35,7 +35,11 @@ DEPEND=" virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso] " - +RDEPEND=" + ${DEPEND} + >=dev-python/qiskit-terra-0.21.0[${PYTHON_USEDEP}] + >=dev-python/scipy-1.0[${PYTHON_USEDEP}] +" BDEPEND=" >=dev-util/cmake-3.17 >=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}] @@ -43,21 +47,19 @@ BDEPEND=" test? ( dev-python/ddt[${PYTHON_USEDEP}] dev-python/fixtures[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " -RDEPEND=" - ${DEPEND} - >=dev-python/qiskit-terra-0.21.0[${PYTHON_USEDEP}] - >=dev-python/scipy-1.0[${PYTHON_USEDEP}] -" +PATCHES=( + # Remove cmake dependency from setup.py because of + # invalid dependency description. We put this dependency check in BDEPEND. + "${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch" + "${FILESDIR}/qiskit-aer-0.11.2-terra-test.patch" +) distutils_enable_tests pytest -# Remove cmake dependency from setup.py because of -# invalid dependency description. We put this dependency check in BDEPEND. -PATCHES=( "${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch" ) - check_openblas() { local libdir=$(get_libdir) me="openblas" @@ -75,7 +77,7 @@ check_openblas() { pkg_setup() { if use test; then check_openblas - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then die "Set blas implementation to openblas using 'eselect blas set openblas'!" fi fi @@ -92,11 +94,15 @@ python_prepare_all() { python_test() { local EPYTEST_DESELECT=( # TODO - test/terra/states/test_aer_statevector.py::TestAerStatevector::test_number_to_latex_terms + test/terra/states/test_aer_statevector.py::TestAerStatevector::test_drawings + + # TODO: GLIBCXX_ASSERTIONS, bug #897758 + test/terra/backends/aer_simulator/test_algorithms.py::TestAlgorithms::test_extended_stabilizer_sparse_output_probs + test/terra/backends/aer_simulator/test_options.py::TestOptions::test_mps_options ) rm -rf qiskit_aer || die - epytest -s + epytest -n "$(makeopts_jobs)" -s } pkg_postinst() { -- cgit v1.2.3