Merge master into not_equal_impl

Author: vlad-perevezentsev

MANIFEST.in

@@ -18,5 +18,6 @@ include dpctl/program/_program_api.h
 include dpctl/tensor/_usmarray.h
 include dpctl/tensor/_usmarray_api.h
 recursive-include dpctl/tensor/include *
+recursive-include dpctl/tensor/libtensor/include *
 include dpctl/tests/input_files/*
 include dpctl/tests/*.pyx

cmake/FindDpctl.cmake

@@ -40,7 +40,6 @@ if(NOT Dpctl_FOUND)
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
       )
-
   endif()
 endif()
 
@@ -49,6 +48,12 @@ find_path(Dpctl_INCLUDE_DIR
   PATHS "${_dpctl_include_dir}" "${PYTHON_INCLUDE_DIR}"
   PATH_SUFFIXES dpctl/include
   )
+get_filename_component(_dpctl_dir ${_dpctl_include_dir} DIRECTORY)
+
+find_path(Dpctl_TENSOR_INCLUDE_DIR
+  kernels utils
+  PATHS "${_dpctl_dir}/tensor/libtensor/include"
+  )
 
 set(Dpctl_INCLUDE_DIRS ${Dpctl_INCLUDE_DIR})
 
@@ -57,8 +62,9 @@ set(Dpctl_INCLUDE_DIRS ${Dpctl_INCLUDE_DIR})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Dpctl
                                   REQUIRED_VARS
-                                    Dpctl_INCLUDE_DIR
+                                    Dpctl_INCLUDE_DIR Dpctl_TENSOR_INCLUDE_DIR
                                   VERSION_VAR Dpctl_VERSION
                                   )
 
 mark_as_advanced(Dpctl_INCLUDE_DIR)
+mark_as_advanced(Dpctl_TENSOR_INCLUDE_DIR)

dpctl/__main__.py

@@ -35,6 +35,13 @@ def print_includes() -> None:
     print("-I " + dpctl.get_include())
 
 
+def print_tensor_includes() -> None:
+    "Prints include flags for dpctl and SyclInterface library"
+    dpctl_dir = _dpctl_dir()
+    libtensor_dir = os.path.join(dpctl_dir, "tensor", "libtensor", "include")
+    print("-I " + libtensor_dir)
+
+
 def print_cmake_dir() -> None:
     "Prints directory with FindDpctl.cmake"
     dpctl_dir = _dpctl_dir()
@@ -75,7 +82,12 @@ def main() -> None:
     parser.add_argument(
         "--includes",
         action="store_true",
-        help="Include flags dpctl headers.",
+        help="Include flags for dpctl headers.",
+    )
+    parser.add_argument(
+        "--tensor-includes",
+        action="store_true",
+        help="Include flags for dpctl libtensor headers.",
     )
     parser.add_argument(
         "--cmakedir",
@@ -128,6 +140,8 @@ def main() -> None:
         return
     if args.includes:
         print_includes()
+    if args.tensor_includes:
+        print_tensor_includes()
     if args.cmakedir:
         print_cmake_dir()
     if args.library:

dpctl/tensor/CMakeLists.txt

@@ -47,6 +47,7 @@ pybind11_add_module(${python_module_name} MODULE
     ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/boolean_reductions.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/device_support_queries.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/elementwise_functions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/sum_reductions.cpp
 )
 set(_clang_prefix "")
 if (WIN32)

dpctl/tensor/__init__.py

@@ -94,17 +94,27 @@
 from ._elementwise_funcs import (
     abs,
     add,
+    conj,
     cos,
     divide,
     equal,
+    exp,
+    expm1,
+    imag,
     isfinite,
     isinf,
     isnan,
+    log,
+    log1p,
     multiply,
     not_equal,
+    proj,
+    real,
+    sin,
     sqrt,
     subtract,
 )
+from ._reduction import sum
 
 __all__ = [
     "Device",
@@ -183,14 +193,24 @@
     "inf",
     "abs",
     "add",
+    "conj",
     "cos",
+    "exp",
+    "expm1",
+    "imag",
     "isinf",
     "isnan",
     "isfinite",
+    "log",
+    "log1p",
+    "proj",
+    "real",
+    "sin",
     "sqrt",
     "divide",
     "multiply",
     "subtract",
     "equal",
     "not_equal",
+    "sum",
 ]

dpctl/tensor/_elementwise_common.py

@@ -255,7 +255,7 @@ def _resolve_weak_types(o1_dtype, o2_dtype, dev):
             raise ValueError
         o1_kind_num = _weak_type_num_kind(o1_dtype)
         o2_kind_num = _strong_dtype_num_kind(o2_dtype)
-        if o1_kind_num > o2_kind_num:
+        if o1_kind_num > o2_kind_num or o1_kind_num == 2:
             if isinstance(o1_dtype, WeakBooleanType):
                 return dpt.bool, o2_dtype
             if isinstance(o1_dtype, WeakIntegralType):
@@ -273,7 +273,7 @@ def _resolve_weak_types(o1_dtype, o2_dtype, dev):
     ):
         o1_kind_num = _strong_dtype_num_kind(o1_dtype)
         o2_kind_num = _weak_type_num_kind(o2_dtype)
-        if o2_kind_num > o1_kind_num:
+        if o2_kind_num > o1_kind_num or o2_kind_num == 2:
             if isinstance(o2_dtype, WeakBooleanType):
                 return o1_dtype, dpt.bool
             if isinstance(o2_dtype, WeakIntegralType):