Merge branch 'master' of mpxd.net:jan/opencl_fdfd

This commit is contained in:
jan 2016-07-04 23:30:27 -07:00
commit b3d25f0f0c
2 changed files with 1 additions and 4 deletions

View File

@ -54,9 +54,6 @@ def cg(a, b, max_iters=10000, err_thresh=1e-6, context=None, queue=None, verbose
p_step = ops.create_p_step(context) p_step = ops.create_p_step(context)
dot = ops.create_dot(context) dot = ops.create_dot(context)
def a_step(E, H, p, events):
return a_step_full(E, H, p, inv_dxes, oeps, invm, gpec, gpmc, Pl, Pr, events)
''' '''
Start the solve Start the solve
''' '''

View File

@ -253,6 +253,6 @@ def create_a_csr(context):
arguments=', '.join((v_out_args, m_args, v_in_args))) arguments=', '.join((v_out_args, m_args, v_in_args)))
def spmv(v_out, m, v_in, e): def spmv(v_out, m, v_in, e):
return spmv_kernel(v_out, m.row_ptr, m.col_ind, m.data, v_in, wait_for=e) return [spmv_kernel(v_out, m.row_ptr, m.col_ind, m.data, v_in, wait_for=e)]
return spmv return spmv