Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/executorlib/task_scheduler/interactive/spawner_pysqa.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ def create_pysqa_block_allocation_scheduler(
cores_per_worker = executor_kwargs.get("cores", 1)
if "cwd" in executor_kwargs and executor_kwargs["cwd"] is not None:
executor_kwargs["cwd"] = os.path.abspath(executor_kwargs["cwd"])
elif cache_directory is not None:
executor_kwargs["cwd"] = os.path.abspath(cache_directory)
if cache_directory is not None:
executor_kwargs["cache_directory"] = os.path.abspath(cache_directory)
else:
Expand Down
29 changes: 29 additions & 0 deletions tests/unit/executor/test_flux_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ def test_executor(self):
self.assertEqual(len(os.listdir("executorlib_cache")), 4)
self.assertTrue(fs1.done())

def test_executor_no_cwd(self):
with FluxClusterExecutor(
resource_dict={"cores": 2},
block_allocation=False,
cache_directory="executorlib_cache",
pmi_mode=pmi,
) as exe:
cloudpickle_register(ind=1)
fs1 = exe.submit(mpi_funct, 1)
self.assertFalse(fs1.done())
self.assertEqual(fs1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertEqual(len(os.listdir("executorlib_cache")), 4)
self.assertTrue(fs1.done())

def test_executor_blockallocation(self):
with FluxClusterExecutor(
resource_dict={"cores": 2, "cwd": "executorlib_cache"},
Expand All @@ -86,6 +100,21 @@ def test_executor_blockallocation(self):
self.assertEqual(len(os.listdir("executorlib_cache")), 2)
self.assertTrue(fs1.done())

def test_executor_blockallocation_no_cwd(self):
with FluxClusterExecutor(
resource_dict={"cores": 2},
block_allocation=True,
cache_directory="executorlib_cache",
pmi_mode=pmi,
max_workers=1,
) as exe:
cloudpickle_register(ind=1)
fs1 = exe.submit(mpi_funct, 1)
self.assertFalse(fs1.done())
self.assertEqual(fs1.result(), [(1, 2, 0), (1, 2, 1)])
self.assertEqual(len(os.listdir("executorlib_cache")), 2)
self.assertTrue(fs1.done())

def test_executor_dependencies(self):
with FluxClusterExecutor(
resource_dict={"cores": 1, "cwd": "executorlib_cache"},
Expand Down
Loading