Add storage namespace to binary cache key

dmoj/checkers/bridged.py

@@ -17,7 +17,7 @@ def get_executor(problem_id, storage_namespace, files, flags, lang, compiler_tim
         filenames = list(files.unwrap())
 
     filenames = [os.path.join(get_problem_root(problem_id, storage_namespace), f) for f in filenames]
-    executor = compile_with_auxiliary_files(filenames, flags, lang, compiler_time_limit)
+    executor = compile_with_auxiliary_files(storage_namespace, filenames, flags, lang, compiler_time_limit)
 
     return executor
 

dmoj/commands/validate.py

@@ -95,7 +95,9 @@ def validate_problem(self, problem_id: str) -> bool:
 
         filenames = [os.path.abspath(os.path.join(problem_root, name)) for name in filenames]
         try:
-            executor = compile_with_auxiliary_files(filenames, lang=language, compiler_time_limit=compiler_time_limit)
+            executor = compile_with_auxiliary_files(
+                None, filenames, lang=language, compiler_time_limit=compiler_time_limit
+            )
         except CompileError as compilation_error:
             print_ansi('#ansi[Failed compiling validator!](red|bold)')
             print(compilation_error.message.rstrip())

dmoj/executors/base_executor.py

@@ -136,6 +136,7 @@ def __init__(
         self,
         problem_id: str,
         source_code: bytes,
+        storage_namespace: Optional[str] = None,
         dest_dir: Optional[str] = None,
         hints: Optional[List[str]] = None,
         unbuffered: bool = False,
@@ -145,6 +146,7 @@ def __init__(
         self._dir = None
         self.problem = problem_id
         self.source = source_code
+        self.storage_namespace = '' if storage_namespace is None else storage_namespace
         self._hints = hints or []
         self.unbuffered = unbuffered
         self.meta: Dict[str, Any] = {}

dmoj/executors/c_like_executor.py

@@ -51,7 +51,10 @@ def get_binary_cache_key(self) -> bytes:
         command = self.get_command()
         assert command is not None
         key_components = (
-            [self.problem, command, self.get_march_flag()] + self.get_defines() + self.get_flags() + self.get_ldflags()
+            [self.storage_namespace, self.problem, command, self.get_march_flag()]
+            + self.get_defines()
+            + self.get_flags()
+            + self.get_ldflags()
         )
         return utf8bytes(''.join(key_components)) + b''.join(self.source_dict.values())
 

dmoj/executors/compiled_executor.py

@@ -213,7 +213,7 @@ def handle_compile_error(self, output: bytes) -> None:
         raise CompileError(output)
 
     def get_binary_cache_key(self) -> bytes:
-        return utf8bytes(self.problem) + self.source
+        return utf8bytes(self.storage_namespace) + utf8bytes(self.problem) + self.source
 
     def compile(self) -> str:
         process = self.create_compile_process(self.get_compile_args())

dmoj/graders/bridged.py

@@ -135,5 +135,10 @@ def _generate_interactor_binary(self) -> BaseExecutor:
         flags = self.handler_data.get('flags', [])
         unbuffered = self.handler_data.get('unbuffered', True)
         return compile_with_auxiliary_files(
-            filenames, flags, self.handler_data.lang, self.handler_data.compiler_time_limit, unbuffered
+            self.problem.storage_namespace,
+            filenames,
+            flags,
+            self.handler_data.lang,
+            self.handler_data.compiler_time_limit,
+            unbuffered,
         )

dmoj/graders/communication.py

@@ -203,7 +203,11 @@ def _generate_binary(self) -> BaseExecutor:
             aux_sources[signature_data['header']] = header
             entry = entry_point
             return executors[self.language].Executor(
-                self.problem.id, entry, aux_sources=aux_sources, defines=['-DSIGNATURE_GRADER']
+                self.problem.id,
+                entry,
+                storage_namespace=self.problem.storage_namespace,
+                aux_sources=aux_sources,
+                defines=['-DSIGNATURE_GRADER'],
             )
         elif self.language in java_siggraders:
             aux_sources = {}
@@ -218,7 +222,9 @@ def _generate_binary(self) -> BaseExecutor:
                 entry = self.source
                 aux_sources[self.problem.id + '_lib'] = entry_point
 
-            return executors[self.language].Executor(self.problem.id, entry, aux_sources=aux_sources)
+            return executors[self.language].Executor(
+                self.problem.id, entry, storage_namespace=self.problem.storage_namespace, aux_sources=aux_sources
+            )
         else:
             raise InternalError('no valid runtime for signature grading %s found' % self.language)
 
@@ -236,6 +242,7 @@ def _generate_manager_binary(self) -> BaseExecutor:
         lang = self.handler_data.manager.lang
         compiler_time_limit = self.handler_data.manager.compiler_time_limit
         return compile_with_auxiliary_files(
+            self.problem.storage_namespace,
             filenames,
             flags,
             lang,

dmoj/graders/signature.py

@@ -28,7 +28,11 @@ def _generate_binary(self) -> BaseExecutor:
             aux_sources[handler_data['header']] = header
             entry = entry_point
             return executors[self.language].Executor(
-                self.problem.id, entry, aux_sources=aux_sources, defines=['-DSIGNATURE_GRADER']
+                self.problem.id,
+                entry,
+                storage_namespace=self.problem.storage_namespace,
+                aux_sources=aux_sources,
+                defines=['-DSIGNATURE_GRADER'],
             )
         elif self.language in java_siggraders:
             aux_sources = {}
@@ -43,6 +47,8 @@ def _generate_binary(self) -> BaseExecutor:
                 entry = self.source
                 aux_sources[self.problem.id + '_lib'] = entry_point
 
-            return executors[self.language].Executor(self.problem.id, entry, aux_sources=aux_sources)
+            return executors[self.language].Executor(
+                self.problem.id, entry, storage_namespace=self.problem.storage_namespace, aux_sources=aux_sources
+            )
         else:
             raise InternalError('no valid runtime for signature grading %s found' % self.language)

dmoj/graders/standard.py

@@ -110,6 +110,7 @@ def _generate_binary(self) -> BaseExecutor:
         return executors[self.language].Executor(
             self.problem.id,
             self.source,
+            storage_namespace=self.problem.storage_namespace,
             hints=self.problem.config.hints or [],
             unbuffered=self.problem.config.unbuffered,
             meta=self.problem.config.meta or {},

dmoj/problem.py

@@ -419,7 +419,9 @@ def _run_generator(self, gen: Union[str, ConfigNode], args: Optional[Iterable[st
             filenames = [filenames]
 
         filenames = [os.path.abspath(os.path.join(base, name)) for name in filenames]
-        executor = compile_with_auxiliary_files(filenames, flags, lang, compiler_time_limit)
+        executor = compile_with_auxiliary_files(
+            self.problem.storage_namespace, filenames, flags, lang, compiler_time_limit
+        )
 
         # convert all args to str before launching; allows for smoother int passing
         assert args is not None

dmoj/utils/helper_files.py

@@ -27,6 +27,7 @@ def mkdtemp():
 
 
 def compile_with_auxiliary_files(
+    storage_namespace: Optional[str],
     filenames: Sequence[str],
     flags: List[str] = [],
     lang: Optional[str] = None,
@@ -70,7 +71,12 @@ def find_runtime(*languages):
 
     executor = executors.executors[lang].Executor
 
-    kwargs = {'fs': executor.fs + [RecursiveDir(tempfile.gettempdir())]}
+    kwargs = {
+        'storage_namespace': storage_namespace,
+        'cached': True,
+        'unbuffered': unbuffered,
+        'fs': executor.fs + [RecursiveDir(tempfile.gettempdir())],
+    }
 
     if issubclass(executor, CompiledExecutor):
         kwargs['compiler_time_limit'] = compiler_time_limit
@@ -81,11 +87,11 @@ def find_runtime(*languages):
     # Optimize the common case.
     if use_cpp or use_c:
         # Some auxiliary files (like those using testlib.h) take an extremely long time to compile, so we cache them.
-        executor = executor('_aux_file', None, aux_sources=sources, cached=True, unbuffered=unbuffered, **kwargs)
+        executor = executor('_aux_file', None, aux_sources=sources, **kwargs)
     else:
         if len(sources) > 1:
             raise InternalError('non-C/C++ auxiliary programs cannot be multi-file')
-        executor = executor('_aux_file', list(sources.values())[0], cached=True, unbuffered=unbuffered, **kwargs)
+        executor = executor('_aux_file', list(sources.values())[0], **kwargs)
 
     return executor