From 4a6fd11a36c44dd58536f9aa92fb144edd39ab52 Mon Sep 17 00:00:00 2001 From: gadial Date: Wed, 15 Jan 2025 14:22:40 +0200 Subject: [PATCH 1/2] Adds unique name for upload-artifact jobs (#2285) * Adds unique name for upload-artifact jobs * Attempt to install openblas in the neko run * deploy names update and neko fix * blas and lapack fix in the tutorials job as well * Move the blas install earlier * Bump all upload-artifact to v4 and distinguish between "shared" and "separete" uploads --- .github/workflows/deploy.yml | 19 +++++++++++++------ .github/workflows/docs.yml | 2 +- .github/workflows/neko.yml | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 26d3667847..5ac5e3fad5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl - name: publish-shared-wheels + name: aer-deploy-shared-wheel-build-${{ matrix.os }} build_wheels_aarch64: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -60,6 +60,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: aer-deploy-separate-build_wheels_aarch64-${{ matrix.os }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -84,10 +85,10 @@ jobs: env: CIBW_ARCHS_MACOS: arm64 run: cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl - name: publish-shared-wheels + name: aer-deploy-shared-wheel-arm64-macos-${{ matrix.os }} sdist: name: Publish qiskit-aer sdist runs-on: ubuntu-latest @@ -110,6 +111,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./dist/qiskit* + name: aer-deploy-separate-sdist-${{ matrix.os }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -151,9 +153,10 @@ jobs: CIBW_REPAIR_WHEEL_COMMAND: 'auditwheel repair --exclude libcudart.so.11.0 --exclude libcustatevec.so.1 --exclude libcutensornet.so.2 --exclude libcutensor.so.1 --exclude libcutensorMg.so.1 --exclude libcusolver.so.11 --exclude libcusolverMg.so.11 --exclude libcusparse.so.11 --exclude libcublas.so.11 --exclude libcublasLt.so.11 -w {dest_dir} {wheel}' run: | python -m cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: aer-deploy-separate-gpu-build-cuda11-${{ matrix.os }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -195,9 +198,10 @@ jobs: CIBW_REPAIR_WHEEL_COMMAND: 'auditwheel repair --exclude libcudart.so.12 --exclude libcustatevec.so.1 --exclude libcutensornet.so.2 --exclude libcutensor.so.1 --exclude libcutensorMg.so.1 --exclude libcusolver.so.11 --exclude libcusolverMg.so.11 --exclude libcusolver.so.12 --exclude libcusolverMg.so.12 --exclude libcusparse.so.12 --exclude libcublas.so.12 --exclude libcublasLt.so.12 --exclude libnvJitLink.so.12 -w {dest_dir} {wheel}' run: | python -m cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: aer-deploy-separate-gpu-build-cuda12-${{ matrix.os }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -234,6 +238,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: aer-deploy-separate-build_wheels_s390x-${{ matrix.os }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -270,6 +275,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: aer-deploy-separate-build_wheels_ppc64le-${{ matrix.os }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: @@ -285,7 +291,8 @@ jobs: - uses: actions/download-artifact@v4 with: path: deploy - name: publish-shared-wheels + pattern: 'aer-deploy-shared-' + merge-multiple: true - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 30154ce1ff..2fbb0b6e0c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -69,12 +69,12 @@ jobs: - name: Setup tutorials job run: | set -e + sudo apt install -y graphviz pandoc libblas-dev liblapack-dev 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 pip install -c constraints.txt . - sudo apt install -y graphviz pandoc libopenblas-dev pip check shell: bash - name: Run Tutorials diff --git a/.github/workflows/neko.yml b/.github/workflows/neko.yml index 92d0b2169f..b5c054f66e 100644 --- a/.github/workflows/neko.yml +++ b/.github/workflows/neko.yml @@ -16,6 +16,7 @@ jobs: with: test_selection: backend repo_install_command: | + sudo apt-get install -y libblas-dev liblapack-dev pip install scipy==1.13.1 pip install conan pip uninstall -y qiskit qiskit-terra qiskit-aer From 582407a3f8ef5070c850fb4c417c53c1db1f5998 Mon Sep 17 00:00:00 2001 From: gadial Date: Wed, 15 Jan 2025 18:18:53 +0200 Subject: [PATCH 2/2] Add wildcard (#2288) --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5ac5e3fad5..9030c70e16 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -291,7 +291,7 @@ jobs: - uses: actions/download-artifact@v4 with: path: deploy - pattern: 'aer-deploy-shared-' + pattern: 'aer-deploy-shared-*' merge-multiple: true - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1