Skip to content

Commit 2c07fab

Browse files
Merge remote-tracking branch 'origin/master' into feature/memory-zero-copy
2 parents 0a8da06 + 8c4ffbb commit 2c07fab

20 files changed

+9
-2446
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [Unreleased]
5+
### Removed
6+
- The Legacy OpenCL interface.
7+
48
## [0.3.6] - 2020-10-06
59
### Added
610
- Changelog was added for dpctl.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
What?
44
====
5-
A lightweight Python package exposing a subset of OpenCL and SYCL
6-
functionalities.
5+
A lightweight Python package exposing a subset of SYCL functionalities.
76

87
Requirements
98
============

backends/CMakeLists.txt

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ else()
8484
message(FATAL_ERROR "Unsupported system.")
8585
endif()
8686

87-
88-
set(OpenCL_INCLUDE_DIR "${DPCPP_ROOT}/include/sycl")
89-
set(OpenCL_LIBRARY "${DPCPP_ROOT}/lib/libOpenCL.so")
90-
91-
message(STATUS "OpenCL_INCLUDE_DIR: ${OpenCL_INCLUDE_DIR}")
92-
message(STATUS "OpenCL_LIBRARY: ${OpenCL_LIBRARY}")
93-
9487
add_library(
9588
DPPLSyclInterface
9689
SHARED
@@ -106,13 +99,6 @@ add_library(
10699
source/dppl_utils.cpp
107100
)
108101

109-
# Install DPPLOpenCLInterface
110-
add_library(
111-
DPPLOpenCLInterface
112-
SHARED
113-
source/dppl_opencl_interface.c
114-
)
115-
116102
# Install DPPLSyclInterface
117103
target_include_directories(
118104
DPPLSyclInterface
@@ -122,18 +108,6 @@ target_include_directories(
122108
${NUMPY_INCLUDE_DIR}
123109
)
124110

125-
target_include_directories(
126-
DPPLOpenCLInterface
127-
PRIVATE
128-
${CMAKE_SOURCE_DIR}/include/
129-
)
130-
131-
target_include_directories(
132-
DPPLOpenCLInterface
133-
PUBLIC
134-
${OpenCL_INCLUDE_DIR}
135-
)
136-
137111
if(WIN32)
138112
message(
139113
STATUS
@@ -150,10 +124,6 @@ if(WIN32)
150124
PRIVATE ${DPCPP_ROOT}/lib/sycl.lib
151125
PRIVATE ${DPCPP_ROOT}/lib/OpenCL.lib
152126
)
153-
target_link_libraries(
154-
DPPLOpenCLInterface
155-
PRIVATE ${DPCPP_ROOT}/lib/OpenCL.lib
156-
)
157127
endif()
158128

159129
install(
@@ -163,14 +133,6 @@ install(
163133
"${CMAKE_INSTALL_PREFIX}/lib/"
164134
)
165135

166-
install(
167-
TARGETS
168-
DPPLOpenCLInterface
169-
LIBRARY
170-
DESTINATION
171-
"${CMAKE_INSTALL_PREFIX}/lib/"
172-
)
173-
174136
# Install all headers
175137
file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/include/*.h*")
176138
foreach(HEADER ${HEADERS})

0 commit comments

Comments
 (0)