fixes for running benchmarks with no arguments

hail-is · Dec 5, 2024 · ada7cfa · ada7cfa
1 parent b96dad2
commit ada7cfa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/hail/python/hail/backend/backend.py b/hail/python/hail/backend/backend.py
@@ -398,7 +398,17 @@ def requires_lowering(self):
     def local_tmpdir(self) -> str:
         pass
 
+    @local_tmpdir.setter
+    @abc.abstractmethod
+    def local_tmpdir(self, dir: str) -> None:
+        pass
+
     @property
     @abc.abstractmethod
     def remote_tmpdir(self) -> str:
         pass
+
+    @remote_tmpdir.setter
+    @abc.abstractmethod
+    def remote_tmpdir(self, dir: str) -> None:
+        pass
diff --git a/hail/python/hail/backend/py4j_backend.py b/hail/python/hail/backend/py4j_backend.py
@@ -332,7 +332,7 @@ def local_tmpdir(self) -> str:
         return self._local_tmpdir
 
     @local_tmpdir.setter
-    def local_tmpdir(self, tmpdir) -> str:
+    def local_tmpdir(self, tmpdir: str) -> None:
         self._local_tmpdir = tmpdir
         self._jbackend.pySetLocalTmp(tmpdir)
 
@@ -341,6 +341,6 @@ def remote_tmpdir(self) -> str:
         return self._remote_tmpdir
 
     @remote_tmpdir.setter
-    def remote_tmpdir(self, tmpdir) -> str:
+    def remote_tmpdir(self, tmpdir: str) -> None:
         self._remote_tmpdir = tmpdir
         self._jbackend.pySetRemoteTmp(tmpdir)
diff --git a/hail/python/hail/context.py b/hail/python/hail/context.py
@@ -67,8 +67,6 @@ def create(
         log: str,
         quiet: bool,
         append: bool,
-        tmpdir: str,
-        local_tmpdir: str,
         default_reference: str,
         global_seed: Optional[int],
         backend: Backend,
@@ -77,25 +75,17 @@ def create(
             log=log,
             quiet=quiet,
             append=append,
-            tmpdir=tmpdir,
-            local_tmpdir=local_tmpdir,
             global_seed=global_seed,
             backend=backend,
         )
         hc.initialize_references(default_reference)
         return hc
 
-    @typecheck_method(
-        log=str, quiet=bool, append=bool, tmpdir=str, local_tmpdir=str, global_seed=nullable(int), backend=Backend
-    )
-    def __init__(self, log, quiet, append, tmpdir, local_tmpdir, global_seed, backend):
+    @typecheck_method(log=str, quiet=bool, append=bool, global_seed=nullable(int), backend=Backend)
+    def __init__(self, log, quiet, append, global_seed, backend: Backend):
         assert not Env._hc
 
         self._log = log
-
-        self._tmpdir = tmpdir
-        self._local_tmpdir = local_tmpdir
-
         self._backend = backend
 
         self._warn_cols_order = True
@@ -138,6 +128,14 @@ def initialize_references(self, default_reference):
         else:
             self._default_ref = ReferenceGenome.read(default_reference)
 
+    @property
+    def _tmpdir(self) -> str:
+        return self._backend.remote_tmpdir
+
+    @property
+    def _local_tmpdir(self) -> str:
+        return self._backend.local_tmpdir
+
     @property
     def default_reference(self) -> ReferenceGenome:
         assert self._default_ref is not None, '_default_ref should have been initialized in HailContext.create'
@@ -500,7 +498,7 @@ def init_spark(
     if not backend.fs.exists(tmpdir):
         backend.fs.mkdir(tmpdir)
 
-    HailContext.create(log, quiet, append, tmpdir, local_tmpdir, default_reference, global_seed, backend)
+    HailContext.create(log, quiet, append, default_reference, global_seed, backend)
     if not quiet:
         connect_logger(backend._utils_package_object, 'localhost', 12888)
 
@@ -571,7 +569,7 @@ async def init_batch(
         tmpdir = os.path.join(backend.remote_tmpdir, 'tmp/hail', secret_alnum_string())
     local_tmpdir = _get_local_tmpdir(local_tmpdir)
 
-    HailContext.create(log, quiet, append, tmpdir, local_tmpdir, default_reference, global_seed, backend)
+    HailContext.create(log, quiet, append, default_reference, global_seed, backend)
 
 
 @typecheck(
@@ -623,7 +621,7 @@ def init_local(
     if not backend.fs.exists(tmpdir):
         backend.fs.mkdir(tmpdir)
 
-    HailContext.create(log, quiet, append, tmpdir, tmpdir, default_reference, global_seed, backend)
+    HailContext.create(log, quiet, append, default_reference, global_seed, backend)
     if not quiet:
         connect_logger(backend._utils_package_object, 'localhost', 12888)