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.

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

MAINT: remove DAAL CL kernels and GPU interfaces #2816

Merged
merged 48 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
58f477d
MAINT: remove daal CL kernels
ethanglaser Jun 10, 2024
32ec84a
removal of non oneapi/ files referencing oneapi/
ethanglaser Jun 10, 2024
2229960
remove daal/*/oneapi includes
ethanglaser Jun 10, 2024
b3be793
remove oneapi::internal references
ethanglaser Jun 10, 2024
c092890
alternative include for onedal knn
ethanglaser Jun 10, 2024
e2166d0
removal of logic outside of device.isCpu
ethanglaser Jun 11, 2024
f82b07c
small knn fixes
ethanglaser Jun 11, 2024
cb71bbd
restore include sycl table header
ethanglaser Jun 11, 2024
931e652
opencl cleanup
ethanglaser Jun 11, 2024
8c3a928
remove cl kernels
ethanglaser Jun 11, 2024
dec70f9
sycl table removal
ethanglaser Jun 11, 2024
4a06a24
remove deviceInfo checks
ethanglaser Jun 11, 2024
fb0c309
remova cpp/daal/src/sycl/*
ethanglaser Jun 12, 2024
ae30966
knn fixed
ethanglaser Jun 12, 2024
c42ad6f
removal of all execution context guard
ethanglaser Jun 12, 2024
f7db8de
delete sycl table adapter
ethanglaser Jun 12, 2024
15daa02
oops
ethanglaser Jun 12, 2024
0e64f13
swap include
ethanglaser Jun 12, 2024
6637b72
DAAL_SYCL_INTERFACE removal initial
ethanglaser Jun 12, 2024
417f911
clang
ethanglaser Jun 12, 2024
f438a9d
remove daal gpu support checker
ethanglaser Jun 12, 2024
a688c41
swap include
ethanglaser Jun 12, 2024
bc6ef59
re-add bazel build knn daal deps
ethanglaser Jun 12, 2024
665c1d7
clang
ethanglaser Jun 12, 2024
f2463f7
remove exec ctx, services/internal/sycl, clean BUILDs
ethanglaser Jun 14, 2024
980b1fa
broader include swap
ethanglaser Jun 17, 2024
bbde1fc
forgot threadcomm
ethanglaser Jun 17, 2024
19d3c0b
remove bazel circular depenendency
ethanglaser Jun 17, 2024
2397518
clang
ethanglaser Jun 17, 2024
89c1781
restore thread comm
ethanglaser Jun 17, 2024
c22f032
removal all daal SYCL container/dispatching macros
ethanglaser Jun 18, 2024
cb81d31
remove python double exit code check
ethanglaser Jun 18, 2024
6183276
Merge branch 'oneapi-src:main' into dev/eglaser-clkernel-removal
ethanglaser Jul 8, 2024
c5e9e9b
dpc bazel test fixes
ethanglaser Jul 8, 2024
ff8e54f
restore makefile
ethanglaser Jul 9, 2024
459cd13
more opencl restoration
ethanglaser Jul 9, 2024
163db8e
samples restore
ethanglaser Jul 9, 2024
b7d0905
Merge branch 'oneapi-src:main' into dev/eglaser-clkernel-removal
ethanglaser Jul 10, 2024
826c0f7
Merge branch 'oneapi-src:main' into dev/eglaser-clkernel-removal
ethanglaser Jul 11, 2024
d3adf04
restore .ci/env/apt.sh based on discussion
ethanglaser Jul 17, 2024
67dc473
swap ucapi knn header include
ethanglaser Jul 17, 2024
a160c7c
restore docs with opencl
ethanglaser Jul 17, 2024
706a871
Merge branch 'oneapi-src:main' into dev/eglaser-clkernel-removal
ethanglaser Jul 29, 2024
221144b
Merge branch 'main' into dev/eglaser-clkernel-removal
ethanglaser Aug 2, 2024
7fa1633
Merge branch 'oneapi-src:main' into dev/eglaser-clkernel-removal
ethanglaser Aug 7, 2024
45e9790
remove interop/common_dpc.hpp from new file
ethanglaser Aug 9, 2024
da06307
Merge branch 'oneapi-src:main' into dev/eglaser-clkernel-removal
ethanglaser Aug 12, 2024
766e978
address undefined uint error
ethanglaser Aug 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .ci/env/apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ function add_repo {

function install_dpcpp {
sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-2024.1
sudo bash -c 'echo libintelocl.so > /etc/OpenCL/vendors/intel-cpu.icd'
ethanglaser marked this conversation as resolved.
Show resolved Hide resolved
}

function install_mkl {
Expand Down
2 changes: 0 additions & 2 deletions .ci/pipeline/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,6 @@ jobs:
ret_code=0
python -m daal4py daal4py/tests/run_examples.py
ret_code=$(($ret_code + $?))
python -m daal4py daal4py/tests/daal4py/sycl/sklearn_sycl.py
ret_code=$(($ret_code + $?))
exit $ret_code
displayName: daal4py examples
- script: |
Expand Down
24 changes: 7 additions & 17 deletions cpp/daal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -122,23 +122,6 @@ daal_module(
],
)

daal_module(
name = "sycl",
hdrs = glob(["src/sycl/**/*.h", "src/sycl/**/*.cl"]),
srcs = glob(["src/sycl/**/*.cpp"]),
deps = select({
"@config//:backend_ref": [
":services",
"@onedal//cpp/daal/src/algorithms/engines:kernel",
],
"//conditions:default": [
":services",
"@onedal//cpp/daal/src/algorithms/engines:kernel",
"@micromkl_dpc//:headers",
],
}),
)

daal_module(
name = "threading_tbb",
srcs = glob(["src/threading/**/*.cpp"]),
Expand All @@ -164,6 +147,13 @@ daal_module(
}),
)

daal_module(
name = "engines",
deps = [
"@onedal//cpp/daal/src/algorithms/engines:kernel",
],
)

daal_module(
name = "core",
deps = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

#include "services/daal_memory.h"
#include "services/internal/daal_kernel_defines.h"
#include "services/internal/gpu_support_checker.h"
#include "services/internal/execution_context.h"

namespace daal
{
Expand Down Expand Up @@ -174,9 +172,6 @@ class DAAL_EXPORT AlgorithmDispatchContainer<batch, RV64Container DAAL_KERNEL_RV

virtual services::Status compute() DAAL_C11_OVERRIDE
{
services::internal::sycl::ExecutionContextIface & context = services::internal::getDefaultContext();
services::internal::sycl::InfoDevice & deviceInfo = context.getInfoDevice();
if (!daal::services::internal::isImplementedForDevice(deviceInfo, _cntr)) return services::Status(services::ErrorDeviceSupportNotImplemented);
_cntr->setArguments(this->_in, this->_res, this->_par, this->_hpar);
return _cntr->compute();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#include "algorithms/algorithm_container_base.h"
#include "services/error_handling.h"
#include "services/internal/gpu_support_checker.h"
#include "services/internal/execution_context.h"

namespace daal
{
Expand Down Expand Up @@ -78,9 +76,6 @@ class DAAL_EXPORT AlgorithmDispatchContainer : public AlgorithmContainerImpl<mod

virtual services::Status compute() DAAL_C11_OVERRIDE
{
services::internal::sycl::ExecutionContextIface & context = services::internal::getDefaultContext();
services::internal::sycl::InfoDevice & deviceInfo = context.getInfoDevice();
if (!daal::services::internal::isImplementedForDevice(deviceInfo, _cntr)) return services::Status(services::ErrorDeviceSupportNotImplemented);
_cntr->setArguments(this->_in, this->_pres, this->_par, this->_hpar);
return _cntr->compute();
}
Expand Down
57 changes: 0 additions & 57 deletions cpp/daal/include/daal_sycl.h

This file was deleted.

This file was deleted.

Loading
Loading