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

Code quality: destructors of static global objects will no longer call external dependencies. Manual cleaning possible through backend::release()

Browse Source 
This should solve errors when libOpenCL's ICD was unloaded prior to libisaac.
This commit is contained in:
Philippe Tillet
2015-07-31 15:47:41 -07:00
parent bbfbc9c3e7
commit dd5f592fd8
14 changed files with 151 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/isaac/driver/backend.h
View File

@@ -6,6 +6,7 @@
#include <vector>
#include "isaac/driver/common.h"
#include "isaac/driver/program.h"
#include "isaac/defines.h"
namespace isaac
@@ -18,30 +19,37 @@ class CommandQueue;
class ISAACAPI backend
{
public:
typedef std::list<Context> context_container;
typedef std::map<Context*, std::vector<CommandQueue>> queues_container;
private:
static void cuinit();
static void clinit();
static void init();
public:
static std::list<Context> const & contexts();
class programs
{
public:
static Program const & add(Context const & scontext, std::string const & name, std::string const & src);
static Program const * find(Context const & context, std::string const & name);
static void release();
private:
static std::map<driver::Context const *, std::map<std::string, Program*> > programs_;
};
static std::list<Context const *> const & contexts();
static Context const & import(cl_context context);
static Context const & default_context();
static std::vector<CommandQueue> & queues(Context const &);
static void synchronize(Context const &);
static CommandQueue & queue(Context const &, unsigned int id);
static void release();
private:
static std::list<Context> contexts_;
static std::map<Context*, std::vector<CommandQueue>> queues_;
static std::list<Context const *> contexts_;
static std::map<Context const *, std::vector<CommandQueue*>> queues_;
public:
static unsigned int default_device;
static cl_command_queue_properties queue_properties;
};
ISAACAPI void synchronize(std::vector<CommandQueue> const &);
ISAACAPI void synchronize(Context const &);
}
}

9
include/isaac/driver/program.h
View File

@@ -29,15 +29,6 @@ private:
HANDLE_TYPE(cl_program, CUmodule) h_;
};
class ISAACAPI ProgramsHandler
{
public:
static Program const & add(Context const & scontext, std::string const & name, std::string const & src);
static Program const * find(Context const & context, std::string const & name);
private:
static std::map<driver::Context const *, std::map<std::string, Program> > programs_;
};
}
}

2
include/isaac/symbolic/expression.h
View File

@@ -238,7 +238,7 @@ struct execution_options_type
{
if(queue_)
return *queue_;
return driver::backend::queues(context)[queue_id_];
return driver::backend::queue(context, queue_id_);
}
std::list<driver::Event>* events;