cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sycl 2020 after merge from main

Browse Source
This commit is contained in:
Tom Deakin 2021-12-09 11:25:26 +00:00
parent 06e46908e7
commit edcc3e79cd
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sycl/SYCLStream.cpp
View File

@ -28,29 +28,7 @@ SYCLStream<T>::SYCLStream(const size_t ARRAY_SIZE, const int device_index)
if (device_index >= devices.size()) if (device_index >= devices.size())
throw std::runtime_error("Invalid device index"); throw std::runtime_error("Invalid device index");
<<<<<<< HEAD:SYCLStream.cpp
sycl::device dev = devices[device_index]; sycl::device dev = devices[device_index];
=======
// Check device can support FP64 if needed
if (sizeof(T) == sizeof(double))
{
if (dev.get_info<info::device::double_fp_config>().size() == 0) {
throw std::runtime_error("Device does not support double precision, please use --float");
}
}
// Determine sensible dot kernel NDRange configuration
if (dev.is_cpu())
{
dot_num_groups = dev.get_info<info::device::max_compute_units>();
dot_wgsize = dev.get_info<info::device::native_vector_width_double>() * 2;
}
else
{
dot_num_groups = dev.get_info<info::device::max_compute_units>() * 4;
dot_wgsize = dev.get_info<info::device::max_work_group_size>();
}
>>>>>>> main:src/sycl/SYCLStream.cpp
// Print out device information // Print out device information
std::cout << "Using SYCL device " << getDeviceName(device_index) << std::endl; std::cout << "Using SYCL device " << getDeviceName(device_index) << std::endl;

6
src/sycl/SYCLStream.h
View File

@ -11,14 +11,10 @@
#include <memory> #include <memory>
#include "Stream.h" #include "Stream.h"
<<<<<<< HEAD:SYCLStream.h
#include <sycl/sycl.hpp> #include <sycl/sycl.hpp>
=======
#include "CL/sycl.hpp"
>>>>>>> main:src/sycl/SYCLStream.h
#define IMPLEMENTATION_STRING "SYCL" #define IMPLEMENTATION_STRING "SYCL 2020"
template <class T> template <class T>
class SYCLStream : public Stream<T> class SYCLStream : public Stream<T>