Skip to content

Commit fbe87cb

Browse files
committed
Merge branch 'master' into maint/add-more-pre-commit-hooks
2 parents 117eac7 + 67e8f05 commit fbe87cb

4 files changed

Lines changed: 17 additions & 14 deletions

File tree

.github/workflows/conda-package.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
jobs:
2121
build_linux:
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-latest
2323
timeout-minutes: 90
2424

2525
strategy:
@@ -126,8 +126,7 @@ jobs:
126126
env:
127127
OVERRIDE_INTEL_IPO: 1 # IPO requires more resources that GH actions VM provides
128128
run: |
129-
:: TODO: roll back use of Intel channel when 2025.1 is available on conda-forge
130-
conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels conda-recipe
129+
conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe
131130
132131
- name: Upload artifact
133132
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -150,7 +149,7 @@ jobs:
150149
matrix:
151150
python: ['3.10', '3.11', '3.12', '3.13', '3.14']
152151
experimental: [false]
153-
runner: [ubuntu-22.04]
152+
runner: [ubuntu-latest]
154153
continue-on-error: ${{ matrix.experimental }}
155154

156155
steps:
@@ -235,7 +234,7 @@ jobs:
235234
236235
test_windows:
237236
needs: build_windows
238-
runs-on: ${{ matrix.runner }}
237+
runs-on: ${{ matrix.runner }}
239238
timeout-minutes: 60
240239
defaults:
241240
run:
@@ -408,7 +407,7 @@ jobs:
408407
if: |
409408
(github.repository == 'IntelPython/dpctl') &&
410409
(github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
411-
runs-on: ubuntu-22.04
410+
runs-on: ubuntu-latest
412411
timeout-minutes: 20
413412
strategy:
414413
matrix:
@@ -493,12 +492,12 @@ jobs:
493492

494493
test_examples_linux:
495494
needs: build_linux
496-
runs-on: ${{ matrix.runner }}
495+
runs-on: ${{ matrix.runner }}
497496
strategy:
498497
matrix:
499498
python: ['3.11']
500499
experimental: [false]
501-
runner: [ubuntu-22.04]
500+
runner: [ubuntu-latest]
502501
continue-on-error: ${{ matrix.experimental }}
503502
timeout-minutes: 60
504503
env:
@@ -562,7 +561,8 @@ jobs:
562561
- name: Install example requirements
563562
shell: bash -ex -l {0}
564563
env:
565-
DPCPP_CMPLR: "dpcpp_linux-64>=2025.0"
564+
# TODO: unpin when 2026.0 is available on conda-forge
565+
DPCPP_CMPLR: "dpcpp_linux-64>=2025.0,<2026.0"
566566
run: |
567567
export CHANNELS="${{ env.CHANNELS }}"
568568
. "$CONDA/etc/profile.d/conda.sh"
@@ -585,8 +585,8 @@ jobs:
585585
echo "IPL installed"
586586
# shellcheck disable=SC2086
587587
conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 \
588-
${{ env.DPCPP_CMPLR }} ${DPCTL_DEPENDS} \
589-
sysroot_linux-64>=2.28
588+
"${{ env.DPCPP_CMPLR }}" "${DPCTL_DEPENDS}" \
589+
"sysroot_linux-64>=2.28"
590590
echo "Compiler installed"
591591
conda list -n "${{ env.BUILD_ENV_NAME }}"
592592
- name: Install dpctl
@@ -598,7 +598,7 @@ jobs:
598598
PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
599599
export PACKAGE_VERSION
600600
# shellcheck disable=SC2086
601-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y $CHANNELS ${{ env.PACKAGE_NAME }}=${PACKAGE_VERSION} dpnp || exit 1
601+
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y $CHANNELS ${{ env.PACKAGE_NAME }}=${PACKAGE_VERSION} || exit 1
602602
- name: Build and run examples of pybind11 extensions
603603
shell: bash -l {0}
604604
run: |

.github/workflows/generate-coverage.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
3535
- name: Install latest Intel OneAPI
3636
run: |
37-
sudo apt install intel-oneapi-compiler-dpcpp-cpp
37+
# TODO: drop 2025.3 requirement when coverage build segfault is resolved
38+
sudo apt install intel-oneapi-compiler-dpcpp-cpp-2025.3
3839
sudo apt install intel-oneapi-tbb
3940
sudo apt install intel-oneapi-umf
4041
sudo apt install hwloc
@@ -51,7 +52,7 @@ jobs:
5152
- name: Setup Python
5253
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
5354
with:
54-
python-version: '3.12'
55+
python-version: '3.14'
5556
architecture: x64
5657

5758
- name: Cache Gtest

scripts/gen_coverage.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ def main():
158158
cxx_compiler=cxx_compiler,
159159
level_zero=level_zero_enabled,
160160
verbose=args.verbose,
161+
other_opts=args.cmake_opts,
161162
)
162163

163164
cmake_args += ["-DDPCTL_GENERATE_COVERAGE=ON"]

scripts/gen_docs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ def main():
135135
cxx_compiler=cxx_compiler,
136136
level_zero=level_zero_enabled,
137137
verbose=args.verbose,
138+
other_opts=args.cmake_opts,
138139
)
139140

140141
cmake_args += ["-DDPCTL_GENERATE_DOCS=ON"]

0 commit comments

Comments
 (0)