Skip to content

Commit 2ecc1f9

Browse files
committed
Introduce workflow_json_filename variable
1 parent 275e9f2 commit 2ecc1f9

8 files changed

+1643
-477
lines changed

.github/workflows/aiida.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
papermill universal_simple_to_aiida.ipynb universal_simple_to_aiida_out.ipynb -k "python3"
3030
papermill universal_qe_to_aiida.ipynb universal_qe_to_aiida_out.ipynb -k "python3"
3131
32-
: # papermill aiida_to_pyiron_base_simple.ipynb aiida_to_pyiron_base_simple_out.ipynb -k "python3"
32+
papermill aiida_to_pyiron_base_simple.ipynb aiida_to_pyiron_base_simple_out.ipynb -k "python3"
3333
: # papermill aiida_to_pyiron_base_qe.ipynb pyiron_base_to_jobflow_qe_out.ipynb -k "python3"
3434
3535
papermill aiida_to_jobflow_simple.ipynb aiida_to_jobflow_simple_out.ipynb -k "python3"

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,13 @@ pyiron.log
180180
pyiron_draw.png
181181
python_workflow_definition/src/python_workflow_definition/__pycache__/
182182
test/
183+
workflow_simple_aiida.json
184+
workflow_simple_jobflow.json
185+
workflow_simple_pyiron_base.json
186+
workflow_qe_aiida.json
187+
workflow_qe_jobflow.json
188+
workflow_qe_pyiron_base.json
189+
mini/
190+
.bak/
191+
workgraph_qe.json
192+

aiida_construct_qe.ipynb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
},
146146
{
147147
"cell_type": "code",
148-
"execution_count": 1,
148+
"execution_count": null,
149149
"metadata": {},
150150
"outputs": [
151151
{
@@ -165,7 +165,6 @@
165165
}
166166
],
167167
"source": [
168-
"import json\n",
169168
"from aiida import load_profile\n",
170169
"from quantum_espresso_workflow import (\n",
171170
" generate_structures,\n",

aiida_to_jobflow_simple.ipynb

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,7 @@
4040
"cell_type": "code",
4141
"execution_count": 3,
4242
"metadata": {},
43-
"outputs": [
44-
{
45-
"name": "stdout",
46-
"output_type": "stream",
47-
"text": [
48-
"outputs [{'identifier': 'workgraph.any', 'name': 'result'}]\n",
49-
"outputs ['x', 'y', 'z']\n",
50-
"outputs [{'identifier': 'workgraph.any', 'name': 'result'}]\n"
51-
]
52-
}
53-
],
43+
"outputs": [],
5444
"source": [
5545
"wg = construct_wg_simple(\n",
5646
" add_x_and_y_func=add_x_and_y, add_x_and_y_and_z_func=add_x_and_y_and_z\n",
@@ -107,19 +97,19 @@
10797
"name": "stdout",
10898
"output_type": "stream",
10999
"text": [
110-
"2025-03-15 11:21:45,872 INFO Started executing jobs locally\n",
111-
"2025-03-15 11:21:46,028 INFO Starting job - add_x_and_y (31bed0f7-49cd-4e63-9a53-8c9679e74dd2)\n",
112-
"2025-03-15 11:21:46,030 INFO Finished job - add_x_and_y (31bed0f7-49cd-4e63-9a53-8c9679e74dd2)\n",
113-
"2025-03-15 11:21:46,031 INFO Starting job - add_x_and_y_and_z (7d74164e-3d5b-40d0-b72b-4fc5434a98e1)\n",
114-
"2025-03-15 11:21:46,033 INFO Finished job - add_x_and_y_and_z (7d74164e-3d5b-40d0-b72b-4fc5434a98e1)\n",
115-
"2025-03-15 11:21:46,033 INFO Finished executing jobs locally\n"
100+
"2025-03-17 09:34:31,257 INFO Started executing jobs locally\n",
101+
"2025-03-17 09:34:31,421 INFO Starting job - add_x_and_y (a59c5b32-bfb1-4696-85c0-5b850df6d774)\n",
102+
"2025-03-17 09:34:31,424 INFO Finished job - add_x_and_y (a59c5b32-bfb1-4696-85c0-5b850df6d774)\n",
103+
"2025-03-17 09:34:31,425 INFO Starting job - add_x_and_y_and_z (d321223d-6de2-42b9-8f75-4675733c78d6)\n",
104+
"2025-03-17 09:34:31,426 INFO Finished job - add_x_and_y_and_z (d321223d-6de2-42b9-8f75-4675733c78d6)\n",
105+
"2025-03-17 09:34:31,427 INFO Finished executing jobs locally\n"
116106
]
117107
},
118108
{
119109
"data": {
120110
"text/plain": [
121-
"{'31bed0f7-49cd-4e63-9a53-8c9679e74dd2': {1: Response(output={'x': 1, 'y': 2, 'z': 3}, detour=None, addition=None, replace=None, stored_data=None, stop_children=False, stop_jobflow=False, job_dir=PosixPath('/home/geiger_j/aiida_projects/adis/git-repos/python-workflow-definition'))},\n",
122-
" '7d74164e-3d5b-40d0-b72b-4fc5434a98e1': {1: Response(output=6, detour=None, addition=None, replace=None, stored_data=None, stop_children=False, stop_jobflow=False, job_dir=PosixPath('/home/geiger_j/aiida_projects/adis/git-repos/python-workflow-definition'))}}"
111+
"{'a59c5b32-bfb1-4696-85c0-5b850df6d774': {1: Response(output={'x': 1, 'y': 2, 'z': 3}, detour=None, addition=None, replace=None, stored_data=None, stop_children=False, stop_jobflow=False, job_dir=PosixPath('/home/geiger_j/aiida_projects/adis/git-repos/python-workflow-definition'))},\n",
112+
" 'd321223d-6de2-42b9-8f75-4675733c78d6': {1: Response(output=6, detour=None, addition=None, replace=None, stored_data=None, stop_children=False, stop_jobflow=False, job_dir=PosixPath('/home/geiger_j/aiida_projects/adis/git-repos/python-workflow-definition'))}}"
123113
]
124114
},
125115
"execution_count": 6,

0 commit comments

Comments
 (0)