Merge pull request #3039 from stan-dev/move-constraint-transforms-to-…

…separate-folder Move constraint transforms to their own folder
stan-dev · Apr 18, 2024 · 6a87593 · 6a87593
2 parents 5827e5b + 0932271
commit 6a87593
Show file tree

Hide file tree

Showing 142 changed files with 323 additions and 257 deletions.
diff --git a/runTests.py b/runTests.py
@@ -23,28 +23,34 @@
 
 allowed_paths_with_jumbo = [
     "test/unit/math/prim/",
+    "test/unit/math/prim/constraint",
     "test/unit/math/",
     "test/unit/math/rev/",
+     "test/unit/math/rev/constraint",
     "test/unit/math/fwd/",
+    "test/unit/math/fwd/constraint",
     "test/unit/math/mix/",
     "test/unit/math/mix/fun/",
     "test/unit/math/opencl/",
     "test/unit/",
 ]
 
 jumbo_folders = [
+    "test/unit/math/prim/constraint",
     "test/unit/math/prim/core",
     "test/unit/math/prim/err",
     "test/unit/math/prim/fun",
     "test/unit/math/prim/functor",
     "test/unit/math/prim/meta",
     "test/unit/math/prim/prob",
+     "test/unit/math/rev/constraint",
     "test/unit/math/rev/core",
     "test/unit/math/rev/err",
     "test/unit/math/rev/fun",
     "test/unit/math/rev/functor",
     "test/unit/math/rev/meta",
     "test/unit/math/rev/prob",
+    "test/unit/math/fwd/constraint",
     "test/unit/math/fwd/core",
     "test/unit/math/fwd/fun",
     "test/unit/math/fwd/functor",
@@ -58,7 +64,9 @@
     "test/unit/math/opencl/device_functions",
     "test/unit/math/opencl/kernel_generator",
     "test/unit/math/opencl/prim",
+    "test/unit/math/opencl/prim/constraint",
     "test/unit/math/opencl/rev",
+    "test/unit/math/opencl/rev/constraint",
 ]
 
 

diff --git a/stan/math/fwd.hpp b/stan/math/fwd.hpp
@@ -5,8 +5,10 @@
 
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/prim.hpp>
+#include <stan/math/opencl/prim_constraint.hpp>
 #endif
 
+#include <stan/math/fwd/constraint.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun.hpp>

diff --git a/stan/math/fwd/constraint.hpp b/stan/math/fwd/constraint.hpp
@@ -0,0 +1,9 @@
+#ifndef STAN_MATH_FWD_CONSTRAINT_HPP
+#define STAN_MATH_FWD_CONSTRAINT_HPP
+
+#include <stan/math/prim/fun/Eigen.hpp>
+#include <stan/math/fwd/fun/Eigen_NumTraits.hpp>
+
+#include <stan/math/fwd/constraint/unit_vector_constrain.hpp>
+
+#endif
diff --git a/stan/math/fwd/fun/unit_vector_constrain.hpp → .../fwd/constraint/unit_vector_constrain.hpp b/stan/math/fwd/fun/unit_vector_constrain.hpp → .../fwd/constraint/unit_vector_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_FWD_FUN_UNIT_VECTOR_CONSTRAIN_HPP
-#define STAN_MATH_FWD_FUN_UNIT_VECTOR_CONSTRAIN_HPP
+#ifndef STAN_MATH_FWD_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
+#define STAN_MATH_FWD_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
 
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/tcrossprod.hpp>
@@ -8,7 +8,7 @@
 #include <stan/math/prim/fun/dot_self.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/unit_vector_constrain.hpp>
+#include <stan/math/prim/constraint/unit_vector_constrain.hpp>
 #include <stan/math/prim/fun/tcrossprod.hpp>
 #include <cmath>
 

diff --git a/stan/math/fwd/fun.hpp b/stan/math/fwd/fun.hpp
@@ -121,7 +121,7 @@
 #include <stan/math/fwd/fun/trigamma.hpp>
 #include <stan/math/fwd/fun/trunc.hpp>
 #include <stan/math/fwd/fun/typedefs.hpp>
-#include <stan/math/fwd/fun/unit_vector_constrain.hpp>
+#include <stan/math/fwd/constraint/unit_vector_constrain.hpp>
 #include <stan/math/fwd/fun/value_of.hpp>
 #include <stan/math/fwd/fun/value_of_rec.hpp>
 

diff --git a/stan/math/mix.hpp b/stan/math/mix.hpp
@@ -5,6 +5,7 @@
 #include <stan/math/mix/fun.hpp>
 #include <stan/math/mix/functor.hpp>
 
+#include <stan/math/fwd/constraint.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun.hpp>
@@ -13,8 +14,10 @@
 
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
+#include <stan/math/opencl/rev_constraint.hpp>
 #endif
 
+#include <stan/math/rev/constraint.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun.hpp>

diff --git a/stan/math/opencl/prim.hpp b/stan/math/opencl/prim.hpp
@@ -99,6 +99,8 @@
 #include <stan/math/opencl/zeros_strict_tri.hpp>
 #include <stan/math/opencl/qr_decomposition.hpp>
 
+#include <stan/math/opencl/prim_constraint.hpp>
+
 #include <stan/math/opencl/prim/add_diag.hpp>
 #include <stan/math/opencl/prim/append_array.hpp>
 #include <stan/math/opencl/prim/bernoulli_cdf.hpp>
@@ -172,7 +174,6 @@
 #include <stan/math/opencl/prim/inv_cloglog.hpp>
 #include <stan/math/opencl/prim/inv_gamma_lpdf.hpp>
 #include <stan/math/opencl/prim/inv_sqrt.hpp>
-#include <stan/math/opencl/prim/lb_constrain.hpp>
 #include <stan/math/opencl/prim/log_mix.hpp>
 #include <stan/math/opencl/prim/log_softmax.hpp>
 #include <stan/math/opencl/prim/logistic_cdf.hpp>
@@ -184,7 +185,6 @@
 #include <stan/math/opencl/prim/lognormal_lccdf.hpp>
 #include <stan/math/opencl/prim/lognormal_lcdf.hpp>
 #include <stan/math/opencl/prim/lognormal_lpdf.hpp>
-#include <stan/math/opencl/prim/lub_constrain.hpp>
 #include <stan/math/opencl/prim/matrix_power.hpp>
 #include <stan/math/opencl/prim/mdivide_left_tri_low.hpp>
 #include <stan/math/opencl/prim/mdivide_right_tri_low.hpp>
@@ -201,7 +201,6 @@
 #include <stan/math/opencl/prim/normal_lcdf.hpp>
 #include <stan/math/opencl/prim/normal_lpdf.hpp>
 #include <stan/math/opencl/prim/num_elements.hpp>
-#include <stan/math/opencl/prim/offset_multiplier_constrain.hpp>
 #include <stan/math/opencl/prim/ordered_logistic_glm_lpmf.hpp>
 #include <stan/math/opencl/prim/ordered_logistic_lpmf.hpp>
 #include <stan/math/opencl/prim/pareto_cdf.hpp>
@@ -266,12 +265,10 @@
 #include <stan/math/opencl/prim/to_row_vector.hpp>
 #include <stan/math/opencl/prim/to_vector.hpp>
 #include <stan/math/opencl/prim/trace.hpp>
-#include <stan/math/opencl/prim/ub_constrain.hpp>
 #include <stan/math/opencl/prim/uniform_cdf.hpp>
 #include <stan/math/opencl/prim/uniform_lccdf.hpp>
 #include <stan/math/opencl/prim/uniform_lcdf.hpp>
 #include <stan/math/opencl/prim/uniform_lpdf.hpp>
-#include <stan/math/opencl/prim/unit_vector_constrain.hpp>
 #include <stan/math/opencl/prim/variance.hpp>
 #include <stan/math/opencl/prim/weibull_cdf.hpp>
 #include <stan/math/opencl/prim/weibull_lccdf.hpp>

diff --git a/stan/math/opencl/prim/lb_constrain.hpp → ...h/opencl/prim/constraint/lb_constrain.hpp b/stan/math/opencl/prim/lb_constrain.hpp → ...h/opencl/prim/constraint/lb_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_PRIM_LB_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_PRIM_LB_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_PRIM_CONSTRAINT_LB_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_PRIM_CONSTRAINT_LB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/prim/sum.hpp>

diff --git a/stan/math/opencl/prim/lub_constrain.hpp → .../opencl/prim/constraint/lub_constrain.hpp b/stan/math/opencl/prim/lub_constrain.hpp → .../opencl/prim/constraint/lub_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_PRIM_LUB_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_PRIM_LUB_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_PRIM_CONSTRAINT_LUB_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_PRIM_CONSTRAINT_LUB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/prim/sum.hpp>

diff --git a/...encl/prim/offset_multiplier_constrain.hpp → ...onstraint/offset_multiplier_constrain.hpp b/...encl/prim/offset_multiplier_constrain.hpp → ...onstraint/offset_multiplier_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_PRIM_OFFSET_MULTIPLIER_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_PRIM_OFFSET_MULTIPLIER_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_PRIM_CONSTRAINT_OFFSET_MULTIPLIER_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_PRIM_CONSTRAINT_OFFSET_MULTIPLIER_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/prim/sum.hpp>

diff --git a/stan/math/opencl/prim/ub_constrain.hpp → ...h/opencl/prim/constraint/ub_constrain.hpp b/stan/math/opencl/prim/ub_constrain.hpp → ...h/opencl/prim/constraint/ub_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_PRIM_UB_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_PRIM_UB_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_PRIM_CONSTRAINT_UB_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_PRIM_CONSTRAINT_UB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/prim/sum.hpp>

diff --git a/...ath/opencl/prim/unit_vector_constrain.hpp → ...prim/constraint/unit_vector_constrain.hpp b/...ath/opencl/prim/unit_vector_constrain.hpp → ...prim/constraint/unit_vector_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_UNIT_VECTOR_CONSTRAIN_BLOCK_HPP
-#define STAN_MATH_OPENCL_UNIT_VECTOR_CONSTRAIN_BLOCK_HPP
+#ifndef STAN_MATH_OPENCL_PRIM_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_BLOCK_HPP
+#define STAN_MATH_OPENCL_PRIM_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_BLOCK_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/matrix_cl.hpp>

diff --git a/stan/math/opencl/prim_constraint.hpp b/stan/math/opencl/prim_constraint.hpp
@@ -0,0 +1,12 @@
+#ifndef STAN_MATH_OPENCL_PRIM_CONSTRAINT_HPP
+#define STAN_MATH_OPENCL_PRIM_CONSTRAINT_HPP
+#ifdef STAN_OPENCL
+
+#include <stan/math/opencl/prim/constraint/lb_constrain.hpp>
+#include <stan/math/opencl/prim/constraint/lub_constrain.hpp>
+#include <stan/math/opencl/prim/constraint/offset_multiplier_constrain.hpp>
+#include <stan/math/opencl/prim/constraint/ub_constrain.hpp>
+#include <stan/math/opencl/prim/constraint/unit_vector_constrain.hpp>
+
+#endif
+#endif
diff --git a/stan/math/opencl/rev.hpp b/stan/math/opencl/rev.hpp
@@ -3,6 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/prim.hpp>
+#include <stan/math/opencl/rev_constraint.hpp>
+
 #include <stan/math/opencl/rev/append_col.hpp>
 #include <stan/math/opencl/rev/append_row.hpp>
 #include <stan/math/opencl/rev/as_column_vector_or_scalar.hpp>
@@ -58,7 +60,6 @@
 #include <stan/math/opencl/rev/inv_Phi.hpp>
 #include <stan/math/opencl/rev/inv_sqrt.hpp>
 #include <stan/math/opencl/rev/inv_square.hpp>
-#include <stan/math/opencl/rev/lb_constrain.hpp>
 #include <stan/math/opencl/rev/lbeta.hpp>
 #include <stan/math/opencl/rev/ldexp.hpp>
 #include <stan/math/opencl/rev/lgamma.hpp>
@@ -77,14 +78,12 @@
 #include <stan/math/opencl/rev/log_diff_exp.hpp>
 #include <stan/math/opencl/rev/log_softmax.hpp>
 #include <stan/math/opencl/rev/log_sum_exp.hpp>
-#include <stan/math/opencl/rev/lub_constrain.hpp>
 #include <stan/math/opencl/rev/matrix_power.hpp>
 #include <stan/math/opencl/rev/mdivide_left_tri_low.hpp>
 #include <stan/math/opencl/rev/mdivide_right_tri_low.hpp>
 #include <stan/math/opencl/rev/multiply.hpp>
 #include <stan/math/opencl/rev/multiply_log.hpp>
 #include <stan/math/opencl/rev/multiply_lower_tri_self_transpose.hpp>
-#include <stan/math/opencl/rev/offset_multiplier_constrain.hpp>
 #include <stan/math/opencl/rev/operands_and_partials.hpp>
 #include <stan/math/opencl/rev/operator_unary_minus.hpp>
 #include <stan/math/opencl/rev/operator_unary_plus.hpp>
@@ -117,8 +116,6 @@
 #include <stan/math/opencl/rev/trace.hpp>
 #include <stan/math/opencl/rev/transpose.hpp>
 #include <stan/math/opencl/rev/trunc.hpp>
-#include <stan/math/opencl/rev/ub_constrain.hpp>
-#include <stan/math/opencl/rev/unit_vector_constrain.hpp>
 #include <stan/math/opencl/rev/variance.hpp>
 #include <stan/math/rev.hpp>
 

diff --git a/stan/math/opencl/rev/lb_constrain.hpp → ...th/opencl/rev/constraint/lb_constrain.hpp b/stan/math/opencl/rev/lb_constrain.hpp → ...th/opencl/rev/constraint/lb_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_REV_LB_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_REV_LB_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_REV_CONSTRAINT_LB_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_REV_CONSTRAINT_LB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/rev/adjoint_results.hpp>

diff --git a/stan/math/opencl/rev/lub_constrain.hpp → ...h/opencl/rev/constraint/lub_constrain.hpp b/stan/math/opencl/rev/lub_constrain.hpp → ...h/opencl/rev/constraint/lub_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_REV_LUB_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_REV_LUB_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_REV_CONSTRAINT_LUB_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_REV_CONSTRAINT_LUB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/rev/adjoint_results.hpp>

diff --git a/...pencl/rev/offset_multiplier_constrain.hpp → ...onstraint/offset_multiplier_constrain.hpp b/...pencl/rev/offset_multiplier_constrain.hpp → ...onstraint/offset_multiplier_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_REV_OFFSET_MULTIPLIER_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_REV_OFFSET_MULTIPLIER_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_REV_CONSTRAINT_OFFSET_MULTIPLIER_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_REV_CONSTRAINT_OFFSET_MULTIPLIER_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>

diff --git a/stan/math/opencl/rev/ub_constrain.hpp → ...th/opencl/rev/constraint/ub_constrain.hpp b/stan/math/opencl/rev/ub_constrain.hpp → ...th/opencl/rev/constraint/ub_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_REV_UB_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_REV_UB_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_REV_CONSTRAINT_UB_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_REV_CONSTRAINT_UB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/rev/adjoint_results.hpp>

diff --git a/...math/opencl/rev/unit_vector_constrain.hpp → .../rev/constraint/unit_vector_constrain.hpp b/...math/opencl/rev/unit_vector_constrain.hpp → .../rev/constraint/unit_vector_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_OPENCL_REV_UNIT_VECTOR_CONSTRAIN_HPP
-#define STAN_MATH_OPENCL_REV_UNIT_VECTOR_CONSTRAIN_HPP
+#ifndef STAN_MATH_OPENCL_REV_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
+#define STAN_MATH_OPENCL_REV_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>

diff --git a/stan/math/opencl/rev_constraint.hpp b/stan/math/opencl/rev_constraint.hpp
@@ -0,0 +1,12 @@
+#ifndef STAN_MATH_OPENCL_REV_CONSTRAINT_HPP
+#define STAN_MATH_OPENCL_REV_CONSTRAINT_HPP
+#ifdef STAN_OPENCL
+
+#include <stan/math/opencl/rev/constraint/lb_constrain.hpp>
+#include <stan/math/opencl/rev/constraint/lub_constrain.hpp>
+#include <stan/math/opencl/rev/constraint/offset_multiplier_constrain.hpp>
+#include <stan/math/opencl/rev/constraint/ub_constrain.hpp>
+#include <stan/math/opencl/rev/constraint/unit_vector_constrain.hpp>
+
+#endif
+#endif
diff --git a/stan/math/prim.hpp b/stan/math/prim.hpp
@@ -5,8 +5,10 @@
 
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/prim.hpp>
+#include <stan/math/opencl/prim_constraint.hpp>
 #endif
 
+#include <stan/math/prim/constraint.hpp>
 #include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>

diff --git a/stan/math/prim/constraint.hpp b/stan/math/prim/constraint.hpp
@@ -0,0 +1,45 @@
+#ifndef STAN_MATH_PRIM_CONSTRAINT_HPP
+#define STAN_MATH_PRIM_CONSTRAINT_HPP
+
+#include <stan/math/prim/fun.hpp>
+
+#include <stan/math/prim/constraint/cholesky_corr_constrain.hpp>
+#include <stan/math/prim/constraint/cholesky_corr_free.hpp>
+#include <stan/math/prim/constraint/cholesky_factor_constrain.hpp>
+#include <stan/math/prim/constraint/cholesky_factor_free.hpp>
+#include <stan/math/prim/constraint/corr_constrain.hpp>
+#include <stan/math/prim/constraint/corr_free.hpp>
+#include <stan/math/prim/constraint/corr_matrix_constrain.hpp>
+#include <stan/math/prim/constraint/corr_matrix_free.hpp>
+#include <stan/math/prim/constraint/cov_matrix_constrain.hpp>
+#include <stan/math/prim/constraint/cov_matrix_constrain_lkj.hpp>
+#include <stan/math/prim/constraint/cov_matrix_free.hpp>
+#include <stan/math/prim/constraint/cov_matrix_free_lkj.hpp>
+#include <stan/math/prim/constraint/identity_constrain.hpp>
+#include <stan/math/prim/constraint/identity_free.hpp>
+#include <stan/math/prim/constraint/lb_constrain.hpp>
+#include <stan/math/prim/constraint/lb_free.hpp>
+#include <stan/math/prim/constraint/lub_constrain.hpp>
+#include <stan/math/prim/constraint/lub_free.hpp>
+#include <stan/math/prim/constraint/offset_multiplier_constrain.hpp>
+#include <stan/math/prim/constraint/offset_multiplier_free.hpp>
+#include <stan/math/prim/constraint/ordered_constrain.hpp>
+#include <stan/math/prim/constraint/ordered_free.hpp>
+#include <stan/math/prim/constraint/positive_constrain.hpp>
+#include <stan/math/prim/constraint/positive_free.hpp>
+#include <stan/math/prim/constraint/positive_ordered_constrain.hpp>
+#include <stan/math/prim/constraint/positive_ordered_free.hpp>
+#include <stan/math/prim/constraint/prob_constrain.hpp>
+#include <stan/math/prim/constraint/prob_free.hpp>
+#include <stan/math/prim/constraint/simplex_constrain.hpp>
+#include <stan/math/prim/constraint/simplex_free.hpp>
+#include <stan/math/prim/constraint/stochastic_column_constrain.hpp>
+#include <stan/math/prim/constraint/stochastic_column_free.hpp>
+#include <stan/math/prim/constraint/stochastic_row_constrain.hpp>
+#include <stan/math/prim/constraint/stochastic_row_free.hpp>
+#include <stan/math/prim/constraint/ub_constrain.hpp>
+#include <stan/math/prim/constraint/ub_free.hpp>
+#include <stan/math/prim/constraint/unit_vector_constrain.hpp>
+#include <stan/math/prim/constraint/unit_vector_free.hpp>
+
+#endif
diff --git a/...math/prim/fun/cholesky_corr_constrain.hpp → ...im/constraint/cholesky_corr_constrain.hpp b/...math/prim/fun/cholesky_corr_constrain.hpp → ...im/constraint/cholesky_corr_constrain.hpp
@@ -1,12 +1,12 @@
-#ifndef STAN_MATH_PRIM_FUN_CHOLESKY_CORR_CONSTRAIN_HPP
-#define STAN_MATH_PRIM_FUN_CHOLESKY_CORR_CONSTRAIN_HPP
+#ifndef STAN_MATH_PRIM_CONSTRAINT_CHOLESKY_CORR_CONSTRAIN_HPP
+#define STAN_MATH_PRIM_CONSTRAINT_CHOLESKY_CORR_CONSTRAIN_HPP
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/corr_constrain.hpp>
+#include <stan/math/prim/constraint/corr_constrain.hpp>
 #include <cmath>
 
 namespace stan {

diff --git a/stan/math/prim/fun/cholesky_corr_free.hpp → ...th/prim/constraint/cholesky_corr_free.hpp b/stan/math/prim/fun/cholesky_corr_free.hpp → ...th/prim/constraint/cholesky_corr_free.hpp
@@ -1,9 +1,9 @@
-#ifndef STAN_MATH_PRIM_FUN_CHOLESKY_CORR_FREE_HPP
-#define STAN_MATH_PRIM_FUN_CHOLESKY_CORR_FREE_HPP
+#ifndef STAN_MATH_PRIM_CONSTRAINT_CHOLESKY_CORR_FREE_HPP
+#define STAN_MATH_PRIM_CONSTRAINT_CHOLESKY_CORR_FREE_HPP
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/corr_free.hpp>
+#include <stan/math/prim/constraint/corr_free.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <cmath>
 

diff --git a/...th/prim/fun/cholesky_factor_constrain.hpp → .../constraint/cholesky_factor_constrain.hpp b/...th/prim/fun/cholesky_factor_constrain.hpp → .../constraint/cholesky_factor_constrain.hpp
@@ -1,5 +1,5 @@
-#ifndef STAN_MATH_PRIM_FUN_CHOLESKY_FACTOR_CONSTRAIN_HPP
-#define STAN_MATH_PRIM_FUN_CHOLESKY_FACTOR_CONSTRAIN_HPP
+#ifndef STAN_MATH_PRIM_CONSTRAINT_CHOLESKY_FACTOR_CONSTRAIN_HPP
+#define STAN_MATH_PRIM_CONSTRAINT_CHOLESKY_FACTOR_CONSTRAIN_HPP
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>