Ensure data_collector.DEADLINE_IN_SECONDS is higher than compilation_runner.COMPILATION_TIMEOUT (#232)

This also removes the currently unused `compilation_timeout` parameter
from the CompilationRunner constructor to avoid discrepancies.

Author: MatzeB

compiler_opt/rl/compilation_runner.py

@@ -34,7 +34,7 @@
 from compiler_opt.rl import corpus
 from compiler_opt.rl import policy_saver
 
-_COMPILATION_TIMEOUT = flags.DEFINE_integer(
+COMPILATION_TIMEOUT = flags.DEFINE_integer(
     'compilation_timeout', 60,
     'Max duration (in seconds) after which we cancel any compilation job.')
 _QUIET = flags.DEFINE_bool(
@@ -341,7 +341,6 @@ def __init__(self,
                clang_path: Optional[str] = None,
                launcher_path: Optional[str] = None,
                moving_average_decay_rate: float = 1,
-               compilation_timeout=None,
                create_observer_fns: Optional[List[Callable[
                    [], CompilationResultObserver]]] = None):
     """Initialization of CompilationRunner class.
@@ -361,8 +360,7 @@ def __init__(self,
     self._launcher_path = launcher_path
     self._moving_average_decay_rate = moving_average_decay_rate
     # Avoid reading the flag during the first interpretation of this module.
-    self._compilation_timeout = (
-        compilation_timeout or _COMPILATION_TIMEOUT.value)
+    self._compilation_timeout = COMPILATION_TIMEOUT.value
     self._cancellation_manager = WorkerCancellationManager()
     self._observers = ([f() for f in create_observer_fns]
                        if create_observer_fns else [])

compiler_opt/rl/data_collector.py

@@ -20,10 +20,11 @@
 
 import numpy as np
 from compiler_opt.rl import policy_saver
+from compiler_opt.rl.compilation_runner import COMPILATION_TIMEOUT
 from tf_agents.trajectories import trajectory
 
 # Deadline for data collection.
-DEADLINE_IN_SECONDS = 30
+DEADLINE_IN_SECONDS = int(COMPILATION_TIMEOUT.value * 1.2)
 
 # We don't wait for all data collection to finish --- it continues if either of
 # the wait_termination_conditions is met.