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

updated to compile against more recent opencl headers #13

Open
wants to merge 1 commit into
base: maint-3.8
Choose a base branch
from
Open

updated to compile against more recent opencl headers #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmake/Modules/FindOpenCL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ find_path(CL_HPP
# Testing NOTE: you may need to delete the build directory to remove any cmake cache
# then recreate it for changes here to actually show up as expected.
CL/clxxasdf.hpp OpenCL/clxxasdf.hpp
CL/cl.hpp OpenCL/cl.hpp
CL/opencl.hpp OpenCL/cl.hpp
PATHS
ENV "PROGRAMFILES(X86)"
ENV AMDAPPSDKROOT
Expand Down
5 changes: 4 additions & 1 deletion include/clenabled/GRCLBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@
#define CL_VERSION_2_2
#define CL_TARGET_OPENCL_VERSION 220

#define CL_HPP_ENABLE_EXCEPTIONS
#define CL_HPP_TARGET_OPENCL_VERSION 220

#if defined(__APPLE__) || defined(__MACOSX)
#include <OpenCL/cl.hpp>
#else
#include <CL/cl.hpp>
#include <CL/opencl.hpp>
#endif

#include "clSComplex.h"
Expand Down
1 change: 1 addition & 0 deletions lib/GRCLBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <iostream>

#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
#include <clenabled/GRCLBase.h>

namespace gr {
Expand Down
2 changes: 2 additions & 0 deletions lib/clFFT_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "config.h"
#endif

#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY

#include <gnuradio/io_signature.h>
#include "clFFT_impl.h"
#include "window.h"
Expand Down
2 changes: 2 additions & 0 deletions lib/clPolyphaseChannelizer_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "config.h"
#endif

#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY

#include <gnuradio/io_signature.h>
#include "clPolyphaseChannelizer_impl.h"

Expand Down
2 changes: 2 additions & 0 deletions lib/clXCorrelate_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,8 @@
#include "config.h"
#endif

#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY

#include <gnuradio/io_signature.h>
#include "clXCorrelate_impl.h"

Expand Down
1 change: 1 addition & 0 deletions lib/clXEngine_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@
#include "config.h"
#endif

#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
#include <gnuradio/io_signature.h>
#include "clXEngine_impl.h"
#include <volk/volk.h>
Expand Down
5 changes: 4 additions & 1 deletion lib/clview.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
// #define CL_USE_DEPRECATED_OPENCL_1_2_APIS
#define CL_VERSION_1_2

#define CL_HPP_ENABLE_EXCEPTIONS
#define CL_HPP_TARGET_OPENCL_VERSION 200

#if defined(__APPLE__) || defined(__MACOSX)
#include <OpenCL/cl.hpp>
#else
#include <CL/cl.hpp>
#include <CL/opencl.hpp>
#endif

#include <iostream>
Expand Down
1 change: 1 addition & 0 deletions lib/clxcorrelate_fft_vcf_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@
#include "config.h"
#endif

#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
#include <gnuradio/io_signature.h>
#include "clxcorrelate_fft_vcf_impl.h"

Expand Down