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

CMake: Now converting JSon to source with EOG / Warnings fix on GCC

Browse Source
This commit is contained in:
Philippe Tillet
2015-08-06 17:53:20 -07:00
parent 5facf4fc29
commit 0f0946b7a7
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bench/CMakeLists.txt
View File

@@ -6,14 +6,14 @@ set(BLAS_LIBS isaac ${OPENCL_LIBRARIES})
#CUBLAS
find_package(CUDA)
if(CUDA_FOUND)
set(BLAS_DEF ${BLAS_DEF} "-DBENCH_CUBLAS")
set(BLAS_DEF ${BLAS_DEF} "-DHAS_A_BLAS -DBENCH_CUBLAS")
include_directories(${CUDA_INCLUDE_DIRS})
endif()
#CLAMDBLAS
find_package(CLAMDBLAS)
if(CLAMDBLAS_FOUND)
set(BLAS_DEF ${BLAS_DEF} "-DBENCH_CLBLAS")
set(BLAS_DEF ${BLAS_DEF} "-DHAS_A_BLAS -DBENCH_CLBLAS")
include_directories(${CLAMDBLAS_INCLUDE_DIR})
set(BLAS_LIBS ${BLAS_LIBS} ${CLAMDBLAS_LIBRARIES} )
endif()
@@ -21,10 +21,11 @@ endif()
#CBLAS
find_package(MKL)
if(MKL_FOUND)
set(BLAS_DEF ${BLAS_DEF} "-DBENCH_CBLAS")
set(BLAS_DEF ${BLAS_DEF} "-DHAS_A_BLAS -DBENCH_CBLAS")
include_directories(${MKL_INCLUDE_DIR})
set(BLAS_LIBS ${BLAS_LIBS} ${MKL_LIBRARIES} )
else()
# find_package(OpenBlas)
# if(OPENBLAS_FOUND)
# set(BLAS_DEF ${BLAS_DEF} "-DBENCH_CBLAS")

1
bench/blas.cpp
View File

@@ -18,7 +18,6 @@
#include "timer.hpp"
#define HAS_A_BLAS defined(BENCH_CBLAS) or defined(BENCH_CLBLAS) or defined(BENCH_CUBLAS)
namespace isc = isaac;
typedef isc::int_t int_t;

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

@@ -20,7 +20,7 @@ private:
friend class CommandQueue;
public:
enum class ISAACAPI Vendor
enum class Vendor
{
AMD,
INTEL,
@@ -28,7 +28,7 @@ public:
UNKNOWN
};
enum class ISAACAPI Architecture
enum class Architecture
{
HASWELL,
BROADWELL,

2
lib/CMakeLists.txt
View File

@@ -2,7 +2,7 @@
set(DATABASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/model/presets/")
file(GLOB_RECURSE JSON_FILES "${DATABASE_PATH}/json/*.json")
CODE_TO_H(SOURCES ${JSON_FILES} VARNAME json_files EXTENSION "hpp" OUTPUT_DIR "${DATABASE_PATH}"
NAMESPACE "isaac presets" TARGET database EOF "0")
NAMESPACE "isaac presets" TARGET database EOF "1")
#Compilation
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/tools")

1
lib/model/database.cpp
View File

@@ -51,7 +51,6 @@ void database::import(std::string const & str, driver::CommandQueue const & queu
{
namespace js = rapidjson;
map_type & result = cache_[queue];
//Parse the JSON document
js::Document document;
document.Parse<0>(str.c_str());

4
lib/model/presets/broadwell.hpp
View File

@@ -382,9 +382,9 @@ static const char broadwell[] = {
0x69, 0x6c, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x5b, 0x5b, 0x31,
0x2c, 0x20, 0x31, 0x32, 0x38, 0x2c, 0x20, 0x31, 0x2c, 0x20,
0x31, 0x36, 0x2c, 0x20, 0x33, 0x32, 0x2c, 0x20, 0x31, 0x5d,
0x5d, 0x7d, 0x7d, 0x7d, };
0x5d, 0x7d, 0x7d, 0x7d, 0x0};
static const std::size_t broadwell_len = 3744;
static const std::size_t broadwell_len = 3745;
}
}

2
python/setup.py
View File

@@ -115,7 +115,7 @@ def main():
include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
#Source files
src = 'src/lib/array.cpp src/lib/wrap/clBLAS.cpp src/lib/value_scalar.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/parse.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/stream.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/symbolic/io.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/expression.cpp src/lib/model/model.cpp src/lib/model/database.cpp src/lib/model/predictors/random_forest.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/device.cpp src/lib/driver/context.cpp src/lib/driver/event.cpp src/lib/driver/program_cache.cpp src/lib/driver/ndrange.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/command_queue.cpp src/lib/driver/check.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.cpp '.split() + [os.path.join('src', 'wrap', sf) for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
src = 'src/lib/symbolic/preset.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/model/model.cpp src/lib/model/database.cpp src/lib/model/predictors/random_forest.cpp src/lib/array.cpp src/lib/value_scalar.cpp src/lib/driver/backend.cpp src/lib/driver/device.cpp src/lib/driver/kernel.cpp src/lib/driver/buffer.cpp src/lib/driver/platform.cpp src/lib/driver/check.cpp src/lib/driver/program.cpp src/lib/driver/command_queue.cpp src/lib/driver/program_cache.cpp src/lib/driver/context.cpp src/lib/driver/event.cpp src/lib/driver/ndrange.cpp src/lib/driver/handle.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/stream.cpp src/lib/kernels/parse.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/wrap/clBLAS.cpp '.split() + [os.path.join('src', 'wrap', sf) for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
boostsrc = 'external/boost/libs/'
for s in ['numpy','python','smart_ptr','system','thread']:
src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]