Skip to content

Commit 124f925

Browse files
jan-janssenjan-janssen
committed
rename cache file
1 parent e1a8a8c commit 124f925

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎executorlib/standalone/hdf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:
108108
def get_cache_data(cache_directory: str) -> list[dict]:
109109
file_lst = []
110110
for task_key in os.listdir(cache_directory):
111-
file_name = os.path.join(cache_directory, task_key, "file.h5out")
111+
file_name = os.path.join(cache_directory, task_key, "cache.h5out")
112112
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
113113
if os.path.exists(file_name):
114114
with h5py.File(file_name, "r") as hdf:

‎executorlib/task_scheduler/file/shared.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ def execute_tasks_h5(
110110
if task_key not in memory_dict:
111111
if not (
112112
task_key in os.listdir(cache_directory)
113-
and "file.h5out"
113+
and "cache.h5out"
114114
in os.listdir(os.path.join(cache_directory, task_key))
115115
):
116116
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
117-
file_name = os.path.join(cache_directory, task_key, "file.h5in")
117+
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
118118
dump(file_name=file_name, data_dict=data_dict)
119119
if not disable_dependencies:
120120
task_dependent_lst = [
@@ -141,7 +141,7 @@ def execute_tasks_h5(
141141
cache_directory=os.path.join(cache_directory, task_key),
142142
)
143143
file_name_dict[task_key] = os.path.join(
144-
cache_directory, task_key, "file.h5out"
144+
cache_directory, task_key, "cache.h5out"
145145
)
146146
memory_dict[task_key] = task_dict["future"]
147147
future_queue.task_done()
@@ -197,7 +197,7 @@ def _check_task_output(
197197
Future: The updated future object.
198198
199199
"""
200-
file_name = os.path.join(cache_directory, task_key, "file.h5out")
200+
file_name = os.path.join(cache_directory, task_key, "cache.h5out")
201201
if not os.path.exists(file_name):
202202
return future_obj
203203
exec_flag, no_error_flag, result = get_output(file_name=file_name)

‎executorlib/task_scheduler/interactive/shared.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ def _execute_task_with_cache(
149149
resource_dict=task_dict.get("resource_dict", {}),
150150
)
151151
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
152-
file_name = os.path.join(cache_directory, task_key, "file.h5out")
152+
file_name = os.path.join(cache_directory, task_key, "cache.h5out")
153153
if not (
154154
task_key in os.listdir(cache_directory)
155-
and "file.h5out" in os.listdir(os.path.join(cache_directory, task_key))
155+
and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
156156
):
157157
f = task_dict.pop("future")
158158
if f.set_running_or_notify_cancel():

‎tests/test_cache_backend_execute.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_execute_function_mixed(self):
3535
fn_args=[1],
3636
fn_kwargs={"b": 2},
3737
)
38-
file_name = os.path.join(cache_directory, task_key, "file.h5in")
38+
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
3939
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
4040
dump(file_name=file_name, data_dict=data_dict)
4141
backend_execute_task_in_file(file_name=file_name)
@@ -46,11 +46,11 @@ def test_execute_function_mixed(self):
4646
self.assertTrue(future_obj.done())
4747
self.assertEqual(future_obj.result(), 3)
4848
self.assertTrue(
49-
get_runtime(file_name=os.path.join(cache_directory, task_key, "file.h5out"))
49+
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
5050
> 0.0
5151
)
5252
future_file_obj = FutureItem(
53-
file_name=os.path.join(cache_directory, task_key, "file.h5out")
53+
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
5454
)
5555
self.assertTrue(future_file_obj.done())
5656
self.assertEqual(future_file_obj.result(), 3)
@@ -63,7 +63,7 @@ def test_execute_function_args(self):
6363
fn_args=[1, 2],
6464
fn_kwargs={},
6565
)
66-
file_name = os.path.join(cache_directory, task_key, "file.h5in")
66+
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
6767
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
6868
dump(file_name=file_name, data_dict=data_dict)
6969
backend_execute_task_in_file(file_name=file_name)
@@ -74,11 +74,11 @@ def test_execute_function_args(self):
7474
self.assertTrue(future_obj.done())
7575
self.assertEqual(future_obj.result(), 3)
7676
self.assertTrue(
77-
get_runtime(file_name=os.path.join(cache_directory, task_key, "file.h5out"))
77+
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
7878
> 0.0
7979
)
8080
future_file_obj = FutureItem(
81-
file_name=os.path.join(cache_directory, task_key, "file.h5out")
81+
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
8282
)
8383
self.assertTrue(future_file_obj.done())
8484
self.assertEqual(future_file_obj.result(), 3)
@@ -91,7 +91,7 @@ def test_execute_function_kwargs(self):
9191
fn_args=[],
9292
fn_kwargs={"a": 1, "b": 2},
9393
)
94-
file_name = os.path.join(cache_directory, task_key, "file.h5in")
94+
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
9595
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
9696
dump(file_name=file_name, data_dict=data_dict)
9797
backend_execute_task_in_file(file_name=file_name)
@@ -102,11 +102,11 @@ def test_execute_function_kwargs(self):
102102
self.assertTrue(future_obj.done())
103103
self.assertEqual(future_obj.result(), 3)
104104
self.assertTrue(
105-
get_runtime(file_name=os.path.join(cache_directory, task_key, "file.h5out"))
105+
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
106106
> 0.0
107107
)
108108
future_file_obj = FutureItem(
109-
file_name=os.path.join(cache_directory, task_key, "file.h5out")
109+
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
110110
)
111111
self.assertTrue(future_file_obj.done())
112112
self.assertEqual(future_file_obj.result(), 3)
@@ -119,7 +119,7 @@ def test_execute_function_error(self):
119119
fn_args=[],
120120
fn_kwargs={"a": 1},
121121
)
122-
file_name = os.path.join(cache_directory, task_key, "file.h5in")
122+
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
123123
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
124124
dump(file_name=file_name, data_dict=data_dict)
125125
backend_execute_task_in_file(file_name=file_name)
@@ -131,11 +131,11 @@ def test_execute_function_error(self):
131131
with self.assertRaises(ValueError):
132132
future_obj.result()
133133
self.assertTrue(
134-
get_runtime(file_name=os.path.join(cache_directory, task_key, "file.h5out"))
134+
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
135135
> 0.0
136136
)
137137
future_file_obj = FutureItem(
138-
file_name=os.path.join(cache_directory, task_key, "file.h5out")
138+
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
139139
)
140140
self.assertTrue(future_file_obj.done())
141141
with self.assertRaises(ValueError):

0 commit comments

Comments
 (0)