Skip to content

Commit c239cab

Browse files
committed
Merge branch 'master' into bot/pre-commit-autoupdate
2 parents 639dca0 + 67e8f05 commit c239cab

4 files changed

Lines changed: 16 additions & 13 deletions

File tree

.github/workflows/conda-package.yml

Lines changed: 11 additions & 11 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:
@@ -133,8 +133,7 @@ jobs:
133133
env:
134134
OVERRIDE_INTEL_IPO: 1 # IPO requires more resources that GH actions VM provides
135135
run: |
136-
# TODO: roll back use of Intel channel when 2025.1 is available on conda-forge
137-
conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels conda-recipe
136+
conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe
138137
139138
- name: Upload artifact
140139
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -157,7 +156,7 @@ jobs:
157156
matrix:
158157
python: ['3.10', '3.11', '3.12', '3.13', '3.14']
159158
experimental: [false]
160-
runner: [ubuntu-22.04]
159+
runner: [ubuntu-latest]
161160
continue-on-error: ${{ matrix.experimental }}
162161

163162
steps:
@@ -244,7 +243,7 @@ jobs:
244243
245244
test_windows:
246245
needs: build_windows
247-
runs-on: ${{ matrix.runner }}
246+
runs-on: ${{ matrix.runner }}
248247
timeout-minutes: 60
249248
defaults:
250249
run:
@@ -417,7 +416,7 @@ jobs:
417416
if: |
418417
(github.repository == 'IntelPython/dpctl') &&
419418
(github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
420-
runs-on: ubuntu-22.04
419+
runs-on: ubuntu-latest
421420
timeout-minutes: 20
422421
strategy:
423422
matrix:
@@ -506,12 +505,12 @@ jobs:
506505

507506
test_examples_linux:
508507
needs: build_linux
509-
runs-on: ${{ matrix.runner }}
508+
runs-on: ${{ matrix.runner }}
510509
strategy:
511510
matrix:
512511
python: ['3.11']
513512
experimental: [false]
514-
runner: [ubuntu-22.04]
513+
runner: [ubuntu-latest]
515514
continue-on-error: ${{ matrix.experimental }}
516515
timeout-minutes: 60
517516
env:
@@ -572,7 +571,8 @@ jobs:
572571
- name: Install example requirements
573572
shell: bash -ex -l {0}
574573
env:
575-
DPCPP_CMPLR: "dpcpp_linux-64>=2025.0"
574+
# TODO: unpin when 2026.0 is available on conda-forge
575+
DPCPP_CMPLR: "dpcpp_linux-64>=2025.0,<2026.0"
576576
run: |
577577
CHANNELS="${{ env.CHANNELS }}"
578578
. $CONDA/etc/profile.d/conda.sh
@@ -589,7 +589,7 @@ jobs:
589589
$CHANNELS || exit 1
590590
echo "IPL installed"
591591
conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 \
592-
${{ env.DPCPP_CMPLR }} "${DPCTL_DEPENDS}" \
592+
"${{ env.DPCPP_CMPLR }}" "${DPCTL_DEPENDS}" \
593593
"sysroot_linux-64>=2.28"
594594
echo "Compiler installed"
595595
conda list -n ${{ env.BUILD_ENV_NAME }}
@@ -599,7 +599,7 @@ jobs:
599599
source $CONDA/etc/profile.d/conda.sh
600600
CHANNELS="-c $GITHUB_WORKSPACE/channel -c dppy/label/dev -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels"
601601
export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
602-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ${CHANNELS} dpctl=${PACKAGE_VERSION} dpnp || exit 1
602+
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ${CHANNELS} dpctl=${PACKAGE_VERSION} || exit 1
603603
- name: Build and run examples of pybind11 extensions
604604
shell: bash -l {0}
605605
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)