Merge branch 'develop' of https://github.com/stan-dev/cmdstanpy into develop

Author: mitzimorris

cmdstanpy/__init__.py

@@ -50,6 +50,7 @@ def _cleanup_tmpdir() -> None:
 from .utils import set_cmdstan_path  # noqa
 from .utils import (
     cmdstan_path,
+    cmdstan_version,
     install_cmdstan,
     set_make_env,
     show_versions,
@@ -71,4 +72,5 @@ def _cleanup_tmpdir() -> None:
     'write_stan_json',
     'show_versions',
     'rebuild_cmdstan',
+    'cmdstan_version',
 ]

cmdstanpy/_version.py

@@ -1,3 +1,3 @@
 """PyPi Version"""
 
-__version__ = '1.0.0rc1'
+__version__ = '1.0.0rc2'

cmdstanpy/compiler_opts.py

@@ -67,6 +67,26 @@ def __repr__(self) -> str:
             self._stanc_options, self._cpp_options
         )
 
+    def __eq__(self, other: Any) -> bool:
+        """Overrides the default implementation"""
+        if self.is_empty() and other is None:  # equiv w/r/t compiler
+            return True
+        if not isinstance(other, CompilerOptions):
+            return False
+        return (
+            self._stanc_options == other.stanc_options
+            and self._cpp_options == other.cpp_options
+            and self._user_header == other.user_header
+        )
+
+    def is_empty(self) -> bool:
+        """True if no options specified."""
+        return (
+            self._stanc_options == {}
+            and self._cpp_options == {}
+            and self._user_header == ''
+        )
+
     @property
     def stanc_options(self) -> Dict[str, Union[bool, int, str]]:
         """Stanc compiler options."""
@@ -77,6 +97,11 @@ def cpp_options(self) -> Dict[str, Union[bool, int]]:
         """C++ compiler options."""
         return self._cpp_options
 
+    @property
+    def user_header(self) -> str:
+        """user header."""
+        return self._user_header
+
     def validate(self) -> None:
         """
         Check compiler args.

cmdstanpy/install_cxx_toolchain.py

@@ -24,11 +24,7 @@
 from typing import Any, Dict, List
 
 from cmdstanpy import _DOT_CMDSTAN
-from cmdstanpy.utils import (
-    pushd,
-    validate_dir,
-    wrap_url_progress_hook,
-)
+from cmdstanpy.utils import pushd, validate_dir, wrap_url_progress_hook
 
 EXTENSION = '.exe' if platform.system() == 'Windows' else ''
 IS_64BITS = sys.maxsize > 2 ** 32