Skip to content

Sync convolve and matmul convention #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Transurgeon merged 2 commits into from
Apr 23, 2026
Merged

Sync convolve and matmul convention #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
503d3cb
sync SparseDiffEngine and adapt dense matmul bindings
Transurgeon Apr 23, 2026
a35102c
trim comments on dense matmul bindings
Transurgeon Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SparseDiffEngine
Open in desktop
Submodule SparseDiffEngine updated 17 files
+2 −2 CMakeLists.txt
+22 −6 include/atoms/affine.h
+15 −0 include/subexpr.h
+2 −1 include/utils/dense_matrix.h
+11 −0 include/utils/mini_numpy.h
+194 −0 src/atoms/affine/convolve.c
+23 −3 src/atoms/affine/left_matmul.c
+19 −11 src/atoms/affine/right_matmul.c
+3 −3 src/atoms/other/quad_form.c
+4 −1 src/utils/dense_matrix.c
+28 −0 src/utils/mini_numpy.c
+14 −0 tests/all_tests.c
+77 −0 tests/forward_pass/affine/test_convolve.h
+68 −0 tests/jacobian_tests/affine/test_convolve.h
+144 −0 tests/problem/test_param_broadcast.h
+104 −21 tests/problem/test_param_prob.h
+57 −0 tests/wsum_hess/affine/test_convolve.h
37 changes: 12 additions & 25 deletions sparsediffpy/_bindings/atoms/left_matmul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ static PyObject *py_make_left_matmul(PyObject *self, PyObject *args)
}
else if (strcmp(fmt, "dense") == 0)
{
/* Parse: param_or_none, child, "dense", A_data_flat, m, n */
/* Engine requires (param_node, data) to be mutually exclusive;
* drop the caller's A_data when a parameter capsule is supplied. */
PyObject *data_obj;
int m, n;
if (!PyArg_ParseTuple(args, "OOsOii", &param_obj, &child_capsule,
Expand All @@ -128,48 +129,34 @@ static PyObject *py_make_left_matmul(PyObject *self, PyObject *args)
return NULL;
}

PyArrayObject *data_array = (PyArrayObject *) PyArray_FROM_OTF(
data_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
if (!data_array)
{
return NULL;
}

double *A_data = (double *) PyArray_DATA(data_array);

expr *param_node = NULL;
expr *node;
if (param_obj == Py_None)
{
param_node = new_parameter(m * n, 1, PARAM_FIXED,
child->n_vars, A_data);
if (!param_node)
PyArrayObject *data_array = (PyArrayObject *) PyArray_FROM_OTF(
data_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
if (!data_array)
{
Py_DECREF(data_array);
PyErr_SetString(PyExc_RuntimeError,
"failed to create parameter node");
return NULL;
}
double *A_data = (double *) PyArray_DATA(data_array);
node = new_left_matmul_dense(NULL, child, m, n, A_data);
Py_DECREF(data_array);
}
else
{
param_node = (expr *) PyCapsule_GetPointer(param_obj,
EXPR_CAPSULE_NAME);
expr *param_node = (expr *) PyCapsule_GetPointer(
param_obj, EXPR_CAPSULE_NAME);
if (!param_node)
{
Py_DECREF(data_array);
PyErr_SetString(PyExc_ValueError,
"invalid parameter capsule");
return NULL;
}
node = new_left_matmul_dense(param_node, child, m, n, NULL);
}

expr *node =
new_left_matmul_dense(param_node, child, m, n, A_data);
Py_DECREF(data_array);

if (!node)
{
if (param_obj == Py_None) free_expr(param_node);
PyErr_SetString(PyExc_RuntimeError,
"failed to create dense left_matmul node");
return NULL;
Expand Down
36 changes: 12 additions & 24 deletions sparsediffpy/_bindings/atoms/right_matmul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ static PyObject *py_make_right_matmul(PyObject *self, PyObject *args)
}
else if (strcmp(fmt, "dense") == 0)
{
/* Engine requires (param_node, data) to be mutually exclusive;
* drop the caller's A_data when a parameter capsule is supplied. */
PyObject *data_obj;
int m, n;
if (!PyArg_ParseTuple(args, "OOsOii", &param_obj, &child_capsule,
Expand All @@ -123,48 +125,34 @@ static PyObject *py_make_right_matmul(PyObject *self, PyObject *args)
return NULL;
}

PyArrayObject *data_array = (PyArrayObject *) PyArray_FROM_OTF(
data_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
if (!data_array)
{
return NULL;
}

double *A_data = (double *) PyArray_DATA(data_array);

expr *param_node = NULL;
expr *node;
if (param_obj == Py_None)
{
param_node = new_parameter(m * n, 1, PARAM_FIXED,
child->n_vars, A_data);
if (!param_node)
PyArrayObject *data_array = (PyArrayObject *) PyArray_FROM_OTF(
data_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
if (!data_array)
{
Py_DECREF(data_array);
PyErr_SetString(PyExc_RuntimeError,
"failed to create parameter node");
return NULL;
}
double *A_data = (double *) PyArray_DATA(data_array);
node = new_right_matmul_dense(NULL, child, m, n, A_data);
Py_DECREF(data_array);
}
else
{
param_node = (expr *) PyCapsule_GetPointer(param_obj,
EXPR_CAPSULE_NAME);
expr *param_node = (expr *) PyCapsule_GetPointer(
param_obj, EXPR_CAPSULE_NAME);
if (!param_node)
{
Py_DECREF(data_array);
PyErr_SetString(PyExc_ValueError,
"invalid parameter capsule");
return NULL;
}
node = new_right_matmul_dense(param_node, child, m, n, NULL);
}

expr *node =
new_right_matmul_dense(param_node, child, m, n, A_data);
Py_DECREF(data_array);

if (!node)
{
if (param_obj == Py_None) free_expr(param_node);
PyErr_SetString(PyExc_RuntimeError,
"failed to create dense right_matmul node");
return NULL;
Expand Down
Loading