Skip to content

Add headers from tensor lib to conda package #1185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-pavlyk merged 2 commits into from
May 25, 2023
Merged

Add headers from tensor lib to conda package #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e80d3a1
Add DPCTL tensor headers to conda package
antonwolfy Apr 24, 2023
7e2eaba
Support --tensor-includes for dpctl module, add Dpctl_TENSOR_INCLUDE_…
oleksandr-pavlyk May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 8 additions & 2 deletions cmake/FindDpctl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ if(NOT Dpctl_FOUND)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)

endif()
endif()

Expand All @@ -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})

Expand All @@ -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)
16 changes: 15 additions & 1 deletion dpctl/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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:
Expand Down