Merge gold/2021 to master to keep release changes

README.md

@@ -25,6 +25,25 @@ cd dpnp
 ./0.build.sh
 ```
 
+## Install Wheel Package from Pypi
+Install DPNP
+```cmd
+python -m pip install --index-url https://pypi.anaconda.org/intel/simple -extra-index-url https://pypi.org/simple dpnp
+```
+Note: DPNP wheel package is placed on Pypi, but some of its dependencies (like Intel numpy) are in Anaconda Cloud.
+That is why install command requires additional intel Pypi channel from Anaconda Cloud.
+
+Set path to Performance Libraries in case of using venv or system Python:
+```cmd
+export LD_LIBRARY_PATH=<path_to_your_env>/lib
+```
+
+It is also required to set following environment variables:
+```cmd
+export OCL_ICD_FILENAMES_RESET=1
+export OCL_ICD_FILENAMES=libintelocl.so
+```
+
 ## Run test
 ```bash
 . ./0.env.sh

conda-recipe/build.sh

@@ -25,6 +25,10 @@ if [ -n "${TBBROOT}" ]; then
     . ${TBBROOT}/env/vars.sh
 fi
 
+# Set RPATH for wheels
+export CFLAGS="-Wl,-rpath,\$ORIGIN/../dpctl,-rpath,\$ORIGIN $CFLAGS"
+export LDFLAGS="-Wl,-rpath,\$ORIGIN/../dpctl,-rpath,\$ORIGIN $LDFLAGS"
+
 $PYTHON setup.py build_clib
 $PYTHON setup.py build_ext install
 

conda-recipe/meta.yaml

@@ -21,6 +21,7 @@ requirements:
       - dpctl >=0.5.0a0
       - dpcpp_cpp_rt >=2021.1.1
       - mkl >=2021.1.1
+      - mkl-dpcpp >=2021.1.1
 
 build:
     number: {{ GIT_DESCRIBE_NUMBER }}

setup.py

@@ -73,11 +73,8 @@
 with open('README.md') as f:
     __readme_file__ = f.read()
 
-with open('LICENSE.txt') as f:
-    __license_file__ = f.read()
-
 CLASSIFIERS = """\
-Development Status :: 0 - Alpha
+Development Status :: 4 - Beta
 Intended Audience :: Science/Research
 Intended Audience :: Developers
 License :: OSI Approved
@@ -183,13 +180,13 @@
       version=__version__,
       description="NumPy-like API accelerated with SYCL",
       long_description=__readme_file__,
+      long_description_content_type="text/markdown",
       author="Intel Corporation",
-      author_email="Intel Corporation",
       maintainer="Intel Corp.",
       maintainer_email="scripting@intel.com",
       url="https://intelpython.github.io/dpnp/",
       download_url="https://github.com/IntelPython/dpnp",
-      license=__license_file__,
+      license='BSD',
       classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
       keywords="sycl numpy python3 intel mkl oneapi gpu dpcpp pstl",
       platforms=["Linux", "Windows"],

utils/command_build_clib.py

@@ -269,7 +269,6 @@ def build_libraries(self, libraries):
                     link_command += " " + ".lib ".join(libraries) + ".lib"  # libraries
                     link_command += " /OUT:" + c_library_filename  # output file name
                     link_command += " " + " ".join(extra_link_postargs)
-                    print(link_command)
                     os.system(link_command)
                 else:
                     self.compiler.link_shared_lib(objects,