Merge pull request #1115 from WardBrian/dedupe-unsized-signaturemismatch

Deduplicate logic in UnsizedType and Signaturemismatch

Author: WardBrian

src/frontend/Debug_data_generation.ml …nd_optimization/Debug_data_generation.mlsrc/frontend/Debug_data_generation.ml renamed to src/analysis_and_optimization/Debug_data_generation.ml src/frontend/Debug_data_generation.ml renamed to src/analysis_and_optimization/Debug_data_generation.ml

@@ -1,5 +1,6 @@
 open Core_kernel
 open Middle
+open Frontend
 open Ast
 
 let rec transpose = function
@@ -32,8 +33,8 @@ let rec vect_to_mat l m =
 let unwrap_num_exn m e =
   let e = Ast_to_Mir.trans_expr e in
   let m = Map.Poly.map m ~f:Ast_to_Mir.trans_expr in
-  let e = Analysis_and_optimization.Mir_utils.subst_expr m e in
-  let e = Analysis_and_optimization.Partial_evaluator.eval_expr e in
+  let e = Mir_utils.subst_expr m e in
+  let e = Partial_evaluator.eval_expr e in
   let rec strip_promotions (e : Middle.Expr.Typed.t) =
     match e.pattern with Promotion (e, _, _) -> strip_promotions e | _ -> e
   in

src/analysis_and_optimization/Debug_data_generation.mli

@@ -0,0 +1 @@
+val print_data_prog : Frontend.Ast.typed_program -> string

src/analysis_and_optimization/Mem_pattern.ml

@@ -1,4 +1,5 @@
 open Core_kernel
+open Core_kernel.Poly
 open Middle
 open Middle.Expr
 
@@ -111,10 +112,33 @@ let rec is_uni_eigen_loop_indexing in_loop (ut : UnsizedType.t)
         | None -> false )
       | _ -> false )
 
+let query_stan_math_mem_pattern_support (name : string)
+    (args : (UnsizedType.autodifftype * UnsizedType.t) list) =
+  let open Stan_math_signatures in
+  match name with
+  | x when is_reduce_sum_fn x -> false
+  | x when is_variadic_ode_fn x -> false
+  | x when is_variadic_dae_fn x -> false
+  | _ ->
+      let name =
+        string_operator_to_stan_math_fns (Utils.stdlib_distribution_name name)
+      in
+      let namematches = Hashtbl.find_multi stan_math_signatures name in
+      let filteredmatches =
+        List.filter
+          ~f:(fun x ->
+            Frontend.SignatureMismatch.check_compatible_arguments_mod_conv
+              (snd3 x) args
+            |> Result.is_ok )
+          namematches in
+      let is_soa ((_ : UnsizedType.returntype), _, mem) =
+        mem = Common.Helpers.SoA in
+      List.exists ~f:is_soa filteredmatches
+
 (*Validate whether a function can support SoA matrices*)
 let is_fun_soa_supported name exprs =
   let fun_args = List.map ~f:Expr.Typed.fun_arg exprs in
-  Stan_math_signatures.query_stan_math_mem_pattern_support name fun_args
+  query_stan_math_mem_pattern_support name fun_args
 
 (**
  * Query to find the initial set of objects that cannot be SoA.

src/analysis_and_optimization/Partial_evaluator.ml

@@ -6,11 +6,10 @@ open Middle
 
 exception Rejected of Location_span.t * string
 
-let is_int i Expr.Fixed.{pattern; _} =
-  let nums = List.map ~f:(fun s -> string_of_int i ^ s) [""; "."; ".0"] in
+let rec is_int query Expr.Fixed.{pattern; _} =
   match pattern with
-  | (Lit (Int, i) | Lit (Real, i)) when List.mem nums i ~equal:String.equal ->
-      true
+  | Lit (Int, i) | Lit (Real, i) -> float_of_string i = float_of_int query
+  | Promotion (e, _, _) -> is_int query e
   | _ -> false
 
 let apply_prefix_operator_int (op : string) i =
@@ -107,10 +106,11 @@ let rec eval_expr ?(preserve_stability = false) (e : Expr.Typed.t) =
                 Operator.of_string_opt name
                 |> Option.value_map
                      ~f:(fun op ->
-                       Stan_math_signatures.operator_stan_math_return_type op
-                         argument_types )
+                       Frontend.Typechecker.operator_stan_math_return_type op
+                         argument_types
+                       |> Option.map ~f:fst )
                      ~default:
-                       (Stan_math_signatures.stan_math_returntype name
+                       (Frontend.Typechecker.stan_math_return_type name
                           argument_types ) in
               let try_partially_evaluate_stanlib e =
                 Expr.Fixed.Pattern.(

src/analysis_and_optimization/dune

@@ -1,7 +1,7 @@
 (library
  (name analysis_and_optimization)
  (public_name stanc.analysis)
- (libraries core_kernel str fmt common middle)
+ (libraries core_kernel str fmt common middle frontend)
  (inline_tests)
  ;; TODO: Not sure what's going on but it's throwing an error that this module has no implementation
  (modules_without_implementation monotone_framework_sigs)

src/frontend/Ast_to_Mir.ml

@@ -2,13 +2,6 @@ open Core_kernel
 open Core_kernel.Poly
 open Middle
 
-(* XXX fix exn *)
-let unwrap_return_exn = function
-  | Some (UnsizedType.ReturnType ut) -> ut
-  | x ->
-      Common.FatalError.fatal_error_msg
-        [%message "Unexpected return type " (x : UnsizedType.returntype option)]
-
 let trans_fn_kind kind name =
   let fname = Utils.stdlib_distribution_name name in
   match kind with
@@ -36,14 +29,9 @@ let%expect_test "format_number1" =
   format_number ".123_456" |> print_endline ;
   [%expect ".123456"]
 
-let rec op_to_funapp op args =
-  let argtypes =
-    List.map ~f:(fun x -> (x.Ast.emeta.Ast.ad_level, x.emeta.type_)) args in
-  let type_ =
-    Stan_math_signatures.operator_stan_math_return_type op argtypes
-    |> unwrap_return_exn
-  and loc = Ast.expr_loc_lub args
-  and adlevel = Ast.expr_ad_lub args in
+let rec op_to_funapp op args type_ =
+  let loc = Ast.expr_loc_lub args in
+  let adlevel = Ast.expr_ad_lub args in
   Expr.
     { Fixed.pattern=
         FunApp (StanLib (Operator.to_string op, FnPlain, AoS), trans_exprs args)
@@ -61,8 +49,8 @@ and trans_expr {Ast.expr; Ast.emeta} =
   | Ast.Paren x -> trans_expr x
   | BinOp (lhs, And, rhs) -> EAnd (trans_expr lhs, trans_expr rhs) |> ewrap
   | BinOp (lhs, Or, rhs) -> EOr (trans_expr lhs, trans_expr rhs) |> ewrap
-  | BinOp (lhs, op, rhs) -> op_to_funapp op [lhs; rhs]
-  | PrefixOp (op, e) | Ast.PostfixOp (e, op) -> op_to_funapp op [e]
+  | BinOp (lhs, op, rhs) -> op_to_funapp op [lhs; rhs] emeta.type_
+  | PrefixOp (op, e) | Ast.PostfixOp (e, op) -> op_to_funapp op [e] emeta.type_
   | Ast.TernaryIf (cond, ifb, elseb) ->
       Expr.Fixed.Pattern.TernaryIf
         (trans_expr cond, trans_expr ifb, trans_expr elseb)
@@ -127,12 +115,12 @@ let truncate_dist ud_dists (id : Ast.identifier) ast_obs ast_args t =
     { Stmt.Fixed.meta= smeta
     ; pattern=
         IfElse
-          ( op_to_funapp cond_op [ast_obs; x]
+          ( op_to_funapp cond_op [ast_obs; x] UInt
           , {Stmt.Fixed.meta= smeta; pattern= TargetPE neg_inf}
           , Some y ) } in
   let targetme loc e =
-    {Stmt.Fixed.meta= loc; pattern= TargetPE (op_to_funapp Operator.PMinus [e])}
-  in
+    { Stmt.Fixed.meta= loc
+    ; pattern= TargetPE (op_to_funapp Operator.PMinus [e] e.emeta.type_) } in
   let funapp meta kind name args =
     { Ast.emeta= meta
     ; expr= Ast.FunApp (kind, {name; id_loc= Location_span.empty}, args) } in
@@ -418,7 +406,8 @@ let rec trans_stmt ud_dists (declc : decl_context) (ts : Ast.typed_statement) =
       let rhs =
         match assign_op with
         | Ast.Assign | Ast.ArrowAssign -> trans_expr assign_rhs
-        | Ast.OperatorAssign op -> op_to_funapp op [assignee; assign_rhs] in
+        | Ast.OperatorAssign op ->
+            op_to_funapp op [assignee; assign_rhs] assignee.emeta.type_ in
       Assignment
         ( ( assign_identifier.Ast.name
           , id_type_

src/frontend/Canonicalize.ml

@@ -163,7 +163,8 @@ let rec no_parens {expr; emeta} =
 
 and keep_parens {expr; emeta} =
   match expr with
-  | Paren {expr= Paren e; _} -> keep_parens e
+  | Promotion (e, ut, ad) -> {expr= Promotion (keep_parens e, ut, ad); emeta}
+  | Paren ({expr= Paren _; _} as e) -> keep_parens e
   | Paren ({expr= BinOp _; _} as e)
    |Paren ({expr= PrefixOp _; _} as e)
    |Paren ({expr= PostfixOp _; _} as e)

src/frontend/Debug_data_generation.mli

@@ -27,7 +27,7 @@ type info =
 
 type t = info list String.Map.t
 
-let create () =
+let stan_math_environment =
   let functions =
     Hashtbl.to_alist Stan_math_signatures.stan_math_signatures
     |> List.map ~f:(fun (key, values) ->

src/frontend/Environment.ml

@@ -29,8 +29,8 @@ type info =
 
 type t
 
-val create : unit -> t
-(** Return a new type environment which contains the Stan math library functions
+val stan_math_environment : t
+(** A type environment which contains the Stan math library functions
 *)
 
 val find : t -> string -> info list