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

CMake: some cleaning

Browse Source
This commit is contained in:
Philippe Tillet
2015-05-03 17:39:52 -04:00
parent 217de21991
commit 3b983cf32f
4 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -37,14 +37,13 @@ get_property(INCLUDE_DIRECTORIES_LST DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPE
set(INCLUDE_DIRECTORIES_STR)
foreach(FILE ${INCLUDE_DIRECTORIES_LST})
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}" "src" _TMP ${FILE})
set(INCLUDE_DIRECTORIES "${INCLUDE_DIRECTORIES} ${_TMP}")
set(INCLUDE_DIRECTORIES_STR "${INCLUDE_DIRECTORIES_STR} ${_TMP}")
endforeach()
configure_file(${SETUP_PY_IN} ${SETUP_PY})
add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/build/timestamp"
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/python ${CMAKE_BINARY_DIR}/python
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/python/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/python/src/lib/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/python/src/lib
@@ -56,7 +55,7 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/build/timestamp"
COMMAND ${CMAKE_COMMAND} -E tar czf python-isaac.tgz ${CMAKE_BINARY_DIR}/python
)
add_custom_target(package-python ALL DEPENDS "${CMAKE_BINARY_DIR}/build/timestamp")
add_custom_target(package-python DEPENDS "${CMAKE_BINARY_DIR}/build/timestamp")
#Isaac

2
lib/backend/templates/mreduction.cpp
View File

@@ -17,6 +17,8 @@ num_groups_0(_num_groups_0), num_groups_1(_num_groups_1), fetch_policy(_fetch_po
int mreduction::is_invalid_impl(driver::Device const &, expressions_tuple const &) const
{
if(reduction_type_==REDUCE_ROWS && p_.simd_width>1)
return TEMPLATE_INVALID_SIMD_WIDTH;
if (p_.fetch_policy==FETCH_FROM_LOCAL)
return TEMPLATE_INVALID_FETCHING_POLICY_TYPE;
return TEMPLATE_VALID;

27
python/CMakeLists.txt
View File

@@ -1,27 +0,0 @@
file( GLOB_RECURSE PYTHON_SRC *.cpp)
file( GLOB_RECURSE PYTHON_PYSRC *.py)
add_custom_target( MAKE_PYTHON_SRC_VISIBLE SOURCES ${PYTHON_SRC} ${PYTHON_PYSRC})
set(SETUP_PY_IN "${CMAKE_MODULES_PATH}/python/setup.py")
set(SETUP_PY "${CMAKE_CURRENT_SOURCE_DIR}/setup.py")
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build")
function(JOIN VALUES GLUE OUTPUT)
string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}")
set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
endfunction()
join("${LIBISAAC_SRC}" " " LIBISAAC_SRC_STR)
get_property(INCLUDE_DIRECTORIES_LST DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
join("${INCLUDE_DIRECTORIES_LST}" " " INCLUDE_DIRECTORIES_STR)
configure_file(${SETUP_PY_IN} ${SETUP_PY})
add_custom_command(OUTPUT ${OUTPUT}/timestamp
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/isaac ${CMAKE_CURRENT_BINARY_DIR}/isaac
COMMAND ${PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}/timestamp
DEPENDS ${LIBISAAC_SRC} ${PYTHON_SRC} ${PYTHON_PYSRC} ${SETUP_PY})
add_custom_target(python DEPENDS ${OUTPUT}/timestamp)
install(CODE "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install)" OPTIONAL)

4
python/setup.py
View File

@@ -54,9 +54,9 @@ def main():
cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"]
#Includes
include =''.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
#Sources
src = 'src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/array.cpp src/lib/backend/parse.cpp src/lib/backend/templates/mreduction.cpp src/lib/backend/templates/maxpy.cpp src/lib/backend/templates/mproduct.cpp src/lib/backend/templates/reduction.cpp src/lib/backend/templates/vaxpy.cpp src/lib/backend/templates/base.cpp src/lib/backend/keywords.cpp src/lib/backend/stream.cpp src/lib/backend/binder.cpp src/lib/backend/mapped_object.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/value_scalar.cpp src/lib/driver/check.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/kernel.cpp src/lib/driver/ndrange.cpp src/lib/driver/event.cpp src/lib/driver/command_queue.cpp src/lib/driver/backend.cpp src/lib/driver/context.cpp src/lib/driver/handle.cpp src/lib/driver/buffer.cpp src/lib/driver/device.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/detect.cpp src/lib/symbolic/expression.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/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/backend/templates/mreduction.cpp src/lib/backend/templates/reduction.cpp src/lib/backend/templates/mproduct.cpp src/lib/backend/templates/maxpy.cpp src/lib/backend/templates/base.cpp src/lib/backend/templates/vaxpy.cpp src/lib/backend/mapped_object.cpp src/lib/backend/stream.cpp src/lib/backend/parse.cpp src/lib/backend/keywords.cpp src/lib/backend/binder.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/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 '.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]