Merge branch 'upstream_master'

Author: Diptorup Deb

.git-blame-ignore-revs

@@ -0,0 +1,4 @@
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Migrate code style to Black
+41ccd65e2e659aa0add0e5ab59f1a46e32cc4c46

.github/workflows/black.yml

@@ -0,0 +1,28 @@
+# This is a workflow to format Python code with black formatter
+
+name: black
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "black"
+  black:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      # Set up a Python environment for use in actions
+      - uses: actions/setup-python@v2
+
+      # Run black code formatter
+      - uses: psf/black@stable

CONTRIBUTING.md

@@ -1 +1,10 @@
-Coming soon
+# Python code style
+
+## black
+
+We use [black](https://black.readthedocs.io/en/stable/) code formatter.
+
+- Revision: `20.8b1` or branch `stable`.
+- See configuration in `pyproject.toml`.
+
+Run before each commit: `black .`

README.md

@@ -1,3 +1,5 @@
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
 What?
 ====
 A lightweight Python package exposing a subset of OpenCL and SYCL

dpctl/__init__.py

@@ -22,7 +22,7 @@
 ## This top-level dpctl module.
 ##
 ##===----------------------------------------------------------------------===##
-'''
+"""
     Data Parallel Control (dpCtl)
 
     dpCtl provides a lightweight Python abstraction over DPC++/SYCL and
@@ -43,12 +43,13 @@
 
     Please use `pydoc dpctl.ocldrv` to look at the current API for dpctl.ocldrv.
 
-'''
+"""
 __author__ = "Intel Corp."
 
 from ._sycl_core import *
 from ._version import get_versions
 
+
 def get_include():
     """
     Return the directory that contains the dpCtl *.h header files.
@@ -57,7 +58,9 @@ def get_include():
     this function to locate the appropriate include directory.
     """
     import os.path
-    return os.path.join(os.path.dirname(__file__), 'include')
 
-__version__ = get_versions()['version']
+    return os.path.join(os.path.dirname(__file__), "include")
+
+
+__version__ = get_versions()["version"]
 del get_versions

dpctl/_sycl_core.pxd

@@ -118,3 +118,6 @@ cdef class SyclQueue:
     cpdef void wait (self)
     cdef DPPLSyclQueueRef get_queue_ref (self)
     cpdef memcpy (self, dest, src, int count)
+
+
+cpdef SyclQueue get_current_queue()

dpctl/_sycl_core.pyx

@@ -626,7 +626,7 @@ cdef class _SyclRTManager:
         '''
         return self.get_current_queue().get_sycl_device().get_device_type()
 
-    def get_current_queue (self):
+    cpdef SyclQueue get_current_queue (self):
         ''' Returns the activated SYCL queue as a PyCapsule.
         '''
         return SyclQueue._create(DPPLQueueMgr_GetCurrentQueue())
@@ -736,7 +736,6 @@ _mgr = _SyclRTManager()
 
 # Global bound functions
 dump                     = _mgr.dump
-get_current_queue        = _mgr.get_current_queue
 get_current_device_type  = _mgr.get_current_device_type
 get_num_platforms        = _mgr.get_num_platforms
 get_num_activated_queues = _mgr.get_num_activated_queues
@@ -747,6 +746,10 @@ has_sycl_platforms       = _mgr.has_sycl_platforms
 set_default_queue        = _mgr.set_default_queue
 is_in_device_context     = _mgr.is_in_device_context
 
+cpdef SyclQueue get_current_queue():
+    ''' Obtain current Sycl Queue from Data Parallel Control package '''
+    return _mgr.get_current_queue()
+
 
 def create_program_from_source (SyclQueue q, unicode source, unicode copts=""):
     ''' Creates a Sycl interoperability program from an OpenCL source string.