Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit 427f3d83 authored by schultezub's avatar schultezub
Browse files

Renamed cllib to kisscl

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@241 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent a281b1a8
......@@ -17,7 +17,7 @@ OPTION(TUMVIS_BUILD_APPLICATION "Build TUMVis Application"
OPTION(TUMVIS_BUILD_CORE "Build TUMVis Core" ON )
OPTION(TUMVIS_BUILD_MODULES "Build TUMVis Modules" ON )
OPTION(TUMVIS_BUILD_LIB_TGT "Build TGT Library" ON )
OPTION(TUMVIS_BUILD_LIB_CLLIB "Build CLLib Library" ON )
OPTION(TUMVIS_BUILD_LIB_KISSCL "Build KissCL Library" ON )
IF(WIN32)
OPTION(TUMVIS_COPY_EXTERNAL_DLLS "Copy external DLLs to bin directory?" ON )
......@@ -35,8 +35,8 @@ IF(TUMVIS_BUILD_LIB_TGT)
ADD_SUBDIRECTORY(ext/tgt)
ENDIF()
IF(TUMVIS_BUILD_LIB_CLLIB)
ADD_SUBDIRECTORY(ext/cllib)
IF(TUMVIS_BUILD_LIB_KISSCL)
ADD_SUBDIRECTORY(ext/kisscl)
ENDIF()
IF(TUMVIS_BUILD_CORE)
......
......@@ -45,4 +45,4 @@ ADD_EXECUTABLE(tumvis-application
)
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(tumvis-application tumvis-core tumvis-modules tgt cllib ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(tumvis-application tumvis-core tumvis-modules tgt kisscl ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
......@@ -50,4 +50,4 @@ ADD_LIBRARY(tumvis-core
)
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(tumvis-core tgt cllib ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(tumvis-core tgt kisscl ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
################################################################################
# Project file for the cllib library
# Project file for the kisscl library
################################################################################
PROJECT(cllib)
PROJECT(kisscl)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring cllib Library")
MESSAGE(STATUS "Configuring kisscl Library")
# headers
FILE(GLOB CLLIB_HEADERS *.h CL/*.hpp)
FILE(GLOB KISSCL_HEADERS *.h CL/*.hpp)
# sources
FILE(GLOB CLLIB_SOURCES *.cpp)
FILE(GLOB KISSCL_SOURCES *.cpp)
################################################################################
# define library target
################################################################################
ADD_LIBRARY(cllib ${CLLIB_SOURCES} ${CLLIB_HEADERS})
ADD_LIBRARY(kisscl ${KISSCL_SOURCES} ${KISSCL_HEADERS})
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${TUMVIS_MODULE_DEFINITIONS})
IF(TUMVIS_SHARED_LIBS AND MSVC)
ADD_DEFINITIONS("-DCLLIB_BUILD_DLL")
ADD_DEFINITIONS("-DKISSCL_BUILD_DLL")
ENDIF()
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES} ${TUMVIS_MODULE_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(cllib ${TUMVIS_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(kisscl ${TUMVIS_EXTERNAL_LIBRARIES})
################################################################################
# deployment
################################################################################
IF(TUMVIS_ADD_INSTALL_TARGET)
INSTALL(TARGETS cllib
INSTALL(TARGETS kisscl
RUNTIME DESTINATION .
)
ENDIF()
......
......@@ -2,9 +2,9 @@
#include "tgt/logmanager.h"
namespace cllib {
namespace kisscl {
const std::string CLRuntime::loggerCat_ = "cllib.CLRuntime";
const std::string CLRuntime::loggerCat_ = "kisscl.CLRuntime";
CLRuntime::CLRuntime() {
initPlatforms();
......
......@@ -5,15 +5,15 @@
#include "tgt/manager.h"
#include "tgt/singleton.h"
#include "cllib/cllib.h"
#include "cllib/context.h"
#include "cllib/device.h"
#include "cllib/platform.h"
#include "kisscl/kisscl.h"
#include "kisscl/context.h"
#include "kisscl/device.h"
#include "kisscl/platform.h"
#include <string>
namespace cllib {
namespace kisscl {
/**
* Singleton class for managing the OpenCL runtime.
* Gathers all available OpenCL platforms/devices and offers methods to create OpenCL contexts on them.
......
......@@ -2,16 +2,16 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "cllib/context.h"
#include "cllib/device.h"
#include "cllib/event.h"
#include "cllib/kernel.h"
#include "cllib/memory.h"
#include "cllib/platform.h"
#include "kisscl/context.h"
#include "kisscl/device.h"
#include "kisscl/event.h"
#include "kisscl/kernel.h"
#include "kisscl/memory.h"
#include "kisscl/platform.h"
namespace cllib {
namespace kisscl {
const std::string CommandQueue::loggerCat_ = "cllib.CommandQueue";
const std::string CommandQueue::loggerCat_ = "kisscl.CommandQueue";
CommandQueue::CommandQueue(Context* context, cl_command_queue_properties properties /*= 0*/)
: CLWrapper<cl_command_queue>(0)
......
......@@ -2,13 +2,13 @@
#define COMMANDQUEUE_H__
#include "tgt/vector.h"
#include "cllib/cllib.h"
#include "cllib/event.h"
#include "kisscl/kisscl.h"
#include "kisscl/event.h"
#include <vector>
namespace cllib {
namespace kisscl {
class Buffer;
class Context;
class Device;
......
......@@ -2,17 +2,17 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "cllib/device.h"
#include "cllib/platform.h"
#include "kisscl/device.h"
#include "kisscl/platform.h"
namespace cllib {
namespace kisscl {
void CL_API_CALL clContextCallback(const char* errinfo, const void* private_info, size_t cb, void* user_data) {
tgtAssert (user_data == 0, "user_data expected to be 0 - check what happened!");
LINFOC("cllib.Context.clContextCallback", std::string(errinfo));
LINFOC("kisscl.Context.clContextCallback", std::string(errinfo));
}
const std::string Context::loggerCat_ = "cllib.Context";
const std::string Context::loggerCat_ = "kisscl.Context";
Context::Context(Device* device, const std::vector<ContextProperty>& properties /*= std::vector<ContextProperty>()*/)
......
#ifndef CONTEXT_H__
#define CONTEXT_H__
#include "cllib/cllib.h"
#include "kisscl/kisscl.h"
#include <set>
#include <vector>
namespace cllib {
namespace kisscl {
class Device;
/**
......
......@@ -2,12 +2,12 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "cllib/platform.h"
#include "kisscl/platform.h"
#include "core/tools/stringutils.h"
namespace cllib {
namespace kisscl {
const std::string Device::loggerCat_ = "cllib.Device";
const std::string Device::loggerCat_ = "kisscl.Device";
Device::Device(const Platform* platform, cl_device_id id)
: CLWrapper<cl_device_id>(id)
......@@ -77,7 +77,7 @@ namespace cllib {
}
cllib::Profile Device::getProfile() const {
kisscl::Profile Device::getProfile() const {
return _profile;
}
......
#ifndef DEVICE_H__
#define DEVICE_H__
#include "cllib/cllib.h"
#include "kisscl/kisscl.h"
#include "tgt/vector.h"
#include <set>
#include <vector>
namespace cllib {
namespace kisscl {
class Platform;
/**
......
......@@ -2,10 +2,10 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "cllib/device.h"
#include "cllib/platform.h"
#include "kisscl/device.h"
#include "kisscl/platform.h"
namespace cllib {
namespace kisscl {
Event::Event(cl_event id)
: CLWrapper<cl_event>(id)
......
#ifndef CLEVENT_H__
#define CLEVENT_H__
#include "cllib/cllib.h"
#include "kisscl/kisscl.h"
namespace cllib {
namespace kisscl {
/**
* Wrapper for an OpenCL event.
......
......@@ -2,10 +2,10 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "cllib/device.h"
#include "cllib/platform.h"
#include "kisscl/device.h"
#include "kisscl/platform.h"
namespace cllib {
namespace kisscl {
Kernel::Kernel(cl_kernel id)
: CLWrapper<cl_kernel>(id)
......
......@@ -2,11 +2,11 @@
#define KERNEL_H__
#include "tgt/vector.h"
#include "cllib/cllib.h"
#include "kisscl/kisscl.h"
namespace cllib {
namespace kisscl {
namespace {
/**
......@@ -106,7 +106,7 @@ namespace cllib {
template<class T>
void cllib::Kernel::setArgument(cl_uint index, const T& data) {
void kisscl::Kernel::setArgument(cl_uint index, const T& data) {
return LCL_ERROR(clSetKernelArg(id_, index, KernelArgumentTypeTraits<T>::size(), KernelArgumentTypeTraits<T>::pointer(data)));
}
......
#include "cllib.h"
#include "kisscl.h"
#include "tgt/logmanager.h"
#include "cllib/stringutils.h"
#include "kisscl/stringutils.h"
namespace cllib {
namespace kisscl {
std::string clErrorToString(cl_int err) {
std::string toReturn;
switch(err) {
......@@ -101,7 +101,7 @@ namespace cllib {
// parse numbers
if (exploded.size() < 2) {
LERRORC("cllib.ClVersion", "Version string too short to parse!");
LERRORC("kisscl.ClVersion", "Version string too short to parse!");
}
else {
major_ = StringUtils::fromString<int>(exploded[0]);
......
......@@ -6,7 +6,7 @@
#include <string>
namespace cllib {
namespace kisscl {
namespace {
// Code for CLWrapperTraits inspired by the OpenCL C++ binding shipped with the AMD APP SDK.
......
......@@ -2,9 +2,9 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "cllib/context.h"
#include "kisscl/context.h"
namespace cllib {
namespace kisscl {
MemoryObject::MemoryObject(const Context* context)
: CLWrapper<cl_mem>(0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment