Skip to content

Commit 784dd56

Browse files
JlisowskyyJlisowskyy
authored
Merge branch 'main' into jlisowskyy/extend-bin-search-paths
2 parents a5d4abe + 64b8c07 commit 784dd56

File tree

80 files changed

+5301
-2469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+5301
-2469
lines changed

‎.github/workflows/backport.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
echo "OLD_BRANCH=${OLD_BRANCH}" >> $GITHUB_ENV
4444
4545
- name: Create backport pull requests
46-
uses: korthout/backport-action@01619ebc9a6e3f6820274221b9956b3e7365000a # v4.1.0
46+
uses: korthout/backport-action@3c06f323a58619da1e8522229ebc8d5de2633e46 # v4.3.0
4747
with:
4848
copy_assignees: true
4949
copy_labels_pattern: true
@@ -67,7 +67,7 @@ jobs:
6767
run: echo "BACKPORT_BRANCH=${{ inputs.backport-branch }}" >> $GITHUB_ENV
6868

6969
- name: Create backport pull requests
70-
uses: korthout/backport-action@01619ebc9a6e3f6820274221b9956b3e7365000a # v4.1.0
70+
uses: korthout/backport-action@3c06f323a58619da1e8522229ebc8d5de2633e46 # v4.3.0
7171
with:
7272
copy_assignees: true
7373
copy_labels_pattern: true

‎.github/workflows/bandit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424

2525
- name: Install uv
26-
uses: astral-sh/setup-uv@5a095e7a2014a4212f075830d4f7277575a9d098 # v7.3.1
26+
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
2727
with:
2828
enable-cache: false
2929

@@ -42,6 +42,6 @@ jobs:
4242
with:
4343
args: "check --select S --ignore ${{ steps.ignore-codes.outputs.codes }} --output-format sarif --output-file results.sarif"
4444
- name: Upload SARIF file
45-
uses: github/codeql-action/upload-sarif@v4.32.5
45+
uses: github/codeql-action/upload-sarif@v4.35.1
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/build-docs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "CUDA_BINDINGS_ARTIFACTS_DIR=$(realpath "$REPO_DIR/cuda_bindings/dist")" >> $GITHUB_ENV
110110
111111
- name: Download cuda-python build artifacts
112-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
112+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
113113
with:
114114
name: cuda-python-wheel
115115
path: .
@@ -122,7 +122,7 @@ jobs:
122122
ls -lahR .
123123
124124
- name: Download cuda-pathfinder build artifacts
125-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
125+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
126126
with:
127127
name: cuda-pathfinder-wheel
128128
path: ./cuda_pathfinder
@@ -136,14 +136,14 @@ jobs:
136136
137137
- name: Download cuda.bindings build artifacts
138138
if: ${{ !inputs.is-release }}
139-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
139+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
140140
with:
141141
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
142142
path: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
143143

144144
- name: Download cuda.bindings build artifacts
145145
if: ${{ inputs.is-release }}
146-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
146+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
147147
with:
148148
pattern: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
149149
merge-multiple: true
@@ -158,14 +158,14 @@ jobs:
158158
159159
- name: Download cuda.core build artifacts
160160
if: ${{ !inputs.is-release }}
161-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
161+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
162162
with:
163163
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}
164164
path: ${{ env.CUDA_CORE_ARTIFACTS_DIR }}
165165

166166
- name: Download cuda.core build artifacts
167167
if: ${{ inputs.is-release }}
168-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
168+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
169169
with:
170170
pattern: ${{ env.CUDA_CORE_ARTIFACT_NAME }}
171171
merge-multiple: true

‎.github/workflows/build-wheel.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
cuda-version: ${{ inputs.cuda-version }}
151151

152152
- name: Build cuda.bindings wheel
153-
uses: pypa/cibuildwheel@298ed2fb2c105540f5ed055e8a6ad78d82dd3a7e # v3.3.1
153+
uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a # v3.4.0
154154
with:
155155
package-dir: ./cuda_bindings/
156156
output-dir: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
@@ -204,7 +204,7 @@ jobs:
204204
if-no-files-found: error
205205

206206
- name: Build cuda.core wheel
207-
uses: pypa/cibuildwheel@298ed2fb2c105540f5ed055e8a6ad78d82dd3a7e # v3.3.1
207+
uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a # v3.4.0
208208
with:
209209
package-dir: ./cuda_core/
210210
output-dir: ${{ env.CUDA_CORE_ARTIFACTS_DIR }}
@@ -383,7 +383,7 @@ jobs:
383383
rmdir $OLD_BASENAME
384384
385385
- name: Build cuda.core wheel
386-
uses: pypa/cibuildwheel@298ed2fb2c105540f5ed055e8a6ad78d82dd3a7e # v3.3.1
386+
uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a # v3.4.0
387387
with:
388388
package-dir: ./cuda_core/
389389
output-dir: ${{ env.CUDA_CORE_ARTIFACTS_DIR }}

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@40f0fa95c41fede7b43f035cb47aac899ee0ba0a # v3.31.8
34+
uses: github/codeql-action/init@34950e1b113b30df4edee1a6d3a605242df0c40b # v3.31.8
3535
with:
3636
languages: ${{ matrix.language }}
3737
build-mode: ${{ matrix.build-mode }}
3838
queries: security-extended
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@40f0fa95c41fede7b43f035cb47aac899ee0ba0a # v3.31.8
41+
uses: github/codeql-action/analyze@34950e1b113b30df4edee1a6d3a605242df0c40b # v3.31.8
4242
with:
4343
category: "/language:${{matrix.language}}"

‎.github/workflows/coverage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ jobs:
295295
cuda-version: ${{ env.CUDA_VER }}
296296

297297
- name: Download Windows wheel artifacts
298-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
298+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
299299
with:
300300
name: coverage-windows-wheels
301301
path: ./wheels/
@@ -420,19 +420,19 @@ jobs:
420420
pip install coverage[toml] Cython
421421
422422
- name: Download Linux coverage data
423-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
423+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
424424
with:
425425
name: coverage-data-linux
426426
path: ./
427427

428428
- name: Download cuda source code
429-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
429+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
430430
with:
431431
name: cuda-source-linux
432432
path: ./cuda/
433433

434434
- name: Download Windows coverage data
435-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
435+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
436436
with:
437437
name: coverage-data-windows
438438
path: ./

‎.github/workflows/test-wheel-linux.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,21 @@ jobs:
115115
run: ./ci/tools/env-vars test
116116

117117
- name: Download cuda-pathfinder build artifacts
118-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
118+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
119119
with:
120120
name: cuda-pathfinder-wheel
121121
path: ./cuda_pathfinder
122122

123123
- name: Download cuda-python build artifacts
124124
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0'}}
125-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
125+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
126126
with:
127127
name: cuda-python-wheel
128128
path: .
129129

130130
- name: Download cuda.bindings build artifacts
131131
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0'}}
132-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
132+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
133133
with:
134134
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
135135
path: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
@@ -181,7 +181,7 @@ jobs:
181181
182182
- name: Download cuda.bindings Cython tests
183183
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
184-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
184+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
185185
with:
186186
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}-tests
187187
path: ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
@@ -193,7 +193,7 @@ jobs:
193193
ls -lahR $CUDA_BINDINGS_CYTHON_TESTS_DIR
194194
195195
- name: Download cuda.core build artifacts
196-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
196+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
197197
with:
198198
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}
199199
path: ${{ env.CUDA_CORE_ARTIFACTS_DIR }}
@@ -205,7 +205,7 @@ jobs:
205205
206206
- name: Download cuda.core Cython tests
207207
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
208-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
208+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
209209
with:
210210
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-tests
211211
path: ${{ env.CUDA_CORE_CYTHON_TESTS_DIR }}
@@ -261,14 +261,12 @@ jobs:
261261
LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
262262
run: run-tests bindings
263263

264-
- name: Run cuda.bindings examples
264+
- name: Run cuda.bindings benchmarks (smoke test)
265265
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
266-
env:
267-
CUDA_VER: ${{ matrix.CUDA_VER }}
268-
LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
269266
run: |
270-
pushd cuda_bindings
271-
${SANITIZER_CMD} pytest -ra -s -vv examples/
267+
pip install pyperf
268+
pushd cuda_bindings/benchmarks
269+
python run_pyperf.py --fast --loops 1 --min-time 0
272270
popd
273271
274272
- name: Run cuda.core tests

‎.github/workflows/test-wheel-windows.yml‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,21 @@ jobs:
111111
run: ./ci/tools/env-vars test
112112

113113
- name: Download cuda-pathfinder build artifacts
114-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
114+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
115115
with:
116116
name: cuda-pathfinder-wheel
117117
path: ./cuda_pathfinder
118118

119119
- name: Download cuda-python build artifacts
120120
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0'}}
121-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
121+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
122122
with:
123123
name: cuda-python-wheel
124124
path: .
125125

126126
- name: Download cuda.bindings build artifacts
127127
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0'}}
128-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
128+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
129129
with:
130130
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
131131
path: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
@@ -168,7 +168,7 @@ jobs:
168168
169169
- name: Download cuda.bindings Cython tests
170170
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
171-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
171+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
172172
with:
173173
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}-tests
174174
path: ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
@@ -180,7 +180,7 @@ jobs:
180180
Get-ChildItem -Recurse -Force $env:CUDA_BINDINGS_CYTHON_TESTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName
181181
182182
- name: Download cuda.core build artifacts
183-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
183+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
184184
with:
185185
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}
186186
path: ${{ env.CUDA_CORE_ARTIFACTS_DIR }}
@@ -192,7 +192,7 @@ jobs:
192192
193193
- name: Download cuda.core Cython tests
194194
if: ${{ env.SKIP_CYTHON_TEST == '0' }}
195-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
195+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
196196
with:
197197
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-tests
198198
path: ${{ env.CUDA_CORE_CYTHON_TESTS_DIR }}
@@ -245,17 +245,6 @@ jobs:
245245
shell: bash --noprofile --norc -xeuo pipefail {0}
246246
run: run-tests bindings
247247

248-
- name: Run cuda.bindings examples
249-
if: ${{ env.SKIP_CUDA_BINDINGS_TEST == '0' }}
250-
env:
251-
CUDA_VER: ${{ matrix.CUDA_VER }}
252-
LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
253-
shell: bash --noprofile --norc -xeuo pipefail {0}
254-
run: |
255-
pushd cuda_bindings
256-
${SANITIZER_CMD} pytest -ra -s -vv examples/
257-
popd
258-
259248
- name: Run cuda.core tests
260249
env:
261250
CUDA_VER: ${{ matrix.CUDA_VER }}

‎cuda_bindings/benchmarks/.gitignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Build artifacts
2+
.build/
3+
__pycache__/
4+
5+
# Benchmark results
6+
*.json
7+
.benchmarks/
8+
9+
# Pixi environments
10+
.pixi/
11+
12+
# Override root .gitignore *.cpp rule (which targets Cython-generated files)
13+
!benchmarks/cpp/*.cpp

‎cuda_bindings/benchmarks/README.md‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# cuda.bindings Benchmarks
2+
3+
## Usage
4+
5+
Requires pixi.
6+
7+
There are a couple of environments defined based on how `cuda.bindings` is installed:
8+
9+
- `wheel`: Installs from conda packages
10+
- `source`: Installs from source
11+
12+
There are a couple of tasks defined:
13+
14+
- `bench`: Runs the Python benchmarks
15+
- `bench-cpp`: Runs the C++ benchmarks
16+
17+
### System tuning
18+
19+
For more stable results on Linux, tune the system before running benchmarks.
20+
See: https://pyperf.readthedocs.io/en/latest/system.html#system
21+
22+
```bash
23+
# Show current system state
24+
pixi run -e wheel -- python -m pyperf system show
25+
26+
# Apply tuning (may require root)
27+
sudo $(pixi run -e wheel -- which python) -m pyperf system tune
28+
```
29+
30+
### Running benchmarks
31+
32+
To run the benchmarks combine the environment and task:
33+
34+
```bash
35+
36+
# Run the Python benchmarks in the wheel environment
37+
pixi run -e wheel bench
38+
39+
# Run the Python benchmarks in the source environment
40+
pixi run -e source bench
41+
42+
# Run the C++ benchmarks (environment is irrelavant here)
43+
pixi run -e wheel bench-cpp
44+
```
45+
46+
## pyperf JSON
47+
48+
The benchmarks are run using [pyperf](https://pyperf.readthedocs.io/en/latest/).
49+
The results are written to a JSON file in the format expected by pyperf.
50+
51+
The C++ benchmarks also generate a valid JSON file, in the same format.
52+
53+
```
54+
pixi run -e wheel bench-cpp -0 cpp.json
55+
56+
pixi run -e wheel pyperf stats cpp.json
57+
```

0 commit comments

Comments
 (0)