Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
cb8588c3
Commit
cb8588c3
authored
Dec 29, 2017
by
Marian Triebe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build of OpenCL module under windows
closes #644
parent
463ebbfe
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
8 deletions
+11
-8
CMakeLists.txt
CMakeLists.txt
+1
-0
libcaf_opencl/CMakeLists.txt
libcaf_opencl/CMakeLists.txt
+3
-1
libcaf_opencl/caf/opencl/opencl_err.hpp
libcaf_opencl/caf/opencl/opencl_err.hpp
+1
-1
libcaf_opencl/src/opencl_err.cpp
libcaf_opencl/src/opencl_err.cpp
+1
-1
libcaf_opencl/test/opencl.cpp
libcaf_opencl/test/opencl.cpp
+5
-5
No files found.
CMakeLists.txt
View file @
cb8588c3
...
...
@@ -572,6 +572,7 @@ if(NOT CAF_NO_OPENCL)
if
(
${
CMAKE_MAJOR_VERSION
}
.
${
CMAKE_MINOR_VERSION
}
GREATER 3.0
)
find_package
(
OpenCL
)
if
(
OpenCL_FOUND
)
include_directories
(
BEFORE
${
OpenCL_INCLUDE_DIRS
}
)
add_optional_caf_lib
(
opencl
)
add_optional_caf_binaries
(
libcaf_opencl/examples
)
else
()
...
...
libcaf_opencl/CMakeLists.txt
View file @
cb8588c3
...
...
@@ -33,7 +33,9 @@ if(NOT CAF_BUILD_STATIC_ONLY)
endif
()
# build static library only if --build-static or --build-static-only was set
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
add_library
(
libcaf_opencl_static STATIC
${
LIBCAF_OPENCL_HDRS
}
${
LIBCAF_OPENCL_SRCS
}
)
add_library
(
libcaf_opencl_static STATIC
${
LIBCAF_OPENCL_SRCS
}
${
LIBCAF_OPENCL_HDRS
}
${
OpenCL_INCLUDE_DIRS
}
)
target_link_libraries
(
libcaf_opencl_static
${
LD_FLAGS
}
${
CAF_LIBRARY_CORE_STATIC
}
${
OpenCL_LIBRARIES
}
)
...
...
libcaf_opencl/caf/opencl/opencl_err.hpp
View file @
cb8588c3
...
...
@@ -32,7 +32,7 @@ namespace caf {
namespace
opencl
{
void
throwcl
(
const
char
*
fname
,
cl_int
err
);
void
pfn_notify
(
const
char
*
errinfo
,
const
void
*
,
size_t
,
void
*
);
void
CL_CALLBACK
pfn_notify
(
const
char
*
errinfo
,
const
void
*
,
size_t
,
void
*
);
// call convention for simply calling a function
template
<
class
F
,
class
...
Ts
>
...
...
libcaf_opencl/src/opencl_err.cpp
View file @
cb8588c3
...
...
@@ -32,7 +32,7 @@ void throwcl(const char* fname, cl_int err) {
}
}
void
pfn_notify
(
const
char
*
errinfo
,
const
void
*
,
size_t
,
void
*
)
{
void
CL_CALLBACK
pfn_notify
(
const
char
*
errinfo
,
const
void
*
,
size_t
,
void
*
)
{
CAF_LOG_ERROR
(
"
\n
##### Error message via pfn_notify #####
\n
"
<<
errinfo
<<
"
\n
########################################"
);
...
...
libcaf_opencl/test/opencl.cpp
View file @
cb8588c3
...
...
@@ -458,7 +458,7 @@ void test_opencl(actor_system& sys) {
return
problem_size
;
};
// constant memory arguments
const
ivec
arr7
{
problem_size
};
const
ivec
arr7
{
static_cast
<
int
>
(
problem_size
)
};
auto
w7
=
mngr
.
spawn
(
kernel_source
,
kn_const
,
opencl
::
nd_range
{
dims
{
problem_size
}},
opencl
::
in
<
int
>
{},
...
...
@@ -759,7 +759,7 @@ void test_in_val_out_val(actor_system& sys) {
// calculator function for getting the size of the output
auto
res_size2
=
[](
const
ivec
&
)
{
return
problem_size
;
};
// constant memory arguments
const
ivec
input2
{
problem_size
};
const
ivec
input2
{
static_cast
<
int
>
(
problem_size
)
};
auto
w6
=
mngr
.
spawn
(
kernel_source
,
kn_const
,
nd_range
{
dims
{
problem_size
}},
in
<
int
>
{},
out
<
int
>
{
res_size2
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment