fixing unit tests

Author: mitzimorris

cmdstanpy/stanfit.py

@@ -626,19 +626,21 @@ def _validate_csv_files(self) -> Dict[str, Any]:
                     thin=self._thin,
                 )
                 for key in dzero:
-                    # TODO: only check args that matter for CSV parsing
+                    # check args that matter for parsing, plus name, version
                     if (
                         key
-                        not in [
-                            'id',
-                            'algorithm',
-                            'diagnostic_file',
-                            'metric_file',
-                            'profile_file',
-                            'stepsize',
-                            'init',
-                            'seed',
-                            'start_datetime',
+                        in [
+                            'stan_version_major',
+                            'stan_version_minor',
+                            'stan_version_patch',
+                            'stanc_version',
+                            'model',
+                            'num_samples',
+                            'num_warmup',
+                            'save_warmup',
+                            'thin',
+                            'refresh',
+                            'metric',
                         ]
                         and dzero[key] != drest[key]
                     ):

test/conftest.py

@@ -9,6 +9,8 @@
 
 
 # after we have run all tests, use git to delete the built files in data/
+
+
 @pytest.fixture(scope='session', autouse=True)
 def cleanup_test_files():
     yield

test/test_sample.py

@@ -26,7 +26,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_before
+from cmdstanpy.utils import EXTENSION, cmdstan_version_before, model_info
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 DATAFILES_PATH = os.path.join(HERE, 'data')
@@ -440,13 +440,18 @@ def test_multi_proc_threads(self):
         # 2.28 compile with cpp_options={'STAN_THREADS':'true'}
         if not cmdstan_version_before(2, 28):
             logistic_stan = os.path.join(DATAFILES_PATH, 'logistic.stan')
-            logistic_model = CmdStanModel(
-                stan_file=logistic_stan,
-                compile=True,
-                cpp_options={'STAN_THREADS': 'true'},
+            logistic_model = CmdStanModel(stan_file=logistic_stan)
+
+            os.remove(logistic_model.exe_file)
+            logistic_model.compile(
+                force=True,
+                cpp_options={'STAN_THREADS': 'TRUE'},
             )
-            logistic_data = os.path.join(DATAFILES_PATH, 'logistic.data.R')
+            info_dict = model_info(logistic_model.exe_file)
+            self.assertTrue(info_dict is not None)
+            self.assertTrue('STAN_THREADS' in info_dict)
 
+            logistic_data = os.path.join(DATAFILES_PATH, 'logistic.data.R')
             with LogCapture() as log:
                 logging.getLogger()
                 logistic_model.sample(
@@ -598,7 +603,6 @@ def test_fixed_param_unspecified(self):
         datagen_fit = datagen_model.sample(
             iter_sampling=100, show_progress=False
         )
-        print(datagen_fit)
         self.assertEqual(datagen_fit.step_size, None)
 
     def test_bernoulli_file_with_space(self):
@@ -786,7 +790,6 @@ def test_instantiate_from_csvfiles(self):
             if file.endswith(".csv"):
                 csvfiles.append(os.path.join(csvfiles_path, file))
         bern_fit = from_csv(path=csvfiles)
-        print(bern_fit.metadata.method_vars_cols.keys())
 
         draws_pd = bern_fit.draws_pd()
         self.assertEqual(