From 35199586f85ee356ce4b7c1475236bf97a9d5076 Mon Sep 17 00:00:00 2001
From: Geoffrey Yu <geoffxy@gmail.com>
Date: Thu, 28 Mar 2019 14:34:57 -0400
Subject: [PATCH] Bug fix: Always update source code locations

---
 server/lib/analysis/request_manager.py | 30 ++++++++++++++------------
 server/lib/models/analysis.py          | 18 ++++++++++++++++
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/server/lib/analysis/request_manager.py b/server/lib/analysis/request_manager.py
index 88fd740..2884df5 100644
--- a/server/lib/analysis/request_manager.py
+++ b/server/lib/analysis/request_manager.py
@@ -65,7 +65,13 @@ def _handle_analysis_request(self, analysis_request, state, address):
             if not state.is_request_current(analysis_request):
                 return
 
-            # 0. If the parse tree has not changed, use our cached response
+            # 1. Parse the code to extract source locations
+            class_name, annotation_info, model_operations = analyze_code(
+                tree, source_map)
+            if not state.is_request_current(analysis_request):
+                return
+
+            # 2. If the parse tree has not changed, use our cached response
             cached_results = self._source_cache.query(tree)
             if cached_results is not None:
                 logger.debug(
@@ -73,25 +79,22 @@ def _handle_analysis_request(self, analysis_request, state, address):
                     analysis_request.sequence_number,
                     *address,
                 )
+                # cached_results[0] is the cached model_operations map
+                model_operations.set_runtimes_from_cache(cached_results[0])
                 self._enqueue_response(
                     self._send_analysis_response,
-                    *cached_results,
+                    annotation_info,
+                    model_operations,
+                    *cached_results[1:],
                     analysis_request.sequence_number,
                     address,
                 )
                 return
-
-            # 1. Parse the code to extract relevant information
-            class_name, annotation_info, model_operations = analyze_code(
-                tree, source_map)
-            if not state.is_request_current(analysis_request):
-                return
-
             model = to_trainable_model(tree, class_name)
             if not state.is_request_current(analysis_request):
                 return
 
-            # 2. Profile the model layer by layer
+            # 3. Profile the model layer by layer
             # NOTE: This function makes in-place changes to model_operations
             # NOTE: This function will attach hooks to the model
             get_operation_runtimes(
@@ -110,7 +113,7 @@ def _handle_analysis_request(self, analysis_request, state, address):
             del model
             model = to_trainable_model(tree, class_name)
 
-            # 3. Profile the model's overall memory usage
+            # 4. Profile the model's overall memory usage
             memory_info = get_memory_info(
                 analysis_request.source_code,
                 class_name,
@@ -127,7 +130,7 @@ def _handle_analysis_request(self, analysis_request, state, address):
                 address,
             )
 
-            # 4. Profile the model's throughput
+            # 5. Profile the model's throughput
             throughput_info = get_throughput_info(
                 model, annotation_info, memory_info)
             perf_limits = get_performance_limits(memory_info, throughput_info)
@@ -139,9 +142,8 @@ def _handle_analysis_request(self, analysis_request, state, address):
                 address,
             )
 
-            # 5. Cache the overall results
+            # 6. Cache the overall results
             results = (
-                annotation_info,
                 model_operations,
                 memory_info,
                 throughput_info,
diff --git a/server/lib/models/analysis.py b/server/lib/models/analysis.py
index 607483a..ffdf062 100644
--- a/server/lib/models/analysis.py
+++ b/server/lib/models/analysis.py
@@ -46,6 +46,16 @@ def get_operation_info_by_bound_name(self, bound_name):
     def get_operations(self):
         return self.operations.values()
 
+    def set_runtimes_from_cache(self, cached_info_map):
+        """
+        Used to set the runtimes from cache for when the parsed code has not
+        changed.
+        """
+        for bound_name, op_info in self.operations.items():
+            cached_op_info = cached_info_map.get_operation_info_by_bound_name(
+                bound_name)
+            op_info.runtime_us = cached_op_info.runtime_us
+
     def fill_protobuf(self, operation_list_pb):
         for operation in self.get_operations():
             pb = operation_list_pb.add()
@@ -157,6 +167,14 @@ def __init__(self, max_batch_size, throughput_limit):
         self.max_batch_size = max_batch_size
         self.throughput_limit = throughput_limit
 
+    def __repr__(self):
+        return (
+            'PerformanceLimits(max_batch={:.2f}, thpt_limit={:.2f})'.format(
+                self.max_batch_size,
+                self.throughput_limit,
+            )
+        )
+
     def fill_protobuf(self, limits_pb):
         limits_pb.max_batch_size = self.max_batch_size
         limits_pb.throughput_limit = self.throughput_limit