Skip to content
This repository was archived by the owner on Dec 7, 2021. It is now read-only.

Commit 4b9ef07

Browse files
Merge pull request #808 from manoelmarques/stable-0.6.4
[Stable] Release 0.6.4
2 parents a51f7db + 61f3ac6 commit 4b9ef07

File tree

10 files changed

+37
-26
lines changed

10 files changed

+37
-26
lines changed

.travis.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ python: 3.7
2626
env:
2727
global:
2828
- INIT_FILE="$TRAVIS_BUILD_DIR/qiskit/__init__.py"
29+
- DEPENDENCY_BRANCH=$(if [[ "$TRAVIS_BRANCH" == stable* ]]; then echo "stable"; else echo "master"; fi)
2930

3031
before_script:
3132
- |
@@ -96,51 +97,42 @@ matrix:
9697
- name: "Lint and Style check and Test Chemistry Python 3.7"
9798
if: tag IS blank
9899
env:
99-
- DEPENDENCY_BRANCH=$(if [[ "$TRAVIS_BRANCH" == stable* ]]; then echo "stable"; else echo "master"; fi)
100100
- TEST_DIR=chemistry
101101
script:
102102
make spell && make style && make lint && export OPENBLAS_NUM_THREADS=1 && python -m unittest discover -v test/chemistry
103-
- name: Test Chemistry Python 3.8"
103+
- name: "Test Chemistry Python 3.8"
104104
if: tag IS blank
105105
env:
106-
- DEPENDENCY_BRANCH=master
107106
- TEST_DIR=chemistry
108107
python: 3.8
109108
script:
110109
export OPENBLAS_NUM_THREADS=1 && python -m unittest discover -v test/chemistry
111110
- name: "Test Aqua Python 3.7"
112111
if: tag IS blank
113-
env: DEPENDENCY_BRANCH=$(if [[ "$TRAVIS_BRANCH" == stable* ]]; then echo "stable"; else echo "master"; fi)
114112
script: stestr --test-path test run --blacklist-file blacklist.txt
115113
- name: "Test Aqua Python 3.8"
116114
if: tag IS blank
117115
python: 3.8
118-
env: DEPENDENCY_BRANCH=master
119116
script: stestr --test-path test run --blacklist-file blacklist.txt
120117
- name: "Test Aqua 2 Python 3.7"
121118
if: tag IS blank
122-
env: DEPENDENCY_BRANCH=$(if [[ "$TRAVIS_BRANCH" == stable* ]]; then echo "stable"; else echo "master"; fi)
123119
script: stestr --test-path test run --whitelist-file selection.txt
124120
- name: "Test Aqua 2 Python 3.8"
125121
if: tag IS blank
126122
python: 3.8
127-
env: DEPENDENCY_BRANCH=master
128123
script: stestr --test-path test run --whitelist-file selection.txt
129124
- name: "Test Aqua 3 Python 3.7"
130125
if: tag IS blank
131-
env: DEPENDENCY_BRANCH=$(if [[ "$TRAVIS_BRANCH" == stable* ]]; then echo "stable"; else echo "master"; fi)
132126
script: stestr --test-path test run --whitelist-file selection2.txt
133127
- name: "Test Aqua 3 Python 3.8"
134128
if: tag IS blank
135129
python: 3.8
136-
env: DEPENDENCY_BRANCH=master
137130
script: stestr --test-path test run --whitelist-file selection2.txt
138131

139132
- if: tag IS present
140133
python: 3.6
141134
env:
142135
- TWINE_USERNAME=qiskit
143-
- DEPENDENCY_BRANCH=$(if [[ "$TRAVIS_BRANCH" == stable* ]]; then echo "stable"; else echo "master"; fi)
144136
install: pip install -U twine
145137
script:
146138
- python3 setup.py sdist bdist_wheel
@@ -149,6 +141,7 @@ matrix:
149141
before_install:
150142
- pip install -U 'pip<20.0.0'
151143
- pip install -U setuptools wheel
144+
- pip install -U numpy
152145
- |
153146
if [ -f $INIT_FILE ]; then
154147
# stops travis if __init__.py exists under qiskit
@@ -172,20 +165,20 @@ before_install:
172165
unzip /tmp/qiskit-ignis.zip -d /tmp/
173166
# Install local Qiskit Ignis
174167
pip install -e /tmp/qiskit-ignis-$DEPENDENCY_BRANCH --progress-bar off
175-
# Download github Qiskit Aer
176-
wget https://codeload.github.com/Qiskit/qiskit-aer/zip/$DEPENDENCY_BRANCH -O /tmp/qiskit-aer.zip
177-
unzip /tmp/qiskit-aer.zip -d /tmp/
178-
# Install Qiskit Aer requirements.
179-
pip install -U -r /tmp/qiskit-aer-$DEPENDENCY_BRANCH/requirements-dev.txt --progress-bar off
180-
# build Qiskit Aer
168+
# Clone Qiskit Aer
169+
git clone --recurse-submodules https://github.com/Qiskit/qiskit-aer.git /tmp/qiskit-aer-$DEPENDENCY_BRANCH
181170
cd /tmp/qiskit-aer-$DEPENDENCY_BRANCH
182-
python setup.py bdist_wheel -- -DCMAKE_CXX_COMPILER=g++-7 -- -j4
171+
# Install Qiskit Aer requirements.
172+
pip install -U -r requirements-dev.txt --progress-bar off
173+
# Build Qiskit Aer with Thrust OpenMP CPU backend
174+
python setup.py bdist_wheel -- -DCMAKE_CXX_COMPILER=g++-7 -DAER_THRUST_BACKEND=OMP -- -j4
183175
pip install dist/qiskit_aer*whl
184176
# back to current repo directory
185177
cd $TRAVIS_BUILD_DIR
186178
fi
187179
- |
188180
if [ "$TEST_DIR" == "chemistry" ]; then
181+
sudo apt-get -y install libgfortran5
189182
# download PyQuante master and unzip it
190183
wget https://codeload.github.com/rpmuller/pyquante2/zip/master -O /tmp/pyquante2.zip
191184
unzip /tmp/pyquante2.zip -d /tmp/

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,23 @@ Changelog](http://keepachangelog.com/en/1.0.0/).
1515
> - **Fixed**: for any bug fixes.
1616
> - **Security**: in case of vulnerabilities.
1717
18-
[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.6.3...HEAD)
18+
[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.6.4...HEAD)
1919
========================================================================
2020

21+
[0.6.4](https://github.com/Qiskit/qiskit-aqua/compare/0.6.3...0.6.4) - 2020-02-06
22+
=================================================================================
23+
24+
Changed
25+
-------
26+
27+
- Fix weighted_pauli_operator expectation value mode for Aer 0.4 release. (#808)
28+
- Update python 3.6 Gaussian driver. (#808)
29+
30+
Added
31+
-------
32+
33+
- Python 3.8 Gaussian drivers. (#808)
34+
2135
[0.6.3](https://github.com/Qiskit/qiskit-aqua/compare/0.6.2...0.6.3) - 2020-01-29
2236
=================================================================================
2337

qiskit/aqua/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.6.3
1+
0.6.4

qiskit/aqua/operators/weighted_pauli_operator.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# This code is part of Qiskit.
44
#
5-
# (C) Copyright IBM 2019.
5+
# (C) Copyright IBM 2019, 2020.
66
#
77
# This code is licensed under the Apache License, Version 2.0. You may
88
# obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -745,8 +745,11 @@ def evaluate_with_result(self, result, statevector_mode, use_simulator_snapshot_
745745
if use_simulator_snapshot_mode:
746746
snapshot_data = result.data(
747747
circuit_name_prefix + 'snapshot_mode')['snapshots']
748-
expval = snapshot_data['expectation_value']['expval'][0]['value']
749-
avg = expval[0] + 1j * expval[1]
748+
avg = snapshot_data['expectation_value']['expval'][0]['value']
749+
if isinstance(avg, (list, tuple)):
750+
# Aer versions before 0.4 use a list snapshot format
751+
# which must be converted to a complex value.
752+
avg = avg[0] + 1j * avg[1]
750753
elif statevector_mode:
751754
quantum_state = np.asarray(result.get_statevector(circuit_name_prefix + 'psi'))
752755
for weight, pauli in self._paulis:
Binary file not shown.
Binary file not shown.

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
modular, open-source library of quantum computing algorithms.
2222
Researchers can experiment with Aqua algorithms, on near-term quantum devices and simulators,
2323
and can also get involved by contributing new algorithms and algorithm-supporting objects,
24-
such as optimizers and variational forms. Qiskit Aqua is used by Qiskit Aqua Chemistry,
25-
Qiskit Aqua Machine Learning, and Qiskit Aqua Optimization to experiment with real-world applications to quantum computing."""
24+
such as optimizers and variational forms.
25+
Qiskit Aqua also contains application domain support in the form of Qiskit Chemistry,
26+
Qiskit Finance, Qiskit Machine Learning and Qiskit Optimization to experiment with real-world applications to quantum computing."""
2627

2728
requirements = [
2829
"qiskit-terra>=0.11.0",

test/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# This code is part of Qiskit.
44
#
5-
# (C) Copyright IBM 2018, 2019.
5+
# (C) Copyright IBM 2018, 2020.
66
#
77
# This code is licensed under the Apache License, Version 2.0. You may
88
# obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -24,4 +24,4 @@ def _noop(*args, **kargs):
2424
pass
2525

2626

27-
warnings.warn = _noop
27+
# warnings.warn = _noop

0 commit comments

Comments
 (0)