Merge remote-tracking branch 'upstream/master' into gold/2021

README.md

@@ -46,7 +46,7 @@ to program on XPUs.
 You can install the library with [conda](https://anaconda.org/intel/dpctl) and
 [pip](https://pypi.org/project/dpctl/). It is also available in the [Intel(R)
 Distribution for
-Python](https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/distribution-for-python.html)
+Python](https://www.intel.com/content/www/us/en/developer/tools/oneapi/distribution-for-python.html)
 (IDP).
 
 ## Inte(R) oneAPI

conda-recipe/build.sh

@@ -4,6 +4,7 @@
 # by DPC++ compiler conda packages. Will need to be added to DPC++ compiler
 # activation scripts.
 export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/compiler/lib/intel64_lin:$PREFIX/compiler/lib:$PREFIX/lib"
 
 # Intel LLVM must cooperate with compiler and sysroot from conda
 echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg

docs/docfiles/boilerplate.rst

@@ -2,7 +2,7 @@ About
 =====
 
 dpctl is developed by Intel(R) and is part of the `Intel Distribution for
-Python <https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/distribution-for-python.html>`_.
+Python <https://www.intel.com/content/www/us/en/developer/tools/oneapi/distribution-for-python.html>`_.
 
 Contributing
 ============

dpctl/tensor/libtensor/include/kernels/boolean_advanced_indexing.hpp

@@ -1,4 +1,4 @@
-//=== boolean_advance_indexing.hpp -                      ------*-C++-*--/===//
+//=== boolean_advanced_indexing.hpp -                      ------*-C++-*--/===//
 //
 //                      Data Parallel Control (dpctl)
 //

dpctl/tensor/libtensor/include/kernels/elementwise_functions/common_inplace.hpp

@@ -1,4 +1,5 @@
-//=== common.hpp -  Common code for elementwise operations ----- *-C++-*--/===//
+//=== common_inplace.hpp -  Common code for in-place elementwise operations
+//----- *-C++-*--/===//
 //
 //                      Data Parallel Control (dpctl)
 //
@@ -19,7 +20,7 @@
 //===---------------------------------------------------------------------===//
 ///
 /// \file
-/// This file defines common code for elementwise tensor operations.
+/// This file defines common code for in-place elementwise tensor operations.
 //===---------------------------------------------------------------------===//
 
 #pragma once

dpctl/tensor/libtensor/source/integer_advanced_indexing.cpp

@@ -1,4 +1,4 @@
-//===-- take_kernel_impl.cpp - Implementation of take  --*-C++-*-/===//
+//===-- integer_advanced_indexing.cpp -                         --*-C++-*-/===//
 //
 //                      Data Parallel Control (dpctl)
 //

dpctl/tensor/libtensor/source/integer_advanced_indexing.hpp

@@ -1,4 +1,4 @@
-//===----------- Implementation of _tensor_impl module  ---------*-C++-*-/===//
+//===-- integer_advanced_indexing.hpp -                         --*-C++-*-/===//
 //
 //                      Data Parallel Control (dpctl)
 //
@@ -19,7 +19,8 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// This file defines functions of dpctl.tensor._tensor_impl extensions
+/// This file declares Python API for implementation functions of
+/// dpctl.tensor.take and dpctl.tensor.put
 //===----------------------------------------------------------------------===//
 
 #pragma once