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

Code quality: more ISAACEXPORT

Browse Source
This commit is contained in:
Philippe Tillet
2015-07-21 22:02:36 -07:00
parent d22d86e5c7
commit 5eb9212535
13 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/isaac/defines.h
View File

@@ -3,9 +3,9 @@
#if defined(_WIN32) || defined(_MSC_VER) #if defined(_WIN32) || defined(_MSC_VER)
#ifdef ISAAC_DLL #ifdef ISAAC_DLL
#define ISCAPI __declspec(dllexport) #define ISAACAPI __declspec(dllexport)
#else #else
#define ISCAPI __declspec(dllimport) #define ISAACAPI __declspec(dllimport)
#endif #endif
#else #else
#define ISAACAPI __attribute__((visibility("default"))) #define ISAACAPI __attribute__((visibility("default")))

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

@@ -4,6 +4,7 @@
#include <map> #include <map>
#include <list> #include <list>
#include "isaac/defines.h"
#include "isaac/driver/command_queue.h" #include "isaac/driver/command_queue.h"
#include "isaac/driver/context.h" #include "isaac/driver/context.h"
@@ -12,7 +13,7 @@ namespace isaac
namespace driver namespace driver
{ {
class queues_type class ISAACAPI queues_type
{ {
public: public:
typedef std::list<std::pair<Context, std::vector<CommandQueue> > > container_type; typedef std::list<std::pair<Context, std::vector<CommandQueue> > > container_type;

4
include/isaac/driver/buffer.h
View File

@@ -2,7 +2,7 @@
#define ISAAC_DRIVER_BUFFER_H #define ISAAC_DRIVER_BUFFER_H
#include "isaac/types.h" #include "isaac/types.h"
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include "isaac/driver/context.h" #include "isaac/driver/context.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
@@ -14,7 +14,7 @@ namespace driver
{ {
// Buffer // Buffer
class Buffer class ISAACAPI Buffer
{ {
friend class CommandQueue; friend class CommandQueue;
friend class Kernel; friend class Kernel;

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

@@ -2,9 +2,10 @@
#define ISAAC_DRIVER_COMMAND_QUEUE_H #define ISAAC_DRIVER_COMMAND_QUEUE_H
#include <map> #include <map>
#include "common.h" #include "isaac/defines.h"
#include "context.h" #include "isaac/driver/common.h"
#include "device.h" #include "isaac/driver/context.h"
#include "isaac/driver/device.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
namespace isaac namespace isaac
@@ -19,7 +20,7 @@ class NDRange;
class Buffer; class Buffer;
// Command Queue // Command Queue
class CommandQueue class ISAACAPI CommandQueue
{ {
public: public:
CommandQueue(cl::CommandQueue const & queue); CommandQueue(cl::CommandQueue const & queue);

15
include/isaac/driver/common.h
View File

@@ -6,13 +6,14 @@
#include <cuda.h> #include <cuda.h>
#include <nvrtc.h> #include <nvrtc.h>
#endif #endif
#include "isaac/defines.h"
namespace isaac namespace isaac
{ {
namespace driver namespace driver
{ {
enum backend_type enum ISAACAPI backend_type
{ {
OPENCL OPENCL
#ifdef ISAAC_WITH_CUDA #ifdef ISAAC_WITH_CUDA
@@ -20,7 +21,7 @@ enum backend_type
#endif #endif
}; };
enum device_type enum ISAACAPI device_type
{ {
DEVICE_TYPE_GPU = CL_DEVICE_TYPE_GPU, DEVICE_TYPE_GPU = CL_DEVICE_TYPE_GPU,
DEVICE_TYPE_CPU = CL_DEVICE_TYPE_CPU, DEVICE_TYPE_CPU = CL_DEVICE_TYPE_CPU,
@@ -35,7 +36,7 @@ namespace nvrtc
namespace exception namespace exception
{ {
#define ISAAC_CREATE_NVRTC_EXCEPTION(name, msg) class name: public std::exception { public: const char * what() const throw(){ return "NVRTC: Error- " msg; } } #define ISAAC_CREATE_NVRTC_EXCEPTION(name, msg) class ISAACAPI name: public std::exception { public: const char * what() const throw(){ return "NVRTC: Error- " msg; } }
ISAAC_CREATE_NVRTC_EXCEPTION(out_of_memory ,"out of memory exception"); ISAAC_CREATE_NVRTC_EXCEPTION(out_of_memory ,"out of memory exception");
ISAAC_CREATE_NVRTC_EXCEPTION(program_creation_failure ,"program creation failure"); ISAAC_CREATE_NVRTC_EXCEPTION(program_creation_failure ,"program creation failure");
@@ -60,7 +61,7 @@ namespace cuda
class base: public std::exception{}; class base: public std::exception{};
#define ISAAC_CREATE_CUDA_EXCEPTION(name, msg) class name: public base { public:const char * what() const throw(){ return "CUDA: Error- " msg; } } #define ISAAC_CREATE_CUDA_EXCEPTION(name, msg) class ISAACAPI name: public base { public:const char * what() const throw(){ return "CUDA: Error- " msg; } }
ISAAC_CREATE_CUDA_EXCEPTION(invalid_value ,"invalid value"); ISAAC_CREATE_CUDA_EXCEPTION(invalid_value ,"invalid value");
@@ -135,9 +136,9 @@ namespace ocl
namespace exception namespace exception
{ {
class base: public std::exception{}; class ISAACAPI base: public std::exception{};
#define ISAAC_CREATE_CL_EXCEPTION(name, msg) class name: public base { public: const char * what() const throw(){ return "OpenCL: Error- " msg; } } #define ISAAC_CREATE_CL_EXCEPTION(name, msg) class ISAACAPI name: public base { public: const char * what() const throw(){ return "OpenCL: Error- " msg; } }
ISAAC_CREATE_CL_EXCEPTION(device_not_found, "device not found"); ISAAC_CREATE_CL_EXCEPTION(device_not_found, "device not found");
@@ -191,7 +192,7 @@ namespace ocl
#endif #endif
} }
void check(cl_int err); ISAACAPI void check(cl_int err);
} }

4
include/isaac/driver/context.h
View File

@@ -3,7 +3,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include "isaac/driver/device.h" #include "isaac/driver/device.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
@@ -14,7 +14,7 @@ namespace isaac
namespace driver namespace driver
{ {
class Context class ISAACAPI Context
{ {
friend class Program; friend class Program;
friend class CommandQueue; friend class CommandQueue;

5
include/isaac/driver/device.h
View File

@@ -1,6 +1,7 @@
#ifndef ISAAC_DRIVER_DEVICE_H #ifndef ISAAC_DRIVER_DEVICE_H
#define ISAAC_DRIVER_DEVICE_H #define ISAAC_DRIVER_DEVICE_H
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include "isaac/driver/platform.h" #include "isaac/driver/platform.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
@@ -12,14 +13,14 @@ namespace driver
{ {
// Device // Device
class Device class ISAACAPI Device
{ {
private: private:
friend class Context; friend class Context;
friend class CommandQueue; friend class CommandQueue;
public: public:
enum VENDOR enum ISAACAPI VENDOR
{ {
AMD, AMD,
INTEL, INTEL,

4
include/isaac/driver/event.h
View File

@@ -1,8 +1,10 @@
#ifndef ISAAC_DRIVER_EVENT_H #ifndef ISAAC_DRIVER_EVENT_H
#define ISAAC_DRIVER_EVENT_H #define ISAAC_DRIVER_EVENT_H
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
namespace isaac namespace isaac
{ {
@@ -10,7 +12,7 @@ namespace driver
{ {
// Event // Event
class Event class ISAACAPI Event
{ {
friend class CommandQueue; friend class CommandQueue;
public: public:

3
include/isaac/driver/handle.h
View File

@@ -4,6 +4,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include <iostream> #include <iostream>
namespace isaac namespace isaac
@@ -19,7 +20,7 @@ namespace driver
#endif #endif
template<class CLType, class CUType> template<class CLType, class CUType>
class Handle class ISAACAPI Handle
{ {
private: private:
#ifdef ISAAC_WITH_CUDA #ifdef ISAAC_WITH_CUDA

3
include/isaac/driver/kernel.h
View File

@@ -1,6 +1,7 @@
#ifndef ISAAC_DRIVER_KERNEL_H #ifndef ISAAC_DRIVER_KERNEL_H
#define ISAAC_DRIVER_KERNEL_H #define ISAAC_DRIVER_KERNEL_H
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include "isaac/driver/program.h" #include "isaac/driver/program.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
@@ -16,7 +17,7 @@ namespace driver
class Buffer; class Buffer;
// Kernel // Kernel
class Kernel class ISAACAPI Kernel
{ {
friend class CommandQueue; friend class CommandQueue;
public: public:

3
include/isaac/driver/ndrange.h
View File

@@ -1,6 +1,7 @@
#ifndef ISAAC_DRIVER_NDRANGE_H #ifndef ISAAC_DRIVER_NDRANGE_H
#define ISAAC_DRIVER_NDRANGE_H #define ISAAC_DRIVER_NDRANGE_H
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
namespace isaac namespace isaac
@@ -10,7 +11,7 @@ namespace driver
{ {
// NDRange // NDRange
class NDRange class ISAACAPI NDRange
{ {
public: public:
NDRange(size_t size0 = 1, size_t size1 = 1, size_t size2 = 1); NDRange(size_t size0 = 1, size_t size1 = 1, size_t size2 = 1);

3
include/isaac/driver/platform.h
View File

@@ -1,6 +1,7 @@
#ifndef ISAAC_DRIVER_PLATFORM_H #ifndef ISAAC_DRIVER_PLATFORM_H
#define ISAAC_DRIVER_PLATFORM_H #define ISAAC_DRIVER_PLATFORM_H
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
namespace isaac namespace isaac
@@ -11,7 +12,7 @@ namespace driver
class Device; class Device;
class Platform class ISAACAPI Platform
{ {
private: private:
public: public:

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

@@ -1,6 +1,7 @@
#ifndef ISAAC_DRIVER_PROGRAM_H #ifndef ISAAC_DRIVER_PROGRAM_H
#define ISAAC_DRIVER_PROGRAM_H #define ISAAC_DRIVER_PROGRAM_H
#include "isaac/defines.h"
#include "isaac/driver/common.h" #include "isaac/driver/common.h"
#include "isaac/driver/context.h" #include "isaac/driver/context.h"
#include "isaac/driver/handle.h" #include "isaac/driver/handle.h"
@@ -13,7 +14,7 @@ namespace driver
class Context; class Context;
class Program class ISAACAPI Program
{ {
friend class Kernel; friend class Kernel;
public: public: