Skip to content

Commit a893acf

Browse files
committed
merge aiida notebooks
1 parent 9fea1de commit a893acf

File tree

7 files changed

+4
-9
lines changed

7 files changed

+4
-9
lines changed

.github/workflows/aiida.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,5 @@ jobs:
3333
papermill universal_simple_to_aiida.ipynb universal_simple_to_aiida_out.ipynb -k "python3"
3434
papermill universal_qe_to_aiida.ipynb universal_qe_to_aiida_out.ipynb -k "python3"
3535
36-
papermill aiida_to_pyiron_base_simple.ipynb aiida_to_pyiron_base_simple_out.ipynb -k "python3"
37-
papermill aiida_to_pyiron_base_qe.ipynb aiida_to_pyiron_base_qe_out.ipynb -k "python3"
38-
39-
papermill aiida_to_jobflow_simple.ipynb aiida_to_jobflow_simple_out.ipynb -k "python3"
40-
papermill aiida_to_jobflow_qe.ipynb aiida_to_jobflow_qe_out.ipynb -k "python3"
36+
papermill aiida_simple.ipynb aiida_simple_out.ipynb -k "python3"
37+
papermill aiida_qe.ipynb aiida_qe_out.ipynb -k "python3"

aiida_qe.ipynb

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

aiida_simple.ipynb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"metadata":{"kernelspec":{"display_name":"Python 3 (ipykernel)","language":"python","name":"python3"},"language_info":{"codemirror_mode":{"name":"ipython","version":3},"file_extension":".py","mimetype":"text/x-python","name":"python","nbconvert_exporter":"python","pygments_lexer":"ipython3","version":"3.12.8"}},"nbformat_minor":4,"nbformat":4,"cells":[{"cell_type":"markdown","source":"# Simple Workflow with aiida","metadata":{}},{"cell_type":"markdown","source":"## Define workflow with aiida","metadata":{}},{"cell_type":"code","source":"from python_workflow_definition.aiida import write_workflow_json\n\nfrom aiida_workgraph import WorkGraph, task\nfrom aiida import load_profile\nload_profile()\n\nworkflow_json_filename = \"aiida_to_jobflow_simple.json\"","metadata":{"trusted":false},"outputs":[{"name":"stderr","output_type":"stream","text":"/srv/conda/envs/notebook/lib/python3.12/site-packages/paramiko/pkey.py:82: CryptographyDeprecationWarning: TripleDES has been moved to cryptography.hazmat.decrepit.ciphers.algorithms.TripleDES and will be removed from cryptography.hazmat.primitives.ciphers.algorithms in 48.0.0.\n \"cipher\": algorithms.TripleDES,\n/srv/conda/envs/notebook/lib/python3.12/site-packages/paramiko/transport.py:253: CryptographyDeprecationWarning: TripleDES has been moved to cryptography.hazmat.decrepit.ciphers.algorithms.TripleDES and will be removed from cryptography.hazmat.primitives.ciphers.algorithms in 48.0.0.\n \"class\": algorithms.TripleDES,\n"}],"execution_count":1},{"cell_type":"code","source":"from simple_workflow import (\n add_x_and_y as _add_x_and_y, \n add_x_and_y_and_z as _add_x_and_y_and_z,\n)","metadata":{"trusted":false},"outputs":[],"execution_count":2},{"cell_type":"code","source":"@task.pythonjob()\ndef pickle_node(value):\n \"\"\"Handle data nodes\"\"\"\n return value","metadata":{"trusted":false},"outputs":[],"execution_count":3},{"cell_type":"code","source":"add_x_and_y = task.pythonjob(outputs=[\"x\", \"y\", \"z\"])(_add_x_and_y)\nadd_x_and_y_and_z = task.pythonjob()(_add_x_and_y_and_z)","metadata":{"trusted":false},"outputs":[],"execution_count":4},{"cell_type":"code","source":"# TODO: Create inputs rather than tasks out of data nodes\nwg = WorkGraph(\"wg-simple\")","metadata":{"trusted":false},"outputs":[],"execution_count":5},{"cell_type":"code","source":"helper_task1 = wg.add_task(pickle_node, name=\"x\", value=1)\nhelper_task2 = wg.add_task(pickle_node, name=\"y\", value=2)","metadata":{"trusted":false},"outputs":[],"execution_count":6},{"cell_type":"code","source":"add_x_and_y_task = wg.add_task(\n add_x_and_y,\n name=\"add_x_and_y\",\n x=helper_task1.outputs.result,\n y=helper_task2.outputs.result,\n)","metadata":{"trusted":false},"outputs":[],"execution_count":7},{"cell_type":"code","source":"add_x_and_y_and_z_task = wg.add_task(\n add_x_and_y_and_z,\n name=\"add_x_and_y_and_z\",\n x=add_x_and_y_task.outputs.x,\n y=add_x_and_y_task.outputs.y,\n z=add_x_and_y_task.outputs.z,\n)","metadata":{"trusted":false},"outputs":[],"execution_count":8},{"cell_type":"code","source":"write_workflow_json(wg=wg, file_name=workflow_json_filename)","metadata":{"trusted":false},"outputs":[{"data":{"text/plain":"{'nodes': {'0': 1,\n '1': 2,\n '2': 'simple_workflow.add_x_and_y',\n '3': 'simple_workflow.add_x_and_y_and_z'},\n 'edges': [{'target': 2,\n 'targetHandle': 'x',\n 'source': 0,\n 'sourceHandle': None},\n {'target': 2, 'targetHandle': 'y', 'source': 1, 'sourceHandle': None},\n {'target': 3, 'targetHandle': 'x', 'source': 2, 'sourceHandle': 'x'},\n {'target': 3, 'targetHandle': 'y', 'source': 2, 'sourceHandle': 'y'},\n {'target': 3, 'targetHandle': 'z', 'source': 2, 'sourceHandle': 'z'}]}"},"execution_count":9,"metadata":{},"output_type":"execute_result"}],"execution_count":9},{"cell_type":"code","source":"!cat {workflow_json_filename}","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"markdown","source":"## Load Workflow with jobflow","metadata":{}},{"cell_type":"code","source":"from python_workflow_definition.jobflow import load_workflow_json","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"code","source":"from jobflow.managers.local import run_locally","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"code","source":"flow = load_workflow_json(file_name=workflow_json_filename)","metadata":{"trusted":false},"outputs":[],"execution_count":10},{"cell_type":"code","source":"result = run_locally(flow)\nresult","metadata":{"trusted":false},"outputs":[{"name":"stdout","output_type":"stream","text":"2025-03-21 20:45:40,878 INFO Started executing jobs locally\n2025-03-21 20:45:41,115 INFO Starting job - add_x_and_y (ef28440e-7d32-49d3-85f5-121da0fdf65f)\n2025-03-21 20:45:41,117 INFO Finished job - add_x_and_y (ef28440e-7d32-49d3-85f5-121da0fdf65f)\n2025-03-21 20:45:41,118 INFO Starting job - add_x_and_y_and_z (c0da46a8-a430-4d88-adb6-7d5b36b8fe52)\n2025-03-21 20:45:41,119 INFO Finished job - add_x_and_y_and_z (c0da46a8-a430-4d88-adb6-7d5b36b8fe52)\n2025-03-21 20:45:41,120 INFO Finished executing jobs locally\n"},{"data":{"text/plain":"{'ef28440e-7d32-49d3-85f5-121da0fdf65f': {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/jovyan'))},\n 'c0da46a8-a430-4d88-adb6-7d5b36b8fe52': {1: Response(output=6, detour=None, addition=None, replace=None, stored_data=None, stop_children=False, stop_jobflow=False, job_dir=PosixPath('/home/jovyan'))}}"},"execution_count":11,"metadata":{},"output_type":"execute_result"}],"execution_count":11},{"cell_type":"markdown","source":"## Load Workflow with pyiron_base","metadata":{}},{"cell_type":"code","source":"from pyiron_base import Project","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"code","source":"from python_workflow_definition.pyiron_base import load_workflow_json","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"code","source":"pr = Project(\"test\")\npr.remove_jobs(recursive=True, silently=True)","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"code","source":"delayed_object = load_workflow_json(project=pr, file_name=workflow_json_filename)\ndelayed_object.draw()","metadata":{"trusted":false},"outputs":[],"execution_count":null},{"cell_type":"code","source":"delayed_object.pull()","metadata":{"trusted":false},"outputs":[],"execution_count":null}]}

aiida_to_jobflow_qe.ipynb

Lines changed: 0 additions & 1 deletion
This file was deleted.

aiida_to_jobflow_simple.ipynb

Lines changed: 0 additions & 1 deletion
This file was deleted.

aiida_to_pyiron_base_qe.ipynb

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)