resolve minor conflicts

uber · Dec 25, 2023 · d126d37 · d126d37
2 parents 77dfe99 + 7919a8c
commit d126d37
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/orbit/estimators/stan_estimator.py b/orbit/estimators/stan_estimator.py
@@ -117,7 +117,6 @@ def fit(
         fitter=None,
         init_values=None,
     ):
-
         # T_STAR is used as sampling temperature which is used for WBIC calculation
         data_input.update({"T_STAR": sampling_temperature})
         if self.verbose:

diff --git a/orbit/template/dlt.py b/orbit/template/dlt.py
@@ -198,7 +198,6 @@ def __init__(
         forecast_horizon=1,
         **kwargs,
     ):
-
         self.damped_factor = damped_factor
         self.global_trend_option = global_trend_option
         self.period = period

diff --git a/orbit/template/ktr.py b/orbit/template/ktr.py
@@ -809,7 +809,6 @@ def _generate_seas(
         seas_decomp = dict()
 
         if seasonality is not None and len(seasonality) > 0:
-
             date_col = training_meta[TrainingMetaKeys.DATE_COL.value]
             date_array = training_meta[TrainingMetaKeys.DATE_ARRAY.value]
             training_end = training_meta[TrainingMetaKeys.END.value]

diff --git a/orbit/utils/stan.py b/orbit/utils/stan.py
@@ -38,6 +38,7 @@
 #             "{}/{}.pkl".format(CompiledStanModelPath.CHILD, stan_model_name),
 #         )
 
+<<<<<<< HEAD
 #     # updated for py3
 #     os.makedirs(os.path.dirname(compiled_model), exist_ok=True)
 #     # compile if compiled file does not exist or stan source has changed (with later datestamp than compiled)
@@ -51,6 +52,20 @@
 #             )
 #         )
 #         sm = CmdStanModel(stan_file=source_model)
+=======
+    # updated for py3
+    os.makedirs(os.path.dirname(compiled_model), exist_ok=True)
+    # compile if compiled file does not exist or stan source has changed (with later datestamp than compiled)
+    if not os.path.isfile(compiled_model) or os.path.getmtime(
+        compiled_model
+    ) < os.path.getmtime(source_model):
+        logger.info(
+            "First time in running stan model:{}. Expect 3 - 5 minutes for compilation.".format(
+                stan_model_name
+            )
+        )
+        sm = CmdStanModel(stan_file=source_model)
+>>>>>>> 7919a8c474dd4880539a9fddb54f9c1888b1704c
 
 #         with open(compiled_model, "wb") as f:
 #             pickle.dump(sm, f, protocol=pickle.HIGHEST_PROTOCOL)
@@ -90,7 +105,6 @@ def compile_stan_model_simplified(path):
     if not os.path.isfile(compiled_path) or os.path.getmtime(
         compiled_path
     ) < os.path.getmtime(source_path):
-
         logger.info(
             "First time in running stan model:{}. Expect 3 - 5 minutes for compilation.".format(
                 source_filename