Skip to content

Commit 68eb8e4

Browse files
committed
Merge branch 'master' into restructure-python-examples
2 parents e401e1a + 67e8f05 commit 68eb8e4

17 files changed

Lines changed: 35 additions & 32 deletions

.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.14']
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

docs/doc_sources/conf.py.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ if generate_multiversion == "ON":
134134
try:
135135
html_context
136136
except NameError:
137-
html_context = dict()
137+
html_context = {}
138138
html_context["display_lower_left"] = True
139139
templates_path = ["_templates"]
140140
html_context["current_version"] = release
141141
html_context["version"] = version
142142

143143
# POPULATE LINKS TO OTHER VERSIONS
144-
html_context["versions"] = list()
144+
html_context["versions"] = []
145145

146146
# Populate the list of documented versions from the doc_versions.txt
147147
versions = []

dpctl/_sycl_device.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ cdef class SyclDevice(_SyclDevice):
12101210
sg_sizes = DPCTLDevice_GetSubGroupSizes(
12111211
self._device_ref, &sg_sizes_len)
12121212
if (sg_sizes is not NULL and sg_sizes_len > 0):
1213-
res = list()
1213+
res = []
12141214
for i in range(sg_sizes_len):
12151215
res.append(sg_sizes[i])
12161216
DPCTLSize_t_Array_Delete(sg_sizes)

dpctl/_sycl_device_factory.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ cdef class _DefaultDeviceCache:
416416
cdef dict __device_map__
417417

418418
def __cinit__(self):
419-
self.__device_map__ = dict()
419+
self.__device_map__ = {}
420420

421421
cdef get_or_create(self):
422422
"""Return instance of SyclDevice and indicator if cache

dpctl/_sycl_queue.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ cdef class WorkGroupMemory:
17531753

17541754

17551755
cdef class _RawKernelArg:
1756-
def __dealloc(self):
1756+
def __dealloc__(self):
17571757
if(self._arg_ref):
17581758
DPCTLRawKernelArg_Delete(self._arg_ref)
17591759

dpctl/_sycl_queue_manager.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cdef class _DeviceDefaultQueueCache:
3535
cdef dict __device_queue_map__
3636

3737
def __cinit__(self):
38-
self.__device_queue_map__ = dict()
38+
self.__device_queue_map__ = {}
3939

4040
def get_or_create(self, key):
4141
"""Return instance of SyclQueue and indicator if cache

dpctl/_sycl_timer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def __init__(
190190
self.queue = None
191191
self.host_times = []
192192
self.bracketing_events = []
193-
self._context_data = list()
193+
self._context_data = []
194194
if device_timer is None:
195195
device_timer = "queue_barrier"
196196
if device_timer == "queue_barrier":

dpctl/tests/helper/_helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def create_invalid_capsule():
4343
return ctor(id(ctor), b"invalid", 0)
4444

4545

46-
def get_queue_or_skip(args=tuple()):
46+
def get_queue_or_skip(args=()):
4747
try:
4848
q = dpctl.SyclQueue(*args)
4949
except dpctl.SyclQueueCreationError:

dpctl/tests/test_sycl_device.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def test_peer_device_arg_validation(method):
405405
dev = dpctl.SyclDevice()
406406
except dpctl.SyclDeviceCreationError:
407407
pytest.skip("No default device available")
408-
bad_dev = dict()
408+
bad_dev = {}
409409
callable = getattr(dev, method)
410410
with pytest.raises(TypeError):
411411
callable(bad_dev)

0 commit comments

Comments
 (0)