Skip to content

Commit 350738b

Browse files
oleksandr-pavlykoleksandr-pavlyk
committed
Merge remote-tracking branch 'origin/master' into feature/radix-sort
2 parents 93db58a + 7ffcca4 commit 350738b

21 files changed

+182
-65
lines changed

‎.github/workflows/conda-package.yml‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ env:
1212
PACKAGE_NAME: dpctl
1313
MODULE_NAME: dpctl
1414
TEST_ENV_NAME: test_dpctl
15-
VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); "
16-
VER_SCRIPT2: "d = j['dpctl'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
15+
VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['dpctl'][0];"
16+
VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
17+
VER_SCRIPT3: "print(' '.join(map(lambda s: chr(34) + s + chr(34), [comp for comp in d['depends'] if 'dpcpp' in comp][1:])))"
1718
INTEL_CHANNEL: "https://software.repos.intel.com/python/conda/"
1819

1920
jobs:
@@ -25,7 +26,7 @@ jobs:
2526
matrix:
2627
python: ['3.9', '3.10', '3.11', '3.12']
2728
steps:
28-
- uses: actions/[email protected].1
29+
- uses: actions/[email protected].2
2930
with:
3031
fetch-depth: 0
3132

@@ -81,7 +82,7 @@ jobs:
8182
matrix:
8283
python: ['3.9', '3.10', '3.11', '3.12']
8384
steps:
84-
- uses: actions/[email protected].1
85+
- uses: actions/[email protected].2
8586
with:
8687
fetch-depth: 0
8788

@@ -363,7 +364,11 @@ jobs:
363364
shell: pwsh
364365
run: |
365366
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
366-
&$script_path
367+
if (Test-Path $script_path) {
368+
&$script_path
369+
} else {
370+
Write-Warning "File $script_path was NOT found!"
371+
}
367372
# Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
368373
$cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
369374
Get-Content -Tail 5 -Path $cl_cfg
@@ -501,7 +506,7 @@ jobs:
501506
# Needed to be able to run conda index
502507
run: conda install conda-index -c conda-forge --override-channels
503508
- name: Checkout dpctl repo
504-
uses: actions/[email protected].1
509+
uses: actions/[email protected].2
505510
with:
506511
fetch-depth: 0
507512
- name: Download artifact
@@ -540,18 +545,28 @@ jobs:
540545
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
541546
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
542547
- name: Install example requirements
543-
shell: bash -l {0}
548+
shell: bash -ex -l {0}
544549
env:
545-
DPCPP_CMPLR: dpcpp_linux-64">=2024.2"
550+
DPCPP_CMPLR: "dpcpp_linux-64>=2024.2"
546551
run: |
547552
CHANNELS="${{ env.CHANNELS }}"
548553
. $CONDA/etc/profile.d/conda.sh
549-
conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python=${{ matrix.python }} setuptools"<72.2.0" $CHANNELS
550-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake $CHANNELS || exit 1
551-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y ninja $CHANNELS || exit 1
554+
DPCTL_DEPENDS="$(python -c "${VER_SCRIPT1} ${VER_SCRIPT3}")"
555+
echo "Dpctl dependencies: ${DPCTL_DEPENDS}"
556+
conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python=${{ matrix.python }} "setuptools<72.2.0" $CHANNELS
557+
echo "Environment created"
558+
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake ninja $CHANNELS || exit 1
559+
echo "Cmake and Ninja installed"
552560
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y pybind11 cython scikit-build $CHANNELS || exit 1
553-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp mkl-devel-dpcpp dpcpp_cpp_rt $CHANNELS || exit 1
554-
conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 ${{ env.DPCPP_CMPLR }} sysroot_linux-64">=2.28"
561+
echo "scikit-build installed"
562+
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp \
563+
mkl-devel-dpcpp dpcpp_cpp_rt "${DPCTL_DEPENDS}" \
564+
$CHANNELS || exit 1
565+
echo "IPL installed"
566+
conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS gcc_linux-64 gxx_linux-64 \
567+
${{ env.DPCPP_CMPLR }} "${DPCTL_DEPENDS}" \
568+
"sysroot_linux-64>=2.28"
569+
echo "Compiler installed"
555570
- name: Install dpctl
556571
shell: bash -l {0}
557572
run: |
@@ -651,7 +666,7 @@ jobs:
651666
run: |
652667
echo ${{ env.CHANNELS }}
653668
- name: Checkout dpctl repo
654-
uses: actions/[email protected].1
669+
uses: actions/[email protected].2
655670
with:
656671
fetch-depth: 0
657672
- name: Cache array API tests
@@ -795,7 +810,7 @@ jobs:
795810
run: conda install anaconda-client -c conda-forge --override-channels
796811

797812
- name: Checkout repo
798-
uses: actions/[email protected].1
813+
uses: actions/[email protected].2
799814
with:
800815
repository: IntelPython/devops-tools
801816
fetch-depth: 0

‎.github/workflows/cpp_style_checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
timeout-minutes: 30
1919
steps:
20-
- uses: actions/[email protected].1
20+
- uses: actions/[email protected].2
2121
- name: Run clang-format style check for C/C++ programs.
2222
uses: jidicula/[email protected]
2323
with:

‎.github/workflows/generate-coverage.yaml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
env:
1818
ONEAPI_ROOT: /opt/intel/oneapi
1919
GTEST_ROOT: /home/runner/work/googletest-1.15.2/install
20-
# Use oneAPI compiler 2023 to work around an issue
21-
USE_2023: 0
2220

2321
steps:
2422
- name: Cancel Previous Runs
@@ -28,23 +26,23 @@ jobs:
2826

2927
- name: Add Intel repository
3028
run: |
31-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
32-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
33-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
34-
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
35-
sudo apt-get update
36-
37-
- name: Install Intel OneAPI 2023
38-
if: env.USE_2023 == '1'
39-
run: |
40-
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-2023.2.1
41-
sudo apt-get install intel-oneapi-tbb-2021.10.0
29+
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
30+
cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
31+
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
32+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
33+
sudo apt update
4234
4335
- name: Install latest Intel OneAPI
44-
if: env.USE_2023 != '1'
4536
run: |
46-
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
47-
sudo apt-get install intel-oneapi-tbb
37+
sudo apt install intel-oneapi-compiler-dpcpp-cpp
38+
sudo apt install intel-oneapi-tbb
39+
sudo apt install intel-oneapi-umf
40+
sudo apt install hwloc
41+
42+
- name: Run SYCL list
43+
run: |
44+
source /opt/intel/oneapi/setvars.sh
45+
sycl-ls --verbose
4846
4947
- name: Install CMake and Ninja
5048
run: |
@@ -82,7 +80,7 @@ jobs:
8280
make && make install
8381
8482
- name: Checkout repo
85-
uses: actions/[email protected].1
83+
uses: actions/[email protected].2
8684
with:
8785
fetch-depth: 0
8886

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@ jobs:
2424
- name: Add Intel repository
2525
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
2626
run: |
27-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
28-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
29-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
30-
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
31-
sudo apt-get update
27+
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
28+
cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
29+
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
30+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
31+
sudo apt update
3232
- name: Install Intel OneAPI
3333
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
3434
run: |
35-
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
35+
sudo apt install intel-oneapi-compiler-dpcpp-cpp
36+
sudo apt install intel-oneapi-tbb
37+
sudo apt install intel-oneapi-umf
38+
sudo apt install hwloc
3639
- name: Install Lua
3740
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
3841
run: |
@@ -60,7 +63,7 @@ jobs:
6063
sphinxcontrib-jsmath sphinx-copybutton sphinxcontrib-spelling \
6164
versioneer[toml]==0.29
6265
- name: Checkout repo
63-
uses: actions/[email protected].1
66+
uses: actions/[email protected].2
6467
with:
6568
fetch-depth: 0
6669
persist-credentials: false

‎.github/workflows/openssf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
with:
3939
persist-credentials: false
4040

@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
72+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
7373
with:
7474
sarif_file: results.sarif

‎.github/workflows/os-llvm-sycl-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
pip install numpy cython setuptools pytest scikit-build cmake ninja versioneer[toml]==0.29
111111
112112
- name: Checkout repo
113-
uses: actions/[email protected].1
113+
uses: actions/[email protected].2
114114
with:
115115
fetch-depth: 0
116116

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-24.04
1313
timeout-minutes: 30
1414
steps:
15-
- uses: actions/[email protected].1
15+
- uses: actions/[email protected].2
1616
- uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.12'

‎.github/workflows/python_style_checks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
timeout-minutes: 30
2020
steps:
21-
- uses: actions/[email protected].1
21+
- uses: actions/[email protected].2
2222
- uses: actions/setup-python@v5
2323
with:
2424
python-version: '3.11'
@@ -34,7 +34,7 @@ jobs:
3434
# Steps represent a sequence of tasks that will be executed as part of the job
3535
steps:
3636
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
37-
- uses: actions/[email protected].1
37+
- uses: actions/[email protected].2
3838
# Set up a Python environment for use in actions
3939
- uses: actions/setup-python@v5
4040
with:
@@ -52,7 +52,7 @@ jobs:
5252
timeout-minutes: 30
5353

5454
steps:
55-
- uses: actions/[email protected].1
55+
- uses: actions/[email protected].2
5656
- name: Set up Python
5757
uses: actions/setup-python@v5
5858
with:

‎CHANGELOG.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
* Implement radix sort algorithm to be used in `dpt.sort` and `dpt.argsort` [gh-1867](https://github.com/IntelPython/dpctl/pull/1867)
1818

1919
### Fixed
20+
* Fix for `tensor.result_type` when all inputs are Python built-in scalars [gh-1877](https://github.com/IntelPython/dpctl/pull/1877)
21+
22+
* Improved error in constructors `tensor.full` and `tensor.full_like` when provided a non-numeric fill value [gh-1878](https://github.com/IntelPython/dpctl/pull/1878)
2023

2124
### Maintenance
2225

@@ -29,7 +32,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2932
* Fix warning in documentation generation caused by `diff` docstring [gh-1855](https://github.com/IntelPython/dpctl/pull/1855)
3033
* Fix additional warnings when generating docs [gh-1861](https://github.com/IntelPython/dpctl/pull/1861)
3134

32-
## [0.18.0] - Sept. XX, 2024
35+
## [0.18.1] - Oct. 11, 2024
36+
37+
### Changed
38+
39+
* Updated installation instructions [gh-1862](https://github.com/IntelPython/dpctl/pull/1862)
40+
41+
## [0.18.0] - Sept. 26, 2024
3342

3443
This release reaches an important milestone by making offloading fully asynchronous.
3544
Calls to `dpctl.tensor` submit tasks for execution to DPC++ runtime and return without waiting for execution of these tasks to finish.
@@ -51,7 +60,7 @@ The full list of changes that went into this release are:
5160
* `dpctl::tensor::usm_memory` class defined in `dpctl4pybind11.hpp` adds constructor to create Python USM memory objects viewing into existing USM allocations, which can be made by an external library [gh-1782](https://github.com/IntelPython/dpctl/pull/1782)
5261
* Add support for COVERAGE build type in project's CMake script [gh-1692](https://github.com/IntelPython/dpctl/pull/1692)
5362

54-
### Change
63+
### Changed
5564

5665
* Change ownership of USM allocation by `dpctl.memory` objects, make executions of `dpctl.tensor` operations asynchronous [gh-1705](https://github.com/IntelPython/dpctl/pull/1705)
5766
* Add support for Python scalars by `tensor.where` function [gh-1719](https://github.com/IntelPython/dpctl/pull/1719)

‎dpctl/_host_task_util.hpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@
3030
//===----------------------------------------------------------------------===//
3131

3232
#pragma once
33+
#include <exception>
34+
#include <sycl/sycl.hpp>
35+
3336
#include "Python.h"
37+
3438
#include "syclinterface/dpctl_data_types.h"
3539
#include "syclinterface/dpctl_sycl_type_casters.hpp"
36-
#include <sycl/sycl.hpp>
3740

3841
DPCTLSyclEventRef async_dec_ref(DPCTLSyclQueueRef QRef,
3942
PyObject **obj_array,

0 commit comments

Comments
 (0)