Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into profile-thresholds
Browse files Browse the repository at this point in the history
  • Loading branch information
hhorii committed Mar 17, 2021
2 parents ec53496 + 7e6ed61 commit c27a8ab
Show file tree
Hide file tree
Showing 354 changed files with 31,561 additions and 18,905 deletions.
18 changes: 8 additions & 10 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@

# Generic rule for the repository. This pattern is actually the one that will
# apply unless specialized by a later rule
* @chriseclectic @atilag
* @chriseclectic @vvilpas

# Individual folders on root directory
/qiskit @chriseclectic @atilag @vvilpas
/cmake @atilag @vvilpas
/doc @chriseclectic @atilag @vvilpas
/examples @chriseclectic @atilag @vvilpas
/contrib @chriseclectic @atilag @vvilpas
/test @chriseclectic @atilag @vvilpas
/src @chriseclectic @atilag @vvilpas

# AER specific folders
/qiskit @chriseclectic @vvilpas @mtreinish
/test @chriseclectic @vvilpas @mtreinish
/doc @chriseclectic @vvilpas @mtreinish
/releasenotes @chriseclectic @vvilpas @mtreinish
/cmake @vvilpas
/contrib @chriseclectic @vvilpas @hhorii
/src @chriseclectic @vvilpas @hhorii
87 changes: 87 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Build
on:
push:
branches: [master, 'stable/*']
pull_request:
branches: [master, 'stable/*']
jobs:
standalone:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install deps
run: pip install "conan>=1.31.2"
- name: Install openblas
run: |
set -e
sudo apt-get update
sudo apt-get install -y libopenblas-dev
shell: bash
if: runner.os == 'Linux'
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
if: runner.os == 'Windows'
- name: Compile Standalone Windows
run: |
set -e
mkdir out; cd out; cmake .. -DBUILD_TESTS=1
cmake --build . --config Release
shell: bash
if: runner.os == 'Windows'
- name: Compile Standalone
run: |
set -e
mkdir out; cd out; cmake .. -DBUILD_TESTS=1
make
shell: bash
if: runner.os != 'Windows'
- name: Run Unit Tests
run: |
cd out/bin
for test in test*
do echo $test
if ! ./$test
then
ERR=1
fi
done
if [ ! -z "$ERR" ]
then
exit 1
fi
shell: bash
wheel:
runs-on: ${{ matrix.os }}
needs: ["standalone"]
strategy:
matrix:
os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
steps:
- uses: actions/checkout@v2
- name: Set up Python Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
if: runner.os == 'Windows'
- name: Install deps
run: python -m pip install -U cibuildwheel==1.9.0
- name: Build Wheels
env:
CIBW_BEFORE_ALL_LINUX: "yum install -y openblas-devel"
CIBW_SKIP: "cp27-* cp34-* cp35-* pp*"
CIBW_TEST_COMMAND: "python {project}/tools/verify_wheels.py"
CIBW_TEST_REQUIRES: "git+https://github.com/Qiskit/qiskit-terra.git"
CIBW_ENVIRONMENT_WINDOWS: "CMAKE_GENERATOR='Visual Studio 16 2019'"
run: cibuildwheel --output-dir wheelhouse
- uses: actions/upload-artifact@v2
with:
path: ./wheelhouse/*.whl
49 changes: 35 additions & 14 deletions .github/workflows/wheels.yml → .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Deploy
on:
push:
tags:
Expand All @@ -8,7 +8,7 @@ jobs:
name: Build qiskit-aer wheels
strategy:
matrix:
os: ["macOS-latest", "ubuntu-latest"]
os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -18,16 +18,14 @@ jobs:
python-version: '3.7'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==1.5.5
python -m pip install cibuildwheel==1.9.0
- name: Build wheels
env:
CIBW_BEFORE_ALL_LINUX: "yum install -y openblas-devel"
CIBW_BEFORE_BUILD: "pip install -U Cython pip virtualenv pybind11"
CIBW_SKIP: "cp27-* cp34-* cp35-* pp*"
CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2010"
CIBW_MANYLINUX_I686_IMAGE: "manylinux2010"
CIBW_TEST_COMMAND: "python3 {project}/tools/verify_wheels.py"
CIBW_TEST_COMMAND: "python {project}/tools/verify_wheels.py"
CIBW_TEST_REQUIRES: "git+https://github.com/Qiskit/qiskit-terra.git"
CIBW_ENVIRONMENT_WINDOWS: "CMAKE_GENERATOR='Visual Studio 16 2019'"
run: |
python -m cibuildwheel --output-dir wheelhouse
- uses: actions/upload-artifact@v2
Expand All @@ -40,6 +38,29 @@ jobs:
run : |
pip install -U twine
twine upload wheelhouse/*
sdist:
name: Publish qiskit-aer sdist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
name: Install Python
with:
python-version: '3.8'
- name: Install Deps
run: pip install -U twine wheel
- name: Build Artifacts
run: |
python setup.py sdist
shell: bash
- uses: actions/upload-artifact@v2
with:
path: ./dist/qiskit*
- name: Publish to PyPi
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
TWINE_USERNAME: qiskit
run: twine upload dist/qiskit*
gpu-build:
name: Build qiskit-aer-gpu wheels
runs-on: ubuntu-latest
Expand All @@ -49,18 +70,18 @@ jobs:
name: Install Python
with:
python-version: '3.7'
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
if: runner.os == 'Windows'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==1.5.5
python -m pip install cibuildwheel==1.9.0
- name: Build wheels
env:
CIBW_BEFORE_ALL: "yum install -y yum-utils wget && wget https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda-repo-rhel6-10-1-local-10.1.243-418.87.00-1.0-1.x86_64.rpm && rpm -i cuda-repo-rhel6-10-1-local-10.1.243-418.87.00-1.0-1.x86_64.rpm && yum clean all && yum -y install cuda-10-1"
CIBW_BEFORE_BUILD: "pip install -U Cython pip virtualenv pybind11 && yum install -y openblas-devel"
CIBW_BEFORE_ALL: "yum install -y yum-utils wget && wget https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda-repo-rhel6-10-1-local-10.1.243-418.87.00-1.0-1.x86_64.rpm && rpm -i cuda-repo-rhel6-10-1-local-10.1.243-418.87.00-1.0-1.x86_64.rpm && yum clean all && yum -y install cuda-10-1 openblas-devel"
CIBW_SKIP: "cp27-* cp34-* cp35-* *-manylinux_i686 pp*"
CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2010"
CIBW_MANYLINUX_I686_IMAGE: "manylinux2010"
CIBW_ENVIRONMENT: QISKIT_AER_PACKAGE_NAME=qiskit-aer-gpu AER_THRUST_BACKEND=CUDA
CIBW_TEST_COMMAND: "python3 {project}/tools/verify_wheels.py"
CIBW_ENVIRONMENT: QISKIT_AER_PACKAGE_NAME=qiskit-aer-gpu AER_THRUST_BACKEND=CUDA CUDACXX=/usr/local/cuda/bin/nvcc
CIBW_TEST_COMMAND: "python {project}/tools/verify_wheels.py"
CIBW_TEST_REQUIRES: "git+https://github.com/Qiskit/qiskit-terra.git"
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down
88 changes: 88 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: Docs and Tutorial
on:
push:
branches: [master, 'stable/*']
pull_request:
branches: [master, 'stable/*']
jobs:
docs:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
python-version: [3.7]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Pip cache
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-${{ matrix.python-version}}-pip-docs-${{ hashFiles('setup.py','requirements-dev.txt','constraints.txt') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version}}-pip-docs-
${{ runner.os }}-${{ matrix.python-version}}-pip-
${{ runner.os }}-${{ matrix.python-version}}-
- name: Install Deps
run: |
set -e
pip install -U pip virtualenv wheel
pip install -U tox
sudo apt-get update
sudo apt-get install -y build-essential libopenblas-dev
shell: bash
- name: Run Docs Build
run: tox -edocs
- uses: actions/upload-artifact@v2
with:
name: html_docs
path: docs/_build/html
tutorials:
runs-on: ubuntu-latest
needs: [docs]
strategy:
matrix:
python-version: [3.7]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Pip cache
uses: actions/cache@v2
with:
path: ~\AppData\Local\pip\Cache
key: ${{ runner.os }}-${{ matrix.python-version}}-pip-tutorials-${{ hashFiles('setup.py','requirements-dev.txt','constraints.txt') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version}}-pip-tutorials-
${{ runner.os }}-${{ matrix.python-version}}-pip-
${{ runner.os }}-${{ matrix.python-version}}}-
- name: Setup tutorials job
run: |
set -e
git clone https://github.com/Qiskit/qiskit-tutorials --depth=1
python -m pip install --upgrade pip wheel
pip install -U -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt git+https://github.com/Qiskit/qiskit-terra
pip install -c constraints.txt .
pip install -U "qiskit-ibmq-provider" "z3-solver" "qiskit-ignis" "qiskit-aqua" "pyscf<1.7.4" "matplotlib<3.3.0" jupyter pylatexenc sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
python setup.py build_ext --inplace
sudo apt install -y graphviz pandoc libopenblas-dev
pip check
shell: bash
- name: Run Tutorials
run: |
set -e
cd qiskit-tutorials
rm -rf tutorials/chemistry tutorials/circuits tutorials/circuits_advanced tutorials/finance tutorials/optimization tutorials/algorithms tutorials/operators tutorials/noise tutorials/machine_learning
sphinx-build -b html . _build/html
- uses: actions/upload-artifact@v2
with:
name: tutorials_html
path: qiskit-tutorials/_build/html
Loading

0 comments on commit c27a8ab

Please sign in to comment.