flipped logic - assume cmdstan is latest, test is CmdStan version is before Major.minor

Author: mitzimorris

cmdstanpy/cmdstan_args.py

@@ -13,7 +13,7 @@
 from cmdstanpy import _TMPDIR
 from cmdstanpy.utils import (
     cmdstan_path,
-    cmdstan_version_at,
+    cmdstan_version_before,
     create_named_text_file,
     get_logger,
     read_metric,
@@ -818,7 +818,7 @@ def validate(self) -> None:
                     'Argument "sig_figs" must be an integer between 1 and 18,'
                     ' found {}'.format(self.sig_figs)
                 )
-            if not cmdstan_version_at(2, 25):
+            if cmdstan_version_before(2, 25):
                 self.sig_figs = None
                 get_logger().warning(
                     'Argument "sig_figs" invalid for CmdStan versions < 2.25, '

cmdstanpy/stanfit.py

@@ -44,7 +44,7 @@
     EXTENSION,
     check_sampler_csv,
     cmdstan_path,
-    cmdstan_version_at,
+    cmdstan_version_before,
     create_named_text_file,
     do_command,
     flatten_chains,
@@ -879,7 +879,7 @@ def summary(
             dir=_TMPDIR, prefix=tmp_csv_file, suffix='.csv', name_only=True
         )
         csv_str = '--csv_filename={}'.format(tmp_csv_path)
-        if not cmdstan_version_at(2, 24):
+        if cmdstan_version_before(2, 24):
             csv_str = '--csv_file={}'.format(tmp_csv_path)
         cmd = [
             cmd_path,

cmdstanpy/utils.py

@@ -182,9 +182,9 @@ def cmdstan_path() -> str:
     return cmdstan
 
 
-def cmdstan_version_at(major: int, minor: int) -> bool:
+def cmdstan_version_before(major: int, minor: int) -> bool:
     """
-    Check that CmdStan version is at or above Major.minor version.
+    Check that CmdStan version is less than Major.minor version.
     Parses version string out of CmdStan makefile variable CMDSTAN_VERSION.
 
     If CmdStan installation is found but cannot parse version from makefile
@@ -200,18 +200,18 @@ def cmdstan_version_at(major: int, minor: int) -> bool:
     try:
         makefile = os.path.join(cmdstan_path(), 'makefile')
     except ValueError:
-        get_logger().warning(
+        get_logger().info(
             'No CmdStan installation found, '
-            'cannot check that Cmdstan version is at or above %d.%d.',
+            'cannot assert version is less than %d.%d.',
             major,
             minor,
         )
         return False
 
     if not os.path.exists(makefile):
-        get_logger().warning(
+        get_logger().info(
             'CmdStan installation %s missing makefile, '
-            'cannot check that Cmdstan version is at or above %d.%d.',
+            'cannot assert version is less than %d.%d.',
             cmdstan_path(),
             major,
             minor,
@@ -223,9 +223,9 @@ def cmdstan_version_at(major: int, minor: int) -> bool:
 
     start_idx = contents.find('CMDSTAN_VERSION := ')
     if start_idx < 0:
-        get_logger().warning(
+        get_logger().info(
             'Cannot parse version from makefile: %s,'
-            'cannot check that Cmdstan version is at or above %d.%d.',
+            'cannot assert version is less than %d.%d.',
             makefile,
             major,
             minor,
@@ -237,9 +237,9 @@ def cmdstan_version_at(major: int, minor: int) -> bool:
 
     version = contents[start_idx:end_idx]
     if version is None or len(version) < 3 or len(version.split('.')) < 2:
-        get_logger().warning(
+        get_logger().info(
             'Cannot parse version from makefile: %s,'
-            'cannot check that Cmdstan version is at or above %d.%d.',
+            'cannot assert version is less than %d.%d.',
             makefile,
             major,
             minor,
@@ -249,7 +249,7 @@ def cmdstan_version_at(major: int, minor: int) -> bool:
     splits = version.split('.')
     cur_major = int(splits[0])
     cur_minor = int(splits[1])
-    if cur_major > major or (cur_major == major and cur_minor >= minor):
+    if cur_major < major or (cur_major == major and cur_minor < minor):
         return True
     return False
 

test/test_cmdstan_args.py

@@ -17,7 +17,7 @@
     SamplerArgs,
     VariationalArgs,
 )
-from cmdstanpy.utils import cmdstan_version_at
+from cmdstanpy.utils import cmdstan_version_before
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 DATAFILES_PATH = os.path.join(HERE, 'data')
@@ -576,7 +576,7 @@ def test_args_bad(self):
     def test_args_sig_figs(self):
         sampler_args = SamplerArgs()
         cmdstan_path()  # sets os.environ['CMDSTAN']
-        if not cmdstan_version_at(2, 25):
+        if cmdstan_version_before(2, 25):
             with LogCapture() as log:
                 logging.getLogger()
                 CmdStanArgs(

test/test_sample.py

@@ -27,7 +27,7 @@
 from cmdstanpy.cmdstan_args import CmdStanArgs, Method, SamplerArgs
 from cmdstanpy.model import CmdStanModel
 from cmdstanpy.stanfit import CmdStanMCMC, RunSet, from_csv
-from cmdstanpy.utils import EXTENSION, cmdstan_version_at
+from cmdstanpy.utils import EXTENSION, cmdstan_version_before
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 DATAFILES_PATH = os.path.join(HERE, 'data')
@@ -557,7 +557,7 @@ def test_bernoulli_path_with_space(self):
         )
 
     def test_index_bounds_error(self):
-        if cmdstan_version_at(2, 25) or cmdstan_version_at(2, 26):
+        if not cmdstan_version_before(2, 27):
             oob_stan = os.path.join(DATAFILES_PATH, 'out_of_bounds.stan')
             oob_model = CmdStanModel(stan_file=oob_stan)
             with self.assertRaises(RuntimeError):
@@ -1496,7 +1496,7 @@ def test_validate(self):
         self.assertEqual(bern_fit.metric_type, 'diag_e')
 
     def test_validate_sample_sig_figs(self, stanfile='bernoulli.stan'):
-        if cmdstan_version_at(2, 25):
+        if not cmdstan_version_before(2, 25):
             stan = os.path.join(DATAFILES_PATH, stanfile)
             bern_model = CmdStanModel(stan_file=stan)
 
@@ -1568,7 +1568,7 @@ def test_validate_summary_sig_figs(self):
         beta1_default = format(sum_default.iloc[1, 0], '.18g')
         self.assertTrue(beta1_default.startswith('1.3'))
 
-        if cmdstan_version_at(2, 25):
+        if not cmdstan_version_before(2, 25):
             sum_17 = fit.summary(sig_figs=17)
             beta1_17 = format(sum_17.iloc[1, 0], '.18g')
             self.assertTrue(beta1_17.startswith('1.345767078273'))

test/test_utils.py

@@ -28,7 +28,7 @@
     TemporaryCopiedFile,
     check_sampler_csv,
     cmdstan_path,
-    cmdstan_version_at,
+    cmdstan_version_before,
     do_command,
     flatten_chains,
     get_latest_cmdstan,
@@ -202,9 +202,30 @@ def test_munge_cmdstan_versions(self):
             os.makedirs(os.path.join(tdir, 'cmdstan-2.22.0'))
             self.assertEqual(get_latest_cmdstan(tdir), 'cmdstan-2.22.0')
 
-    def test_cmdstan_version_at(self):
+    def test_cmdstan_version_before(self):
         cmdstan_path()  # sets os.environ['CMDSTAN']
-        self.assertFalse(cmdstan_version_at(99, 99))
+        self.assertTrue(cmdstan_version_before(99, 99))
+
+        with tempfile.TemporaryDirectory(
+            prefix="cmdstan_tests", dir=_TMPDIR
+        ) as tmpdir:
+            tdir = os.path.join(tmpdir, 'tmpdir_xxx')
+            os.makedirs(tdir)
+            os.makedirs(os.path.join(tdir, 'cmdstan-2.22.0'))
+            os.environ['CMDSTAN'] = os.path.join(tdir, 'cmdstan-2.22.0')
+            with LogCapture() as log:
+                logging.getLogger()
+                self.assertFalse(cmdstan_version_before(99, 99))
+                del os.environ['CMDSTAN']
+                cmdstan_path()
+            log.check_present(
+                (
+                    'cmdstanpy',
+                    'INFO',
+                    'No CmdStan installation found, '
+                    'cannot assert version is less than 99.99.',
+                )
+            )
 
 
 class DataFilesTest(unittest.TestCase):