Merge pull request #1185 from IntelPython/include_tensor_headers

Add headers from tensor lib to conda package

Author: oleksandr-pavlyk

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: