Fix merge conflicts

Author: vlad-perevezentsev

dpctl/__init__.pxd

@@ -30,3 +30,4 @@
 from dpctl._sycl_core cimport *
 from dpctl._memory import *
 from dpctl.dptensor.dparray import *
+

dpctl/dptensor/dparray.py

@@ -1,3 +1,27 @@
+##===---------- dparray.py - dpctl  -------*- Python -*----===##
+##
+##                      Data Parallel Control (dpCtl)
+##
+## Copyright 2020 Intel Corporation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##    http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+##===----------------------------------------------------------------------===##
+###
+### \file
+### This file implements a dparray - USM aware implementation of ndarray.
+##===----------------------------------------------------------------------===##
+
 import numpy as np
 from inspect import getmembers, isfunction, isclass, isbuiltin
 from numbers import Number

dpctl/tests/__init__.py

@@ -22,6 +22,7 @@
 ## Top-level module of all dpctl Python unit test cases.
 ##===----------------------------------------------------------------------===##
 
+from .test_dparray import *
 from .test_dump_functions import *
 from .test_sycl_device import *
 from .test_sycl_kernel_submit import *

dpctl/tests/test_dparray.py

@@ -1,9 +1,33 @@
+##===---------- test_dparray.py - dpctl  -------*- Python -*----===##
+##
+##                      Data Parallel Control (dpCtl)
+##
+## Copyright 2020 Intel Corporation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##    http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+##===----------------------------------------------------------------------===##
+###
+### \file
+### A basic unit test for dpctl.dparray.
+##===----------------------------------------------------------------------===##
+
 import unittest
 from dpctl.dptensor import dparray
 import numpy
 
 
-class TestOverloadList(unittest.TestCase):
+class Test_dparray(unittest.TestCase):
     def setUp(self):
         self.X = dparray.ndarray((256, 4), dtype="d")
         self.X.fill(1.0)

setup.py

@@ -1,25 +1,25 @@
 ##===---------- setup.py - dpctl.ocldrv interface -----*- Python -*-----===##
 ##
-# Data Parallel Control Library (dpCtl)
+##               Data Parallel Control Library (dpCtl)
 ##
-# Copyright 2020 Intel Corporation
+## Copyright 2020 Intel Corporation
 ##
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
 ##
-# http://www.apache.org/licenses/LICENSE-2.0
+##    http://www.apache.org/licenses/LICENSE-2.0
 ##
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
 ##
 ##===----------------------------------------------------------------------===##
 ###
-# \file
-# This file builds the dpctl and dpctl.ocldrv extension modules.
+### \file
+### This file builds the dpctl and dpctl.ocldrv extension modules.
 ##===----------------------------------------------------------------------===##
 import os
 import os.path