Fixed over-head bug in the auto-tuner (not in the benchmarks)
This commit is contained in:
@@ -2,7 +2,7 @@ set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py")
|
||||
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
|
||||
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/timestamp")
|
||||
file(GLOB DEPS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pyatidlas/*.py ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
|
||||
list(APPEND DEPS "${CMAKE_CURRENT_SOURCE_DIR}/setup.py")
|
||||
list(APPEND DEPS "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/src/_atidlas.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/pyatidlas/pycore.py")
|
||||
|
||||
configure_file(${SETUP_PY_IN} ${SETUP_PY})
|
||||
add_custom_command(OUTPUT ${OUTPUT}
|
||||
|
@@ -44,10 +44,10 @@ def main():
|
||||
|
||||
DEFINES = [('VIENNACL_WITH_OPENCL',None), ('VIENNACL_WITH_OPENMP', None),
|
||||
('boost','pyviennaclboost')]
|
||||
INCLUDE_DIRS = ['/home/philippe/Development/pyviennacl-dev/external/boost-python-ublas-subset/boost_subset/',
|
||||
INCLUDE_DIRS = ['${CMAKE_CURRENT_SOURCE_DIR}/external/pyviennacl-dev/external/boost-python-ublas-subset/boost_subset/',
|
||||
'${PROJECT_SOURCE_DIR}',
|
||||
'/home/philippe/Development/pyviennacl-dev/external/viennacl-dev']
|
||||
LIBRARY_DIRS = ['/home/philippe/Development/pyviennacl-dev/build/lib.linux-x86_64-2.7/pyviennacl/']
|
||||
'${CMAKE_CURRENT_SOURCE_DIR}/external/pyviennacl-dev/external/viennacl-dev']
|
||||
LIBRARY_DIRS = ['${CMAKE_CURRENT_SOURCE_DIR}/external/pyviennacl-dev/build/lib.linux-x86_64-2.7/pyviennacl/']
|
||||
|
||||
setup(
|
||||
name="pyatidlas",
|
||||
|
@@ -10,18 +10,22 @@
|
||||
#include "atidlas/templates/row_wise_reduction.hpp"
|
||||
#include "atidlas/templates/matrix_product.hpp"
|
||||
|
||||
#include "atidlas/execute.hpp"
|
||||
#include "atidlas/model/model.hpp"
|
||||
|
||||
#define ENUM_VALUE(NS, V) .value( #V, NS :: V )
|
||||
|
||||
namespace bp = boost::python;
|
||||
namespace vcl = viennacl;
|
||||
namespace atd = atidlas;
|
||||
|
||||
void export_atidlas()
|
||||
{
|
||||
|
||||
bp::def("execute", &atidlas::execute);
|
||||
|
||||
bp::class_<atidlas::model>("model", bp::init<atd::template_base const &, vcl::ocl::context &, vcl::ocl::device const & >())
|
||||
.def("execute", &atd::model::execute)
|
||||
;
|
||||
|
||||
bp::enum_<atidlas::fetching_policy_type>
|
||||
("fetching_policy_type")
|
||||
ENUM_VALUE(atidlas, FETCH_FROM_LOCAL)
|
||||
@@ -107,4 +111,4 @@ BOOST_PYTHON_MODULE(_atidlas)
|
||||
bp::object package = bp::scope();
|
||||
package.attr("__path__") = "_atidlas";
|
||||
export_atidlas();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user