Skip to content

Commit 37e0aca

Browse files
committed
Merge remote-tracking branch 'origin/master' into spokhode/enh/device_context
2 parents ec17603 + 29c2cbc commit 37e0aca

File tree

16 files changed

+830
-225
lines changed

16 files changed

+830
-225
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
runs-on: ubuntu-20.04
1111

1212
env:
13-
OCLCPUEXP_FN: oclcpuexp-2021.12.6.0.19_rel.tar.gz
14-
FPGAEMU_FN: fpgaemu-2021.12.6.0.19_rel.tar.gz
13+
OCLCPUEXP_FN: oclcpuexp-2021.12.9.0.24_rel.tar.gz
14+
FPGAEMU_FN: fpgaemu-2021.12.9.0.24_rel.tar.gz
1515
TBB_FN: oneapi-tbb-2021.4.0-lin.tgz
1616

1717
steps:
@@ -48,8 +48,8 @@ jobs:
4848
export DOWNLOAD_URL_PREFIX=https://github.com/intel/llvm/releases/download
4949
rm -rf dpcpp-compiler.tar.gz
5050
wget ${DOWNLOAD_URL_PREFIX}/${NIGHTLY_TAG}/dpcpp-compiler.tar.gz && echo ${LATEST_LLVM_TAG_SHA} > bundle_id.txt || rm -rf bundle_id.txt
51-
[ -f ${OCLCPUEXP_FN} ] || wget ${DOWNLOAD_URL_PREFIX}/2021-07/${OCLCPUEXP_FN} || rm -rf bundle_id.txt
52-
[ -f ${FPGAEMU_FN} ] || wget ${DOWNLOAD_URL_PREFIX}/2021-07/${FPGAEMU_FN} || rm -rf bundle_id.txt
51+
[ -f ${OCLCPUEXP_FN} ] || wget ${DOWNLOAD_URL_PREFIX}/2021-09/${OCLCPUEXP_FN} || rm -rf bundle_id.txt
52+
[ -f ${FPGAEMU_FN} ] || wget ${DOWNLOAD_URL_PREFIX}/2021-09/${FPGAEMU_FN} || rm -rf bundle_id.txt
5353
[ -f ${TBB_FN} ] || wget https://github.com/oneapi-src/oneTBB/releases/download/v2021.4.0/${TBB_FN} || rm -rf bundle_id.txt
5454
rm -rf dpcpp_compiler
5555
tar xf dpcpp-compiler.tar.gz

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [Unreleased]
88

99
### Added
10+
- `dpctl.tensor.asarray`, `dpctl.tensor.empty` implemented (#646).
1011
- Extending `dpctl.device_context` with nested contexts (#678)
1112

1213
### Changed
1314
- dpctl-capi is now renamed to `libsyclinterface` (#666).
1415

16+
## [0.11.1] - 11/10/2021
17+
18+
### Changed
19+
- Replaced uses of clang compiler with icx executable (#665)
20+
1521
## [0.11.0] - 11/01/2021
1622

1723
### Added

dpctl/tensor/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@
3333
from dpctl.tensor._copy_utils import copy_from_numpy as from_numpy
3434
from dpctl.tensor._copy_utils import copy_to_numpy as asnumpy
3535
from dpctl.tensor._copy_utils import copy_to_numpy as to_numpy
36+
from dpctl.tensor._ctors import asarray, empty
3637
from dpctl.tensor._reshape import reshape
3738
from dpctl.tensor._usmarray import usm_ndarray
3839

3940
__all__ = [
4041
"usm_ndarray",
42+
"asarray",
4143
"astype",
4244
"copy",
45+
"empty",
4346
"reshape",
4447
"from_numpy",
4548
"to_numpy",

dpctl/tensor/_copy_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ def copy_to_numpy(ary):
9393
)
9494

9595

96-
def copy_from_numpy(np_ary, usm_type="device", queue=None):
96+
def copy_from_numpy(np_ary, usm_type="device", sycl_queue=None):
9797
"Copies numpy array `np_ary` into a new usm_ndarray"
9898
# This may peform a copy to meet stated requirements
9999
Xnp = np.require(np_ary, requirements=["A", "O", "C", "E"])
100-
if queue:
101-
ctor_kwargs = {"queue": queue}
100+
if sycl_queue:
101+
ctor_kwargs = {"queue": sycl_queue}
102102
else:
103103
ctor_kwargs = dict()
104104
Xusm = dpt.usm_ndarray(

0 commit comments

Comments
 (0)