Skip to content

Commit 999fd82

Browse files
committed
Revert to Amintor's minus merge from master.
1 parent 414b511 commit 999fd82

16 files changed

+34
-94
lines changed

.github/workflows/changelog_reminder.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
on:
2-
#pull_request:
2+
pull_request:
33
types: [opened, ready_for_review]
44

55
name: Changelog Reminder

.github/workflows/format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Formatting check
22
on:
3-
#pull_request:
3+
pull_request:
44
push:
55
branches:
66
- master

.github/workflows/tests_gpu_cuda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
required: true
1212
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
1313
release:
14-
#pull_request:
14+
pull_request:
1515
push:
1616
branches:
1717
- master

.github/workflows/tests_gpu_kokkos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
type: string
1111
required: true
1212
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
13-
#pull_request:
13+
pull_request:
1414
push:
1515
branches:
1616
- master

.github/workflows/tests_linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
type: string
1111
required: true
1212
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
13-
#pull_request:
13+
pull_request:
1414
push:
1515
branches:
1616
- master

.github/workflows/tests_linux_x86_mpi_gpu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
push:
1515
branches:
1616
- main
17-
#pull_request:
17+
pull_request:
1818

1919
env:
2020
COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --cov-report=xml:./coverage.xml --no-flaky-report -p no:warnings --tb=native"

.github/workflows/tests_windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
push:
1414
branches:
1515
- master
16-
#pull_request:
16+
pull_request:
1717

1818
concurrency:
1919
group: tests_windows-${{ github.ref }}

.github/workflows/tests_without_binary.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
type: string
1111
required: true
1212
description: The version of PennyLane to use. Valid values are either 'release' (most recent release candidate), 'stable' (most recent git-tag) or 'latest' (most recent commit from master)
13-
#pull_request:
13+
pull_request:
1414
push:
1515
branches:
1616
- master

.github/workflows/wheel_linux_aarch64.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- master
1212
release:
1313
types: [published]
14-
workflow_dispatch:
1514

1615
concurrency:
1716
group: wheel_linux_aarch64-${{ github.ref }}
@@ -162,10 +161,7 @@ jobs:
162161
regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+'
163162

164163
- uses: actions/upload-artifact@v3
165-
if: |
166-
github.event_name == 'release' ||
167-
github.event_name == 'workflow_dispatch' ||
168-
github.ref == 'refs/heads/master'
164+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' }}
169165
with:
170166
name: ${{ runner.os }}-wheels-${{ matrix.pl_backend }}-${{ matrix.arch }}.zip
171167
path: ./wheelhouse/*.whl
@@ -178,9 +174,7 @@ jobs:
178174
pl_backend: ["lightning_qubit"]
179175
runs-on: ubuntu-latest
180176

181-
if: |
182-
github.event_name == 'release' ||
183-
github.ref == 'refs/heads/master'
177+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master'}}
184178
steps:
185179
- uses: actions/download-artifact@v3
186180
with:

.github/workflows/wheel_linux_ppc64le.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- master
1212
release:
1313
types: [published]
14-
workflow_dispatch:
1514

1615
concurrency:
1716
group: wheel_linux_ppc64le-${{ github.ref }}
@@ -153,11 +152,7 @@ jobs:
153152
regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+'
154153

155154
- uses: actions/upload-artifact@v3
156-
if: |
157-
github.event_name == 'release' ||
158-
github.event_name == 'workflow_dispatch' ||
159-
github.ref == 'refs/heads/master' ||
160-
steps.rc_build.outputs.match != ''
155+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}}
161156
with:
162157
name: ${{ runner.os }}-wheels-${{ matrix.pl_backend }}-${{ matrix.arch }}.zip
163158
path: ./wheelhouse/*.whl
@@ -170,9 +165,7 @@ jobs:
170165
pl_backend: ["lightning_qubit"]
171166
runs-on: ubuntu-latest
172167

173-
if: |
174-
github.event_name == 'release' ||
175-
github.ref == 'refs/heads/master'
168+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master'}}
176169
steps:
177170
- uses: actions/download-artifact@v3
178171
with:

.github/workflows/wheel_linux_x86_64.yml

+5-15
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,20 @@ env:
99
GCC_VERSION: 11
1010

1111
on:
12-
#pull_request:
12+
pull_request:
1313
push:
1414
branches:
1515
- master
1616
release:
1717
types: [published]
18-
workflow_dispatch:
1918

2019
concurrency:
2120
group: wheel_linux_x86_64-${{ github.ref }}
2221
cancel-in-progress: true
2322

2423
jobs:
2524
set_wheel_build_matrix:
26-
if: |
27-
github.event_name != 'pull_request' ||
28-
contains(github.event.pull_request.labels.*.name, 'ci:build_wheels') ||
29-
github.event_name == 'workflow_dispatch'
25+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci:build_wheels')
3026
name: "Set wheel build matrix"
3127
uses: ./.github/workflows/set_wheel_build_matrix.yml
3228
with:
@@ -96,7 +92,7 @@ jobs:
9692
matrix:
9793
os: [ubuntu-latest]
9894
arch: [x86_64]
99-
pl_backend: ["lightning_qubit"]
95+
pl_backend: ["lightning_kokkos", "lightning_qubit"]
10096
cibw_build: ${{ fromJson(needs.set_wheel_build_matrix.outputs.python_version) }}
10197
exec_model: ${{ fromJson(needs.set_wheel_build_matrix.outputs.exec_model) }}
10298
kokkos_version: ${{ fromJson(needs.set_wheel_build_matrix.outputs.kokkos_version) }}
@@ -180,11 +176,7 @@ jobs:
180176
regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+'
181177

182178
- uses: actions/upload-artifact@v3
183-
if: |
184-
github.event_name == 'release' ||
185-
github.event_name == 'workflow_dispatch' ||
186-
github.ref == 'refs/heads/master' ||
187-
steps.rc_build.outputs.match != ''
179+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}}
188180
with:
189181
name: ${{ runner.os }}-wheels-${{ matrix.pl_backend }}-${{ matrix.arch }}.zip
190182
path: ./wheelhouse/*.whl
@@ -197,9 +189,7 @@ jobs:
197189
pl_backend: ["lightning_qubit"]
198190
runs-on: ubuntu-latest
199191

200-
if: |
201-
github.event_name == 'release' ||
202-
github.ref == 'refs/heads/master'
192+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master'}}
203193
steps:
204194
- uses: actions/download-artifact@v3
205195
with:

.github/workflows/wheel_linux_x86_64_cuda.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,20 @@ env:
99
GCC_VERSION: "11"
1010

1111
on:
12-
#pull_request:
12+
pull_request:
1313
push:
1414
branches:
1515
- master
1616
release:
1717
types: [published]
18-
workflow_dispatch:
1918

2019
concurrency:
2120
group: wheel_linux_x86_64_cu12-${{ github.ref }}
2221
cancel-in-progress: true
2322

2423
jobs:
2524
set_wheel_build_matrix:
26-
if: |
27-
github.event_name != 'pull_request' ||
28-
contains(github.event.pull_request.labels.*.name, 'ci:build_wheels') ||
29-
github.event_name == 'workflow_dispatch'
25+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci:build_wheels')
3026
name: "Set wheel build matrix"
3127
uses: ./.github/workflows/set_wheel_build_matrix.yml
3228
with:
@@ -110,11 +106,7 @@ jobs:
110106
regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+'
111107

112108
- uses: actions/upload-artifact@v3
113-
if: |
114-
github.event_name == 'release' ||
115-
github.event_name == 'workflow_dispatch' ||
116-
github.ref == 'refs/heads/master' ||
117-
steps.rc_build.outputs.match != ''
109+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}}
118110
with:
119111
name: ${{ runner.os }}-wheels-${{ matrix.pl_backend }}-${{ matrix.arch }}-cu${{ matrix.cuda_version }}
120112
path: ./wheelhouse/*.whl
@@ -128,9 +120,7 @@ jobs:
128120
cuda_version: ["12"]
129121

130122
runs-on: ubuntu-latest
131-
if: |
132-
github.event_name == 'release' ||
133-
github.ref == 'refs/heads/master'
123+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master'}}
134124
steps:
135125
- uses: actions/download-artifact@v3
136126
with:

.github/workflows/wheel_macos_arm64.yml

+4-13
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ name: Wheel::MacOS::ARM
66
# **Who does it impact**: Wheels to be uploaded to PyPI.
77

88
on:
9-
#pull_request:
9+
pull_request:
1010
push:
1111
branches:
1212
- master
1313
release:
1414
types: [published]
15-
workflow_dispatch:
1615

1716
env:
1817
ARCHS: 'arm64'
@@ -25,10 +24,7 @@ concurrency:
2524

2625
jobs:
2726
mac-set-matrix-arm:
28-
if: |
29-
github.event_name != 'pull_request' ||
30-
contains(github.event.pull_request.labels.*.name, 'ci:build_wheels') ||
31-
github.event_name == 'workflow_dispatch'
27+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci:build_wheels')
3228
timeout-minutes: 30
3329
name: Set builder matrix
3430
runs-on: ubuntu-latest
@@ -115,10 +111,7 @@ jobs:
115111
python -m twine check ./wheelhouse/*.whl
116112
117113
- uses: actions/upload-artifact@v3
118-
if: |
119-
github.event_name == 'release' ||
120-
github.event_name == 'workflow_dispatch' ||
121-
github.ref == 'refs/heads/master'
114+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' }}
122115
with:
123116
name: ${{ runner.os }}-wheels-${{ matrix.pl_backend }}-${{ matrix.arch }}.zip
124117
path: ./wheelhouse/*.whl
@@ -131,9 +124,7 @@ jobs:
131124
pl_backend: ["lightning_qubit"]
132125
runs-on: ubuntu-latest
133126

134-
if: |
135-
github.event_name == 'release' ||
136-
github.ref == 'refs/heads/master'
127+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master'}}
137128
steps:
138129
- uses: actions/download-artifact@v3
139130
with:

.github/workflows/wheel_macos_x86_64.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ name: Wheel::MacOS::Intel
66
# **Who does it impact**: Wheels to be uploaded to PyPI.
77

88
on:
9-
#pull_request:
9+
pull_request:
1010
push:
1111
branches:
1212
- master
1313
release:
1414
types: [published]
15-
workflow_dispatch:
1615

1716
env:
1817
MACOSX_DEPLOYMENT_TARGET: 10.15
@@ -23,10 +22,7 @@ concurrency:
2322

2423
jobs:
2524
set_wheel_build_matrix:
26-
if: |
27-
github.event_name != 'pull_request' ||
28-
contains(github.event.pull_request.labels.*.name, 'ci:build_wheels') ||
29-
github.event_name == 'workflow_dispatch'
25+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci:build_wheels')
3026
name: "Set wheel build matrix"
3127
uses: ./.github/workflows/set_wheel_build_matrix.yml
3228
with:
@@ -169,11 +165,7 @@ jobs:
169165
regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+'
170166

171167
- uses: actions/upload-artifact@v3
172-
if: |
173-
github.event_name == 'release' ||
174-
github.event_name == 'workflow_dispatch' ||
175-
github.ref == 'refs/heads/master' ||
176-
steps.rc_build.outputs.match != ''
168+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}}
177169
with:
178170
name: ${{ runner.os }}-wheels-${{ matrix.pl_backend }}-${{ matrix.arch }}.zip
179171
path: ./wheelhouse/*.whl
@@ -186,9 +178,7 @@ jobs:
186178
pl_backend: ["lightning_qubit"]
187179
runs-on: ubuntu-latest
188180

189-
if: |
190-
github.event_name == 'release' ||
191-
github.ref == 'refs/heads/master'
181+
if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master'}}
192182
steps:
193183
- uses: actions/download-artifact@v3
194184
with:

.github/workflows/wheel_noarch.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,20 @@ name: Wheel::Any::None
66
# **Who does it impact**: Wheels to be uploaded to PyPI.
77

88
on:
9-
#pull_request:
9+
pull_request:
1010
push:
1111
branches:
1212
- master
1313
release:
1414
types: [published]
15-
workflow_dispatch:
1615

1716
concurrency:
1817
group: wheel_noarch-${{ github.ref }}
1918
cancel-in-progress: true
2019

2120
jobs:
2221
build-pure-python-wheel:
23-
if: |
24-
github.event_name != 'pull_request' ||
25-
contains(github.event.pull_request.labels.*.name, 'ci:build_wheels') ||
26-
github.event_name == 'workflow_dispatch'
22+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci:build_wheels')
2723
strategy:
2824
matrix:
2925
os: [ubuntu-latest]
@@ -66,9 +62,7 @@ jobs:
6662
python -m twine check main/dist/*.whl
6763
6864
- uses: actions/upload-artifact@v3
69-
if: |
70-
matrix.pl_backend == 'lightning_qubit' &&
71-
(github.event_name == 'release' || github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master')
65+
if: ${{ matrix.pl_backend == 'lightning_qubit' && (github.event_name == 'release' || github.ref == 'refs/heads/master') }}
7266
with:
7367
name: pure-python-wheels-${{ matrix.pl_backend }}.zip
7468
path: main/dist/*.whl
@@ -97,9 +91,7 @@ jobs:
9791

9892
steps:
9993
- uses: actions/download-artifact@v3
100-
if: |
101-
matrix.pl_backend == 'lightning_qubit' &&
102-
github.event_name == 'release'
94+
if: ${{ matrix.pl_backend == 'lightning_qubit' && github.event_name == 'release' }}
10395
with:
10496
name: pure-python-wheels-${{ matrix.pl_backend }}.zip
10597
path: dist

0 commit comments

Comments
 (0)