fix merge

Signed-off-by: Wesley M. Gifford <[email protected]>
ibm-granite · Mar 6, 2024 · 050ea67 · 050ea67
1 parent d102800
commit 050ea67
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 60 deletions.
diff --git a/notebooks/hfdemo/patch_tsmixer_blog.ipynb b/notebooks/hfdemo/patch_tsmixer_blog.ipynb
@@ -240,12 +240,7 @@
     "tsp = TimeSeriesPreprocessor(\n",
     "    timestamp_column=timestamp_column,\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    scaling=True,\n",
     ")\n",
     "tsp = tsp.train(train_data)"
@@ -261,38 +256,23 @@
     "    tsp.preprocess(train_data),\n",
     "    id_columns=id_columns,\n",
     "    timestamp_column=\"date\",\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")\n",
     "valid_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(valid_data),\n",
     "    id_columns=id_columns,\n",
     "    timestamp_column=\"date\",\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")\n",
     "test_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(test_data),\n",
     "    id_columns=id_columns,\n",
     "    timestamp_column=\"date\",\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")"
@@ -878,12 +858,7 @@
     "tsp = TimeSeriesPreprocessor(\n",
     "    timestamp_column=timestamp_column,\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    scaling=True,\n",
     ")\n",
     "tsp = tsp.train(train_data)"
@@ -898,36 +873,21 @@
     "train_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(train_data),\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")\n",
     "valid_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(valid_data),\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")\n",
     "test_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(test_data),\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")"

diff --git a/notebooks/hfdemo/patch_tst_getting_started.ipynb b/notebooks/hfdemo/patch_tst_getting_started.ipynb
@@ -246,12 +246,7 @@
     "tsp = TimeSeriesPreprocessor(\n",
     "    timestamp_column=timestamp_column,\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    scaling=True,\n",
     ")\n",
     "tsp.train(train_data)"
@@ -267,36 +262,21 @@
     "train_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(train_data),\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")\n",
     "valid_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(valid_data),\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")\n",
     "test_dataset = ForecastDFDataset(\n",
     "    tsp.preprocess(test_data),\n",
     "    id_columns=id_columns,\n",
-<<<<<<< HEAD
     "    target_columns=forecast_columns,\n",
-=======
-    "    input_columns=forecast_columns,\n",
-    "    output_columns=forecast_columns,\n",
->>>>>>> main
     "    context_length=context_length,\n",
     "    prediction_length=forecast_horizon,\n",
     ")"