Skip to content

Commit 44ea8c0

Browse files
oleksandr-pavlykoleksandr-pavlyk
committed
Merge remote-tracking branch 'origin/master' into review-sub-devices
2 parents 7c10468 + ec0de51 commit 44ea8c0

File tree

123 files changed

+934
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+934
-218
lines changed

‎CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ We use [clang-format](https://clang.llvm.org/docs/ClangFormat.html) code formatt
99
Install: `conda install clang-tools`
1010

1111
- Revision: `10.0.1`
12-
- See the default configuration used by dpCtl in `.clang-format`.
12+
- See the default configuration used by dpctl in `.clang-format`.
1313

1414
Run before each commit: `clang-format -style=file -i dpctl-capi/include/*.h dpctl-capi/include/Support/*.h dpctl-capi/source/*.cpp dpctl-capi/tests/*.cpp dpctl-capi/helper/include/*.h dpctl-capi/helper/source/*.cpp`
1515

@@ -30,7 +30,7 @@ purpose of the file. The standard header looks like this:
3030
```
3131
//===----- dpctl_sycl_event_interface.h - C API for sycl::event -*-C++-*- ===//
3232
//
33-
// Data Parallel Control (dpCtl)
33+
// Data Parallel Control (dpctl)
3434
//
3535
// Copyright 2020-2021 Intel Corporation
3636
//
@@ -69,7 +69,7 @@ Few things to note about this format:
6969
Every Python and Cython file should only include the following license header:
7070

7171
```
72-
# Data Parallel Control (dpCtl)
72+
# Data Parallel Control (dpctl)
7373
#
7474
# Copyright 2020-2021 Intel Corporation
7575
#

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ conda install dpctl
4141

4242
Build and Install with setuptools
4343
=================================
44-
dpCtl relies on DPC++ runtime. With Intel oneAPI installed you should activate it.
44+
dpctl relies on DPC++ runtime. With Intel oneAPI installed you should activate it.
4545
`setup.py` requires environment variable `ONEAPI_ROOT` and following packages
4646
installed:
4747
- `cython`
@@ -67,11 +67,11 @@ python setup.py develop
6767

6868
Install Wheel Package from Pypi
6969
==================================
70-
1. Install dpCtl
70+
1. Install dpctl
7171
```cmd
7272
python -m pip install --index-url https://pypi.anaconda.org/intel/simple -extra-index-url https://pypi.org/simple dpctl
7373
```
74-
Note: dpCtl wheel package is placed on Pypi, but some of its dependencies (like Intel numpy) are in Anaconda Cloud.
74+
Note: dpctl wheel package is placed on Pypi, but some of its dependencies (like Intel numpy) are in Anaconda Cloud.
7575
That is why install command requires additional intel Pypi channel from Anaconda Cloud.
7676

7777
2. Set path to Performance Libraries in case of using venv or system Python:
@@ -84,9 +84,9 @@ On Windows:
8484
set PATH=<path_to_your_env>\bin;<path_to_your_env>\Library\bin;%PATH%
8585
```
8686

87-
Using dpCtl
87+
Using dpctl
8888
===========
89-
dpCtl relies on DPC++ runtime. With Intel oneAPI installed you could activate it.
89+
dpctl relies on DPC++ runtime. With Intel oneAPI installed you could activate it.
9090

9191
On Windows:
9292
```cmd
@@ -97,7 +97,7 @@ On Linux:
9797
source ${ONEAPI_ROOT}/compiler/latest/env/vars.sh
9898
```
9999

100-
When dpCtl is installed via conda package
100+
When dpctl is installed via conda package
101101
then it uses DPC++ runtime from `dpcpp_cpp_rt` package
102102
and it is not necessary to activate oneAPI DPC++ compiler environment.
103103

@@ -113,7 +113,7 @@ for script in `ls examples/python/`; do echo "executing ${script}"; python examp
113113
```
114114

115115
Examples of building Cython extensions with DPC++ compiler, that interoperate
116-
with dpCtl can be found in folder `cython`.
116+
with dpctl can be found in folder `cython`.
117117

118118
Each example in `cython` folder can be built using
119119
`CC=clang CXX=dpcpp python setup.py build_ext --inplace`.

‎conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test:
3434
- pytest
3535
- pytest-cov
3636
about:
37-
home: https://github.com/IntelPython/dpCtl.git
37+
home: https://github.com/IntelPython/dpctl.git
3838
license: Apache-2.0
3939
license_file: LICENSE
4040
summary: 'A lightweight Python wrapper for a subset of OpenCL and SYCL API.'

‎docs/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
2-
project("Data-parallel Control (dpCtl)")
2+
project("Data-parallel Control (dpctl)")
33
# Add the cmake folder so the FindSphinx module is found
44
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
55

@@ -9,7 +9,7 @@ find_package (Git)
99

1010
set(DOC_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/generated_docs)
1111
if( DPCTL_DOCGEN_PREFIX )
12-
message(STATUS "Generating dpCtl documents in " ${DPCTL_DOCGEN_PREFIX})
12+
message(STATUS "Generating dpctl documents in " ${DPCTL_DOCGEN_PREFIX})
1313
set(DOC_OUTPUT_DIR ${DPCTL_DOCGEN_PREFIX})
1414
endif()
1515

@@ -74,7 +74,7 @@ add_custom_command(
7474
COMMAND
7575
${SPHINX_EXECUTABLE} -b html
7676
# Tell Breathe where to find the Doxygen output
77-
-Dbreathe_projects.dpCtl-CAPI=${DOXYGEN_OUTPUT_DIR}/xml
77+
-Dbreathe_projects.dpctl-CAPI=${DOXYGEN_OUTPUT_DIR}/xml
7878
${SPHINX_SOURCE} ${SPHINX_OUTPUT_DIR}
7979
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
8080
DEPENDS

‎docs/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "Data-parallel Control (dpCtl)"
35+
PROJECT_NAME = "Data-parallel Control (dpctl)"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version

‎docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What?
22
=====
33

4-
Generator scripts for dpCtl API documentation. To run these scripts, follow
4+
Generator scripts for dpctl API documentation. To run these scripts, follow
55
the following steps:
66
```bash
77
cd dpctl/docs
@@ -16,7 +16,7 @@ documents in the current source directory in a sub-directory called
1616
`generated_docs`.
1717

1818
The `make Sphinx` command will generate standalone Doxygen documentation and
19-
a consolidated Sphinx documentation for both dpCtl Python and C APIs.
19+
a consolidated Sphinx documentation for both dpctl Python and C APIs.
2020

2121
Prerequisite
2222
============

‎docs/conf.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ extensions = [
3838
]
3939

4040
# Breathe Configuration
41-
breathe_default_project = "dpCtl-CAPI"
41+
breathe_default_project = "dpctl-CAPI"
4242

4343
# Add any paths that contain templates here, relative to this directory.
4444
templates_path = ["_templates"]
@@ -58,8 +58,8 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
5858
exhale_args = {
5959
# These arguments are required
6060
"containmentFolder": "./api",
61-
"rootFileName": "dpCtl-CAPI_root.rst",
62-
"rootFileTitle": "dpCtl C API",
61+
"rootFileName": "dpctl-CAPI_root.rst",
62+
"rootFileTitle": "dpctl C API",
6363
"doxygenStripFromPath": "..",
6464
"createTreeView": True,
6565
"exhaleExecutesDoxygen": True,

‎docs/dpCtl.dptensor_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _dpCtl.dptensor_api:
22

33
#########################
4-
dpCtl dptensor Python API
4+
dpctl dptensor Python API
55
#########################
66

77
.. automodule:: dpctl.dptensor

‎docs/dpCtl.program_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _dpCtl.program_api:
22

33
########################
4-
dpCtl Program Python API
4+
dpctl Program Python API
55
########################
66

77
.. automodule:: dpctl.program

‎docs/dpCtl_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _dpCtl_api:
22

33
################
4-
dpCtl Python API
4+
dpctl Python API
55
################
66

77
.. automodule:: dpctl

‎docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.
55
6-
Welcome to Data-parallel Control (dpCtl)'s documentation!
6+
Welcome to Data-parallel Control (dpctl)'s documentation!
77
=========================================================
88

99
.. toctree::

‎dpctl-capi/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
2-
project("dpCtl C API - A C wrapper for a subset of SYCL")
2+
project("dpctl C API - A C wrapper for a subset of SYCL")
33

44
# Option to turn on support for creating Level Zero interoperability programs
55
# from a SPIR-V binary file.
@@ -152,7 +152,7 @@ if(DPCTL_GENERATE_COVERAGE)
152152
endif()
153153
endif()
154154

155-
# Add sub-directory to build the dpCtl C API test cases
155+
# Add sub-directory to build the dpctl C API test cases
156156
if(DPCTL_BUILD_CAPI_TESTS)
157157
add_subdirectory(tests)
158158
endif()

‎dpctl-capi/cmake/modules/FindDPCPP.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Data Parallel Control (dpCtl)
1+
# Data Parallel Control (dpctl)
22
#
33
# Copyright 2020-2021 Intel Corporation
44
#

‎dpctl-capi/cmake/modules/FindLcov.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Data Parallel Control (dpCtl)
1+
# Data Parallel Control (dpctl)
22
#
33
# Copyright 2020-2021 Intel Corporation
44
#

‎dpctl-capi/cmake/modules/FindLevelZero.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Data Parallel Control (dpCtl)
1+
# Data Parallel Control (dpctl)
22
#
33
# Copyright 2020-2021 Intel Corporation
44
#

‎dpctl-capi/helper/include/dpctl_async_error_handler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===-- dpctl_async_error_handler.h - An async error handler -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/helper/include/dpctl_dynamic_lib_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===--- dpctl_dynamic_lib_helper.h - Dynamic library helper -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/helper/include/dpctl_utils_helper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===-- dpctl_utils.h - Enum to string helper functions -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//
@@ -19,7 +19,7 @@
1919
//===----------------------------------------------------------------------===//
2020
///
2121
/// \file
22-
/// This file defines common helper functions used in other places in dpCtl.
22+
/// This file defines common helper functions used in other places in dpctl.
2323
//===----------------------------------------------------------------------===//
2424

2525
#pragma once

‎dpctl-capi/helper/include/dpctl_vector_macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//=== dpctl_vector_macros.h - Macros to help build function sig. -*-C++-*- //
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/helper/source/dpctl_async_error_handler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===-- dpctl_async_error_handler.h - An async error handler -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/helper/source/dpctl_utils_helper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===- dpctl_utils_helper.cpp - Implementation of enum to string helpers ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/include/Config/dpctl_config.h.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//===--------- dpctl_config.h - Configured options for dpCtl C API ===//
1+
//===--------- dpctl_config.h - Configured options for dpctl C API ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//
@@ -19,14 +19,14 @@
1919
//===----------------------------------------------------------------------===//
2020
///
2121
/// \file
22-
/// This file exports a set of dpCtl C API configurations.
22+
/// This file exports a set of dpctl C API configurations.
2323
///
2424
//===----------------------------------------------------------------------===//
2525

2626
#pragma once
2727

28-
/* Defined when dpCtl was built with level zero program creation enabled. */
28+
/* Defined when dpctl was built with level zero program creation enabled. */
2929
#cmakedefine DPCTL_ENABLE_LO_PROGRAM_CREATION @DPCTL_ENABLE_LO_PROGRAM_CREATION@
3030

31-
/* The DPCPP version used to build dpCtl */
31+
/* The DPCPP version used to build dpctl */
3232
#define DPCTL_DPCPP_VERSION "@DPCPP_VERSION@"

‎dpctl-capi/include/Support/CBindingWrapping.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===- CBindingWrapping.h - Wrappers for casting C pointers -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//
@@ -19,7 +19,7 @@
1919
//===----------------------------------------------------------------------===//
2020
///
2121
/// \file
22-
/// This file declares the wrapping macros for the dpCtl C interface.
22+
/// This file declares the wrapping macros for the dpctl C interface.
2323
///
2424
//===----------------------------------------------------------------------===//
2525

‎dpctl-capi/include/Support/DllExport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===--------- DllExport.h - Decalres dllexport for Windows -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/include/Support/ExternC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===----------- ExternC.h - Defines an extern C helper macro -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/include/Support/MemOwnershipAttrs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===- MemOwnershipAttrs.h - Defines memory ownership attributes -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//
@@ -22,7 +22,7 @@
2222
/// This file defines a group of macros that serve as attributes indicating the
2323
/// type of ownership of a pointer. The macros are modeled after similar
2424
/// attributes defines in Integer Set Library (isl) and serve the purpose of
25-
/// helping a programmer understand the semantics of a dpCtl function.
25+
/// helping a programmer understand the semantics of a dpctl function.
2626
///
2727
//===----------------------------------------------------------------------===//
2828

‎dpctl-capi/include/dpctl_data_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===-------------- dpctl_data_types.h - Defines integer types -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

‎dpctl-capi/include/dpctl_error_handler_type.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//===--- dpctl_error_handler_types.h - Error handler callbacks -*-C++-*- ===//
22
//
3-
// Data Parallel Control (dpCtl)
3+
// Data Parallel Control (dpctl)
44
//
55
// Copyright 2020-2021 Intel Corporation
66
//

0 commit comments

Comments
 (0)