Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
18ee6f2
Add universal_simple_to_aiida
GeigerJ2 Mar 14, 2025
df41384
Add universal_qe_to_aiida
GeigerJ2 Mar 14, 2025
ae7a1de
Add CI setup to include AiiDA
GeigerJ2 Mar 14, 2025
ca37531
Changes to quantum_espresso_workflow.py
GeigerJ2 Mar 14, 2025
b7fe9e2
Update .github/workflows/aiida.yml
jan-janssen Mar 14, 2025
375e15e
Merge branch 'main' into aiida-pythonjob
jan-janssen Mar 14, 2025
324a408
Merge branch 'main' into aiida-pythonjob
jan-janssen Mar 14, 2025
a5b5098
Update quantum_espresso_workflow.py
jan-janssen Mar 14, 2025
e3a22b7
Fix `aiida_to_jobflow_simple`
GeigerJ2 Mar 15, 2025
568c7cc
Fix `aiida_to_pyiron_base_simple`
GeigerJ2 Mar 15, 2025
437a661
Add gitignore
GeigerJ2 Mar 15, 2025
02b60ff
Make AiiDA WG construction for QE WF a helper function.
GeigerJ2 Mar 17, 2025
a6e9045
Add aiida_to_jobflow_qe.ipynb. Still some KeyError occurring.
GeigerJ2 Mar 17, 2025
275e9f2
Merge remote-tracking branch 'upstream/main' into aiida-pythonjob
GeigerJ2 Mar 17, 2025
2ecc1f9
Introduce `workflow_json_filename` variable
GeigerJ2 Mar 17, 2025
cc52f6e
Add `jobflow_to_aiida_simple.ipynb`
GeigerJ2 Mar 17, 2025
c1a30dc
Set WG version to latest commit on main.
GeigerJ2 Mar 17, 2025
707694f
Add `verdi presto` profile setup to `aiida.yml`
GeigerJ2 Mar 17, 2025
d14048b
Fix aiida.yml
GeigerJ2 Mar 17, 2025
1d911ae
Add AiiDA profile creation to pyiron and jobflow CI YAML.
GeigerJ2 Mar 17, 2025
5941621
Update jobflow.yml
jan-janssen Mar 17, 2025
ae86016
Update pyiron.yml
jan-janssen Mar 17, 2025
533825e
Fix `nodes` in JSON file created by AiiDA QE WF. Next debug jobflow run.
GeigerJ2 Mar 17, 2025
7b6b3cf
Found bug in WorkGraph. Continue now with task order.
GeigerJ2 Mar 17, 2025
5a8a66c
Tasks are now in same order. Just need to add links.
GeigerJ2 Mar 18, 2025
a55574d
Manual AiiDA WG creation now seems fixed.
GeigerJ2 Mar 18, 2025
9a5585b
Current WG working version
GeigerJ2 Mar 18, 2025
0295262
Adding python files used for being able to enter debugger. Remove onc…
GeigerJ2 Mar 20, 2025
37a6279
Add intermediate JSON files of universal workflow reprs for debugging.
GeigerJ2 Mar 20, 2025
6e33244
Bump WorkGraph to latest and fix a couple of issues
superstar54 Mar 20, 2025
587235f
All AiiDA notebooks should be there.
GeigerJ2 Mar 21, 2025
6be97b8
Set aiida-workgraph version in `environment.yaml`
GeigerJ2 Mar 21, 2025
c144821
Fix load_profile
GeigerJ2 Mar 21, 2025
9c05728
Fix typos in CI YAML files
GeigerJ2 Mar 21, 2025
a1d6e4b
Cleaan up quantum_espresso_workflow.py
GeigerJ2 Mar 21, 2025
2c250a8
Add upterm to connect to Runner to debug AiiDA
GeigerJ2 Mar 21, 2025
df5177c
Merge branch 'main' into aiida-pythonjob
jan-janssen Mar 21, 2025
0d31b77
Merge branch 'main' into aiida-pythonjob
jan-janssen Mar 21, 2025
f4443b4
Update .github/workflows/aiida.yml
jan-janssen Mar 21, 2025
d8bf13d
Update .github/workflows/aiida.yml
jan-janssen Mar 21, 2025
34eb703
Fix load_profile and remove upterm
GeigerJ2 Mar 21, 2025
e82e7e1
Add pyiron_base_to_aiida_simple.ipynb
GeigerJ2 Mar 21, 2025
af7ea44
Start cleaning up repo.
GeigerJ2 Mar 21, 2025
e21cdf0
Only need to fix pyiron_base_to_aiida_qe.ipynb
GeigerJ2 Mar 21, 2025
76cd86a
Adapt `workflow_json_filename`s
GeigerJ2 Mar 21, 2025
701efb7
Latest file versions. Should we use nbstripout?
GeigerJ2 Mar 21, 2025
f0d3faf
Fix universal_qe_to_aiida.ipynb
GeigerJ2 Mar 21, 2025
abfba34
Comment out last cell of pyiron_base_to_aiida_qe.ipynb
GeigerJ2 Mar 21, 2025
56b98a1
Uncomment last cell so that CI doesn't seem successfull even though t…
GeigerJ2 Mar 21, 2025
a5faaaa
Update pyiron_base.py
jan-janssen Mar 21, 2025
09844b3
Update pyiron_base.py
jan-janssen Mar 21, 2025
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
40 changes: 40 additions & 0 deletions .github/workflows/aiida.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: aiida

on:
push:
branches: [ main ]
pull_request:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.12"
environment-file: environment.yml
auto-activate-base: false
- name: Installation and setup
shell: bash -l {0}
run: |
pip install -e adis_tools
pip install -e python_workflow_definition
conda install -c conda-forge jupyter papermill
verdi presto --profile-name adis
- name: Tests
shell: bash -l {0}
run: |
export ESPRESSO_PSEUDO=$(pwd)/espresso/pseudo

papermill universal_simple_to_aiida.ipynb universal_simple_to_aiida_out.ipynb -k "python3"
papermill universal_qe_to_aiida.ipynb universal_qe_to_aiida_out.ipynb -k "python3"

papermill aiida_to_pyiron_base_simple.ipynb aiida_to_pyiron_base_simple_out.ipynb -k "python3"
papermill aiida_to_pyiron_base_qe.ipynb aiida_to_pyiron_base_qe_out.ipynb -k "python3"

papermill aiida_to_jobflow_simple.ipynb aiida_to_jobflow_simple_out.ipynb -k "python3"
papermill aiida_to_jobflow_qe.ipynb aiida_to_jobflow_qe_out.ipynb -k "python3"
15 changes: 12 additions & 3 deletions .github/workflows/jobflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,23 @@ jobs:
python-version: "3.12"
environment-file: environment.yml
auto-activate-base: false
- name: Tests
- name: Installation and setup
shell: bash -l {0}
run: |
pip install -e adis_tools
pip install -e python_workflow_definition
conda install -c conda-forge jupyter papermill
verdi presto --profile-name adis
- name: Tests
shell: bash -l {0}
run: |
export ESPRESSO_PSEUDO=$(pwd)/espresso/pseudo

papermill universal_simple_to_jobflow.ipynb universal_simple_to_jobflow_out.ipynb -k "python3"
papermill jobflow_to_pyiron_base_simple.ipynb jobflow_to_pyiron_base_simple_out.ipynb -k "python3"
papermill universal_qe_to_jobflow.ipynb universal_qe_to_jobflow_out.ipynb -k "python3"
papermill jobflow_to_pyiron_base_qe.ipynb jobflow_to_pyiron_base_qe_out.ipynb -k "python3"

papermill jobflow_to_pyiron_base_simple.ipynb jobflow_to_pyiron_base_simple_out.ipynb -k "python3"
papermill jobflow_to_pyiron_base_qe.ipynb jobflow_to_pyiron_base_qe_out.ipynb -k "python3"

papermill jobflow_to_aiida_simple.ipynb jobflow_to_aiida_simple_out.ipynb -k "python3"
papermill jobflow_to_aiida_qe.ipynb jobflow_to_aiida_qe_out.ipynb -k "python3"
15 changes: 12 additions & 3 deletions .github/workflows/pyiron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,23 @@ jobs:
python-version: "3.12"
environment-file: environment.yml
auto-activate-base: false
- name: Tests
- name: Installation and setup
shell: bash -l {0}
run: |
pip install -e adis_tools
pip install -e python_workflow_definition
conda install -c conda-forge jupyter papermill
verdi presto --profile-name adis
- name: Tests
shell: bash -l {0}
run: |
export ESPRESSO_PSEUDO=$(pwd)/espresso/pseudo

papermill universal_simple_to_pyiron_base.ipynb universal_simple_to_pyiron_base_out.ipynb -k "python3"
papermill pyiron_base_to_jobflow_simple.ipynb pyiron_base_to_jobflow_simple_out.ipynb -k "python3"
papermill universal_qe_to_pyiron_base.ipynb universal_qe_to_pyiron_base_out.ipynb -k "python3"
papermill pyiron_base_to_jobflow_qe.ipynb pyiron_base_to_jobflow_qe_out.ipynb -k "python3"

papermill pyiron_base_to_jobflow_simple.ipynb pyiron_base_to_jobflow_simple_out.ipynb -k "python3"
papermill pyiron_base_to_jobflow_qe.ipynb pyiron_base_to_jobflow_qe_out.ipynb -k "python3"

papermill pyiron_base_to_aiida_simple.ipynb pyiron_base_to_aiida_simple_out.ipynb -k "python3"
papermill pyiron_base_to_aiida_qe.ipynb pyiron_base_to_aiida_qe_out.ipynb -k "python3"
202 changes: 202 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# UV
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
#uv.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
.pdm.toml
.pdm-python
.pdm-build/

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

# Ruff stuff:
.ruff_cache/

# PyPI configuration file
.pypirc

# Files of this package
.vscode/
input_tmp.in
pyiron.log
pyiron_draw.png
python_workflow_definition/src/python_workflow_definition/__pycache__/
test/
mini/
evcurve.png
strain_0/
strain_1/
strain_2/
strain_3/
strain_4/
aiida_to_pyiron_base_qe.json
pyiron_base_to_aiida_qe.json
jobflow_to_pyiron_base_simple.json
aiida_to_pyiron_base_simple.json
jobflow_to_aiida_simple.json
pyiron_base_to_jobflow_simple.json
aiida_to_jobflow_simple.json
jobflow_to_pyiron_base_qe.json
jobflow_to_aiida_qe.json
aiida_to_jobflow_qe.json
pyiron_base_to_aiida_simple.json
pyiron_base_to_jobflow_qe.json

Loading
Loading