gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix in cache

Browse Source
This commit is contained in:
Philippe Tillet
2015-01-16 15:24:16 -05:00
parent f9e5221ec8
commit 540bef5c75
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/cl/program_map.cpp
View File

@@ -22,6 +22,7 @@ program_map::program_map()
cl::Program program_map::add(cl::Context & context, std::string const & pname, std::string const & source) cl::Program program_map::add(cl::Context & context, std::string const & pname, std::string const & source)
{ {
cl_context clctx = context.operator ()(); cl_context clctx = context.operator ()();
container_type::mapped_type map = data_[clctx]; container_type::mapped_type map = data_[clctx];
container_type::mapped_type::iterator it = map.find(pname); container_type::mapped_type::iterator it = map.find(pname);
@@ -34,6 +35,7 @@ cl::Program program_map::add(cl::Context & context, std::string const & pname, s
cl::Program res; cl::Program res;
// Retrieves the program in the cache // Retrieves the program in the cache
bool compile = true;
if (cache_path_.size()) if (cache_path_.size())
{ {
std::string prefix; std::string prefix;
@@ -45,17 +47,17 @@ cl::Program program_map::add(cl::Context & context, std::string const & pname, s
if (cached) if (cached)
{ {
std::size_t len; std::size_t len;
std::vector<unsigned char> buffer; std::vector<char> buffer;
cached.read((char*)&len, sizeof(std::size_t)); cached.read((char*)&len, sizeof(std::size_t));
buffer.resize(len); buffer.resize(len);
cached.read((char*)buffer.data(), std::streamsize(len)); cached.read((char*)buffer.data(), std::streamsize(len));
unsigned char* cbuffer = buffer.data(); char* cbuffer = buffer.data();
res = cl::Program(context, devices, cl::Program::Binaries(1, std::make_pair(cbuffer, len)), NULL, &err);
res = cl::Program(context, devices, cl::Program::Binaries(1, std::make_pair((void*)&cbuffer, len)), NULL, &err); compile = false;
} }
} }
//Gets from source //Gets from source
else if(compile)
{ {
const char * csrc = source.c_str(); const char * csrc = source.c_str();
std::size_t srclen = source.size(); std::size_t srclen = source.size();
@@ -71,7 +73,7 @@ cl::Program program_map::add(cl::Context & context, std::string const & pname, s
// Store the program in the cache // Store the program in the cache
if (cache_path_.size()) if (cache_path_.size() && compile)
{ {
std::vector<std::size_t> sizes = res.getInfo<CL_PROGRAM_BINARY_SIZES>(); std::vector<std::size_t> sizes = res.getInfo<CL_PROGRAM_BINARY_SIZES>();
std::vector<char*> binaries = res.getInfo<CL_PROGRAM_BINARIES>(); std::vector<char*> binaries = res.getInfo<CL_PROGRAM_BINARIES>();