solving merge conflicts

microsoft · Oct 16, 2020 · 33e8d6e · 33e8d6e
1 parent ab0a251
commit 33e8d6e
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/source/Mlos.Notebooks/SmartCacheOptimization.ipynb b/source/Mlos.Notebooks/SmartCacheOptimization.ipynb
@@ -101,12 +101,10 @@
  {
  "output_type": "execute_result",
  "data": {
-<<<<<<< HEAD
  "text/plain": "smart_cache_config\nimplementation: [LRU, MRU]\nlru_cache_config.cache_size: {1, 1 + 1, ... , 4096}\nmru_cache_config.cache_size: {1, 1 + 1, ... , 4096}"
  },
  "metadata": {},
  "execution_count": 4
-=======
  "text/plain": [
  " Name: smart_cache_config\n",
  " Dimensions:\n",
@@ -128,7 +126,6 @@
  "execution_count": 4,
  "metadata": {},
  "output_type": "execute_result"
->>>>>>> 5936ceb2e995b20f36a0bde8b2f477475ca06692
  }
  ],
  "source": [
@@ -156,10 +153,7 @@
  " objectives=[Objective(name=\"hit_rate\", minimize=False)]\n",
  ")\n",
  "# create an optimizer proxy that connects to the remote optimizer via grpc:\n",
-<<<<<<< HEAD
-=======
  "# here we could also configure the optimizer\n",
->>>>>>> 5936ceb2e995b20f36a0bde8b2f477475ca06692
  "optimizer = bayesian_optimizer_factory.create_remote_optimizer(optimization_problem=optimization_problem)"
  ]
  },
@@ -176,7 +170,6 @@
  {
  "cell_type": "code",
  "execution_count": 6,
-<<<<<<< HEAD
  "metadata": {
  "tags": []
  },
@@ -187,10 +180,8 @@
  "text": "09/09/2020 02:22:26 - Optimizing Smart Cache - INFO - [ MlosAgent.py: 174 - _process_callbacks() ] Starting processing telemetry messages.\n"
  }
  ],
-=======
  "metadata": {},
  "outputs": [],
->>>>>>> 5936ceb2e995b20f36a0bde8b2f477475ca06692
  "source": [
  "workload_launcher = SmartCacheWorkloadLauncher(logger=logger)\n",
  "mlos_agent = workload_launcher.mlos_agent"
@@ -730,4 +721,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}