Merge pull request #370 from ariddell/feature/prepare-2.17

Update Stan source, update boost library path

Author: ariddell

pystan/model.py

@@ -251,7 +251,7 @@ def __init__(self, file=None, charset='utf-8', model_name="anon_model",
             os.path.join(pystan_dir, "stan", "src"),
             os.path.join(pystan_dir, "stan", "lib", "stan_math"),
             os.path.join(pystan_dir, "stan", "lib", "stan_math", "lib", "eigen_3.3.3"),
-            os.path.join(pystan_dir, "stan", "lib", "stan_math", "lib", "boost_1.62.0"),
+            os.path.join(pystan_dir, "stan", "lib", "stan_math", "lib", "boost_1.64.0"),
             os.path.join(pystan_dir, "stan", "lib", "stan_math", "lib", "cvodes_2.9.0", "include"),
             np.get_include(),
         ]

pystan/stan

@@ -17,9 +17,10 @@ def test_stanc(self):
     def test_stanc_exception(self):
         model_code = 'parameters {real z;} model {z ~ no_such_distribution();}'
         assertRaisesRegex = self.assertRaisesRegexp if PY2 else self.assertRaisesRegex
-        with assertRaisesRegex(ValueError, 'Distribution .* not found\.'):
+        # distribution not found error
+        with assertRaisesRegex(ValueError, r'Probability function must end in _lpdf or _lpmf\. Found'):
             stanc(model_code=model_code)
-        with assertRaisesRegex(ValueError, 'Distribution .* not found\.'):
+        with assertRaisesRegex(ValueError, r'Probability function must end in _lpdf or _lpmf\. Found'):
             StanModel(model_code=model_code)
 
     def test_stanc_exception_semicolon(self):

pystan/tests/test_stanc.py

@@ -101,12 +101,13 @@ def find_version(*parts):
 stan_include_dirs = ['pystan/stan/src',
                      'pystan/stan/lib/stan_math/',
                      'pystan/stan/lib/stan_math/lib/eigen_3.3.3',
-                     'pystan/stan/lib/stan_math/lib/boost_1.62.0',
+                     'pystan/stan/lib/stan_math/lib/boost_1.64.0',
                      'pystan/stan/lib/stan_math/lib/cvodes_2.9.0/include']
 stan_macros = [
-    ('BOOST_RESULT_OF_USE_TR1', None),
-    ('BOOST_NO_DECLTYPE', None),
     ('BOOST_DISABLE_ASSERTS', None),
+    ('BOOST_NO_DECLTYPE', None),
+    ('BOOST_PHOENIX_NO_VARIADIC_EXPRESSION', None),  # needed for stanc
+    ('BOOST_RESULT_OF_USE_TR1', None),
     ('FUSION_MAX_VECTOR_SIZE', 12),  # for parser, stan-dev/pystan#222
 ]
 extra_compile_args = [