clean up

Author: dance858

include/expr.h

@@ -61,9 +61,9 @@ typedef struct expr
 
 void init_expr(expr *node, int d1, int d2, int n_vars, forward_fn forward,
                jacobian_init_fn jacobian_init, eval_jacobian_fn eval_jacobian,
-               is_affine_fn is_affine, free_type_data_fn free_type_data);
+               is_affine_fn is_affine, wsum_hess_init_fn wsum_hess_init,
+               wsum_hess_fn eval_wsum_hess, free_type_data_fn free_type_data);
 
-expr *new_expr(int d1, int d2, int n_vars);
 void free_expr(expr *node);
 
 /* Reference counting helpers */

src/affine/add.c

@@ -1,6 +1,7 @@
 #include "affine.h"
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 static void forward(expr *node, const double *u)
 {
@@ -75,17 +76,13 @@ static bool is_affine(const expr *node)
 expr *new_add(expr *left, expr *right)
 {
     assert(left->d1 == right->d1 && left->d2 == right->d2);
-    expr *node = new_expr(left->d1, left->d2, left->n_vars);
+    expr *node = (expr *) calloc(1, sizeof(expr));
+    init_expr(node, left->d1, left->d2, left->n_vars, forward, jacobian_init,
+              eval_jacobian, is_affine, wsum_hess_init, eval_wsum_hess, NULL);
     node->left = left;
     node->right = right;
     expr_retain(left);
     expr_retain(right);
-    node->forward = forward;
-    node->is_affine = is_affine;
-    node->jacobian_init = jacobian_init;
-    node->eval_jacobian = eval_jacobian;
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
 
     // just for debugging, should be removed
     strcpy(node->name, "add");

src/affine/broadcast.c

@@ -264,11 +264,9 @@ expr *new_broadcast(expr *child, int d1, int d2)
     //                  initialize the rest of the expression
     // --------------------------------------------------------------------------
     init_expr(node, d1, d2, child->n_vars, forward, jacobian_init, eval_jacobian,
-              is_affine, NULL);
+              is_affine, wsum_hess_init, eval_wsum_hess, NULL);
     node->left = child;
     expr_retain(child);
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
     bcast->type = type;
 
     return node;

src/affine/constant.c

@@ -1,4 +1,5 @@
 #include "affine.h"
+#include <stdlib.h>
 #include <string.h>
 
 static void forward(expr *node, const double *u)
@@ -42,14 +43,10 @@ static bool is_affine(const expr *node)
 
 expr *new_constant(int d1, int d2, int n_vars, const double *values)
 {
-    expr *node = new_expr(d1, d2, n_vars);
+    expr *node = (expr *) calloc(1, sizeof(expr));
+    init_expr(node, d1, d2, n_vars, forward, jacobian_init, eval_jacobian, is_affine,
+              wsum_hess_init, eval_wsum_hess, NULL);
     memcpy(node->value, values, node->size * sizeof(double));
-    node->forward = forward;
-    node->is_affine = is_affine;
-    node->jacobian_init = jacobian_init;
-    node->eval_jacobian = eval_jacobian;
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
 
     return node;
 }

src/affine/hstack.c

@@ -154,13 +154,11 @@ expr *new_hstack(expr **args, int n_args, int n_vars)
     hstack_expr *hnode = (hstack_expr *) calloc(1, sizeof(hstack_expr));
     expr *node = &hnode->base;
     init_expr(node, args[0]->d1, d2, n_vars, forward, jacobian_init, eval_jacobian,
-              is_affine, free_type_data);
+              is_affine, wsum_hess_init, wsum_hess_eval, free_type_data);
 
     /* Set type-specific fields */
     hnode->args = args;
     hnode->n_args = n_args;
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = wsum_hess_eval;
 
     for (int i = 0; i < n_args; i++)
     {

src/affine/index.c

@@ -152,14 +152,11 @@ expr *new_index(expr *child, int d1, int d2, const int *indices, int n_idxs)
     expr *node = &idx->base;
 
     init_expr(node, d1, d2, child->n_vars, forward, jacobian_init, eval_jacobian,
-              is_affine, free_type_data);
+              is_affine, wsum_hess_init, eval_wsum_hess, free_type_data);
 
     node->left = child;
     expr_retain(child);
 
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
-
     /* copy indices */
     idx->indices = (int *) malloc(n_idxs * sizeof(int));
     memcpy(idx->indices, indices, n_idxs * sizeof(int));

src/affine/linear_op.c

@@ -46,7 +46,7 @@ expr *new_linear(expr *u, const CSR_Matrix *A)
     linear_op_expr *lin_node = (linear_op_expr *) calloc(1, sizeof(linear_op_expr));
     expr *node = &lin_node->base;
     init_expr(node, A->m, 1, u->n_vars, forward, jacobian_init, NULL, is_affine,
-              free_type_data);
+              NULL, NULL, free_type_data);
     node->left = u;
     expr_retain(u);
 

src/affine/neg.c

@@ -1,5 +1,6 @@
 #include "affine.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 static void forward(expr *node, const double *u)
@@ -77,15 +78,11 @@ static bool is_affine(const expr *node)
 
 expr *new_neg(expr *child)
 {
-    expr *node = new_expr(child->d1, child->d2, child->n_vars);
+    expr *node = (expr *) calloc(1, sizeof(expr));
+    init_expr(node, child->d1, child->d2, child->n_vars, forward, jacobian_init,
+              eval_jacobian, is_affine, wsum_hess_init, eval_wsum_hess, NULL);
     node->left = child;
     expr_retain(child);
-    node->forward = forward;
-    node->is_affine = is_affine;
-    node->jacobian_init = jacobian_init;
-    node->eval_jacobian = eval_jacobian;
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
 
     return node;
 }

src/affine/promote.c

@@ -94,14 +94,9 @@ static bool is_affine(const expr *node)
 expr *new_promote(expr *child, int d1, int d2)
 {
     assert(child->size == 1);
-    expr *node = new_expr(d1, d2, child->n_vars);
-    node->forward = forward;
-    node->jacobian_init = jacobian_init;
-    node->eval_jacobian = eval_jacobian;
-    node->is_affine = is_affine;
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
-
+    expr *node = (expr *) calloc(1, sizeof(expr));
+    init_expr(node, d1, d2, child->n_vars, forward, jacobian_init, eval_jacobian,
+              is_affine, wsum_hess_init, eval_wsum_hess, NULL);
     node->left = child;
     expr_retain(child);
 

src/affine/reshape.c

@@ -1,6 +1,7 @@
 #include "affine.h"
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 /* Reshape changes the shape of an expression without permuting data.
@@ -55,15 +56,11 @@ static bool is_affine(const expr *node)
 expr *new_reshape(expr *child, int d1, int d2)
 {
     assert(d1 * d2 == child->size);
-    expr *node = new_expr(d1, d2, child->n_vars);
+    expr *node = (expr *) calloc(1, sizeof(expr));
+    init_expr(node, d1, d2, child->n_vars, forward, jacobian_init, eval_jacobian,
+              is_affine, wsum_hess_init, eval_wsum_hess, NULL);
     node->left = child;
     expr_retain(child);
-    node->forward = forward;
-    node->is_affine = is_affine;
-    node->jacobian_init = jacobian_init;
-    node->eval_jacobian = eval_jacobian;
-    node->wsum_hess_init = wsum_hess_init;
-    node->eval_wsum_hess = eval_wsum_hess;
 
     return node;
 }