fixes beam test

Author: dance858

src/affine/index.c

@@ -93,21 +93,21 @@ static void wsum_hess_init(expr *node)
        many numerical zeros in child->wsum_hess that are actually
        structural zeros, but we do not try to exploit that sparsity
        right now. */
-    CSR_Matrix *H_child = x->wsum_hess;
-    node->wsum_hess = new_csr_matrix(H_child->m, H_child->n, H_child->nnz);
-    memcpy(node->wsum_hess->p, H_child->p, (H_child->m + 1) * sizeof(int));
-    memcpy(node->wsum_hess->i, H_child->i, H_child->nnz * sizeof(int));
+    CSR_Matrix *Hx = x->wsum_hess;
+    node->wsum_hess = new_csr_matrix(Hx->m, Hx->n, Hx->nnz);
+    memcpy(node->wsum_hess->p, Hx->p, (Hx->m + 1) * sizeof(int));
+    memcpy(node->wsum_hess->i, Hx->i, Hx->nnz * sizeof(int));
 }
 
 static void eval_wsum_hess(expr *node, const double *w)
 {
-    expr *child = node->left;
+    expr *x = node->left;
     index_expr *idx = (index_expr *) node;
 
     if (idx->has_duplicates)
     {
         /* zero and accumulate for repeated indices */
-        memset(node->dwork, 0, child->size * sizeof(double));
+        memset(node->dwork, 0, x->size * sizeof(double));
         for (int i = 0; i < idx->n_idxs; i++)
         {
             node->dwork[idx->indices[i]] += w[i];
@@ -122,12 +122,9 @@ static void eval_wsum_hess(expr *node, const double *w)
         }
     }
 
-    /* delegate to child */
-    child->eval_wsum_hess(child, node->dwork);
-
-    /* copy values from child */
-    memcpy(node->wsum_hess->x, child->wsum_hess->x,
-           child->wsum_hess->nnz * sizeof(double));
+    /* evalute hessian of child */
+    x->eval_wsum_hess(x, node->dwork);
+    memcpy(node->wsum_hess->x, x->wsum_hess->x, x->wsum_hess->nnz * sizeof(double));
 }
 
 static bool is_affine(const expr *node)

src/affine/promote.c

@@ -22,11 +22,11 @@ static void jacobian_init(expr *node)
     expr *x = node->left;
     x->jacobian_init(x);
 
-    // each output row copies the single row from child's jacobian
+    /* each output row copies the single row from child's jacobian */
     int nnz = node->size * x->jacobian->nnz;
     node->jacobian = new_csr_matrix(node->size, node->n_vars, nnz);
 
-    // fill sparsity pattern
+    /* fill sparsity pattern */
     CSR_Matrix *J = node->jacobian;
     J->nnz = 0;
     for (int row = 0; row < node->size; row++)

src/dnlp_diff_engine/__init__.py

@@ -29,7 +29,7 @@ def _convert_matmul(expr, children):
     # One of them should be a Constant, the other a variable expression
     left_arg, right_arg = expr.args
 
-    if isinstance(left_arg, cp.Constant):
+    if left_arg.is_constant():
         # A @ f(x) -> left_matmul
         # TODO: why is this always dense? What's going on here?
         # we later convert it to csr....
@@ -46,7 +46,7 @@ def _convert_matmul(expr, children):
             m,
             n,
         )
-    elif isinstance(right_arg, cp.Constant):
+    elif right_arg.is_constant():
         # f(x) @ A -> right_matmul
 
         # TODO: why is this always dense? What's going on here?
@@ -74,7 +74,7 @@ def _convert_multiply(expr, children):
     left_arg, right_arg = expr.args
 
     # Check if left is a constant
-    if isinstance(left_arg, cp.Constant):
+    if left_arg.is_constant():
         value = np.asarray(left_arg.value, dtype=np.float64)
 
         # Scalar constant
@@ -88,7 +88,7 @@ def _convert_multiply(expr, children):
             return _diffengine.make_const_vector_mult(children[1], vector)
 
     # Check if right is a constant
-    elif isinstance(right_arg, cp.Constant):
+    elif right_arg.is_constant():
         value = np.asarray(right_arg.value, dtype=np.float64)
 
         # Scalar constant