Skip to content
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

Make sure ext_oneapi_get_default_context doesn't broke runtime on windows #2742

Merged
merged 5 commits into from
Nov 19, 2024
Merged

Make sure ext_oneapi_get_default_context doesn't broke runtime on windows #2742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03a32c5
Make sure 'ext_oneapi_get_default_context' doesn't broke compilation …
anmyachev Nov 18, 2024
d132f22
implement 'get_default_context' as a free function
anmyachev Nov 18, 2024
524ad85
cleanup
anmyachev Nov 19, 2024
ca005fd
Merge remote-tracking branch 'origin' into amyachev/def-ctx
anmyachev Nov 19, 2024
57285f8
clenup
anmyachev Nov 19, 2024
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
23 changes: 21 additions & 2 deletions third_party/intel/backend/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,26 @@ struct BuildFlags {
}
};

sycl::context get_default_context(const sycl::device &sycl_device) {
const auto &platform = sycl_device.get_platform();
#ifdef WIN32
sycl::context ctx;
try {
ctx = platform.ext_oneapi_get_default_context();
} catch (const std::runtime_error &ex) {
// This exception is thrown on Windows because
// ext_oneapi_get_default_context is not implemented. But it can be safely
// ignored it seems.
#if _DEBUG
std::cout << "ERROR: " << ex.what() << std::endl;
#endif
}
return ctx;
#else
return platform.ext_oneapi_get_default_context();
#endif
}

static PyObject *loadBinary(PyObject *self, PyObject *args) {
const char *name, *build_flags_ptr;
int shared;
Expand Down Expand Up @@ -194,8 +214,7 @@ static PyObject *loadBinary(PyObject *self, PyObject *args) {
const size_t binary_size = PyBytes_Size(py_bytes);

uint8_t *binary_ptr = (uint8_t *)PyBytes_AsString(py_bytes);
const auto ctx =
sycl_device.get_platform().ext_oneapi_get_default_context();
const auto &ctx = get_default_context(sycl_device);
const auto l0_device =
sycl::get_native<sycl::backend::ext_oneapi_level_zero>(sycl_device);
const auto l0_context =
Expand Down
23 changes: 22 additions & 1 deletion utils/SPIRVRunner/SPIRVRunner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,26 @@ static inline T checkSyclErrors(const std::tuple<T, ze_result_t> tuple) {
return std::get<0>(tuple);
}

sycl::context get_default_context(const sycl::device &sycl_device) {
const auto &platform = sycl_device.get_platform();
#ifdef WIN32
sycl::context ctx;
try {
ctx = platform.ext_oneapi_get_default_context();
} catch (const std::runtime_error &ex) {
// This exception is thrown on Windows because
// ext_oneapi_get_default_context is not implemented. But it can be safely
// ignored it seems.
#if _DEBUG
std::cout << "ERROR: " << ex.what() << std::endl;
#endif
}
return ctx;
#else
return platform.ext_oneapi_get_default_context();
#endif
}

/** SYCL Functions **/
std::tuple<sycl::kernel_bundle<sycl::bundle_state::executable>, sycl::kernel,
int32_t, int32_t>
Expand All @@ -138,7 +158,8 @@ loadBinary(const std::string &kernel_name, const std::string &build_flags,
const auto &sycl_l0_device_pair = g_sycl_l0_device_list[deviceId];
const sycl::device sycl_device = sycl_l0_device_pair.first;

const auto ctx = sycl_device.get_platform().ext_oneapi_get_default_context();
const auto &ctx = get_default_context(sycl_device);

const auto l0_device =
sycl::get_native<sycl::backend::ext_oneapi_level_zero>(sycl_device);
const auto l0_context =
Expand Down