Compose stanc args separately

Author: WardBrian

cmdstanpy/compiler_opts.py

@@ -169,17 +169,16 @@ def validate_stanc_opts(self) -> None:
         for opt in ignore:
             del self._stanc_options[opt]
         if paths is not None:
-            self._stanc_options['include-paths'] = paths
-            bad_paths = [
-                dir
-                for dir in self._stanc_options['include-paths']
-                if not os.path.exists(dir)
-            ]
+            bad_paths = [dir for dir in paths if not os.path.exists(dir)]
             if any(bad_paths):
                 raise ValueError(
                     'invalid include paths: {}'.format(', '.join(bad_paths))
                 )
 
+            self._stanc_options['include-paths'] = [
+                os.path.abspath(os.path.expanduser(path)) for path in paths
+            ]
+
     def validate_cpp_opts(self) -> None:
         """
         Check cpp compiler args.
@@ -254,19 +253,19 @@ def add(self, new_opts: "CompilerOptions") -> None:  # noqa: disable=Q000
 
     def add_include_path(self, path: str) -> None:
         """Adds include path to existing set of compiler options."""
+        path = os.path.abspath(os.path.expanduser(path))
         if 'include-paths' not in self._stanc_options:
             self._stanc_options['include-paths'] = [path]
         elif path not in self._stanc_options['include-paths']:
             self._stanc_options['include-paths'].append(path)
 
-    def compose(self) -> List[str]:
-        """Format makefile options as list of strings."""
+    def compose_stanc(self) -> List[str]:
         opts = []
         if self._stanc_options is not None and len(self._stanc_options) > 0:
             for key, val in self._stanc_options.items():
                 if key == 'include-paths':
                     opts.append(
-                        'STANCFLAGS+=--include-paths='
+                        '--include-paths='
                         + ','.join(
                             (
                                 Path(p).as_posix()
@@ -275,9 +274,14 @@ def compose(self) -> List[str]:
                         )
                     )
                 elif key == 'name':
-                    opts.append(f'STANCFLAGS+=--name={val}')
+                    opts.append(f'--name={val}')
                 else:
-                    opts.append(f'STANCFLAGS+=--{key}')
+                    opts.append(f'--{key}')
+        return opts
+
+    def compose(self) -> List[str]:
+        """Format makefile options as list of strings."""
+        opts = ['STANCFLAGS+=' + flag for flag in self.compose_stanc()]
         if self._cpp_options is not None and len(self._cpp_options) > 0:
             for key, val in self._cpp_options.items():
                 opts.append(f'{key}={val}')

cmdstanpy/model.py

@@ -148,7 +148,6 @@ def __init__(
             if not self._name:
                 self._name, _ = os.path.splitext(filename)
 
-            # TODO: When minimum version is 2.27, use --info instead
             # if program has include directives, record path
             with open(self._stan_file, 'r') as fd:
                 program = fd.read()
@@ -275,22 +274,15 @@ def src_info(self) -> Dict[str, Any]:
         if self.stan_file is None:
             return result
         try:
-            includes = ''
-            if (
-                self.stanc_options is not None
-                and 'include-paths' in self.stanc_options
-            ):
-                print(self.stanc_options)
-                includes = '--include-paths=' + ','.join(
-                    Path(p).as_posix()
-                    for p in self.stanc_options['include-paths']  # type: ignore
-                )
-            cmd = [
-                os.path.join('.', 'bin', 'stanc' + EXTENSION),
-                includes,
-                '--info',
-                self.stan_file,
-            ]
+            cmd = (
+                [os.path.join('.', 'bin', 'stanc' + EXTENSION)]
+                # handle include-paths, allow-undefined etc
+                + self._compiler_options.compose_stanc()
+                + [
+                    '--info',
+                    self.stan_file,
+                ]
+            )
             sout = io.StringIO()
             do_command(cmd=cmd, cwd=cmdstan_path(), fd_out=sout)
             result = json.loads(sout.getvalue())