Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
647b30b
Update ScS2 parity data
nedtaylor Mar 5, 2025
a608e16
Update parity plot
nedtaylor Mar 5, 2025
2eecb7c
Add data
nedtaylor Mar 5, 2025
4167924
Update documentation
nedtaylor Mar 6, 2025
6576016
Update version
nedtaylor Mar 6, 2025
fbeb075
Update version numbers
nedtaylor Mar 6, 2025
590d9f0
Fix headers
nedtaylor Mar 6, 2025
60a8a32
Add parallel compilation option
nedtaylor Apr 4, 2025
0c67a86
Update issue template
nedtaylor Apr 4, 2025
4fc8b88
Parallelise viability checker
nedtaylor Apr 4, 2025
8e76a6e
Optimise void method
nedtaylor Apr 4, 2025
13c1fc4
Improve placement method handling
nedtaylor Apr 4, 2025
15b8d69
Update hooks
nedtaylor Apr 4, 2025
73f888f
Fix formatting
nedtaylor Apr 4, 2025
6327f8d
Update raffle.py
alexanderholman Apr 3, 2025
f559d5e
Fix warning printing
nedtaylor Apr 4, 2025
a75766a
Fix gridpoint reference
nedtaylor Apr 4, 2025
2ef60ac
Update fomat action
nedtaylor Apr 4, 2025
33d7a5f
Make parallel build default
nedtaylor Apr 4, 2025
de190a4
Add example requirements
nedtaylor Apr 4, 2025
9d6933f
Fix tests
nedtaylor Apr 4, 2025
b84ebad
Fix parallel dependency for fpm
nedtaylor Apr 4, 2025
f9aeefe
Remove deprecated script
nedtaylor Apr 4, 2025
b05a47a
Optimise viability grid creation
nedtaylor Apr 4, 2025
597ac08
Update parallel install
nedtaylor Apr 4, 2025
4f648fd
Temporarily remove format checker action
nedtaylor Apr 4, 2025
ce3b4cd
Fix python unit tests
nedtaylor Apr 4, 2025
c18a5d9
Fix extension search
nedtaylor Apr 4, 2025
78e53fe
Fix python unit tests
nedtaylor Apr 4, 2025
b63a52b
Fix unit tests for linux
nedtaylor Apr 4, 2025
a94e6d2
Delete action
nedtaylor Apr 5, 2025
d3ebeed
Reference parallel in install guide
nedtaylor Apr 5, 2025
f71cfc4
Update version number
nedtaylor Apr 5, 2025
d32a89c
Fix formatting
nedtaylor Apr 5, 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
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ body:
options:
- label: fpm
- label: cmake
- label: pip
- type: textarea
id: additional
attributes:
Expand Down
26 changes: 16 additions & 10 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
steps:
- name: checkout repo
uses: actions/checkout@v4

- name: actions-setup-python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
Expand All @@ -58,25 +58,29 @@ jobs:
uses: jwlawson/actions-setup-cmake@v2.0.1
with:
cmake-version: '3.24.x'

- uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.fortran-compiler }}
version: ${{ matrix.toolchain.fc-version }}

- name: Install gcovr
run: |
pip --version
pip install gcovr

- name: Install python dependencies
run: |
python --version
python -m pip install pip-tools
python -m piptools compile -o requirements.txt pyproject.toml --all-build-deps
python -m pip install -r requirements.txt

- name: Install OpenMP runtime (Linux only)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libgomp1

- name: Compile
run: |
cmake --version
Expand All @@ -92,7 +96,7 @@ jobs:
run: |
${{ env.FC }} --version
ctest

build-and-test-cmake-release:
environment:
name: github-pages
Expand All @@ -115,7 +119,7 @@ jobs:
steps:
- name: checkout repo
uses: actions/checkout@v4

- name: actions-setup-python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
Expand All @@ -125,20 +129,24 @@ jobs:
uses: jwlawson/actions-setup-cmake@v2.0.1
with:
cmake-version: '3.24.x'

- uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.fortran-compiler }}
version: ${{ matrix.toolchain.fc-version }}

- name: Install python dependencies
run: |
python --version
python -m pip install pip-tools
python -m piptools compile -o requirements.txt pyproject.toml --all-build-deps
python -m pip install -r requirements.txt

- name: Install OpenMP runtime (Linux only)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libgomp1

- name: Compile
run: |
cmake --version
Expand All @@ -154,5 +162,3 @@ jobs:
run: |
${{ env.FC }} --version
ctest


60 changes: 0 additions & 60 deletions .github/workflows/formatting.yml

This file was deleted.

20 changes: 14 additions & 6 deletions .github/workflows/fpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:
concurrency:
group: fpm
cancel-in-progress: false

jobs:
build-and-test-fpm-debug:
environment:
Expand Down Expand Up @@ -53,12 +53,16 @@ jobs:
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}

- uses: fortran-lang/setup-fpm@v5
id: setup-fpm
with:
fpm-version: "v0.10.0"


- name: Install OpenMP runtime (Linux only)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libgomp1

- name: Compile
run: |
${{ env.FC }} --version
Expand Down Expand Up @@ -91,18 +95,22 @@ jobs:
steps:
- name: checkout repo
uses: actions/checkout@v4

- uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}

- uses: fortran-lang/setup-fpm@v5
id: setup-fpm
with:
fpm-version: "v0.10.0"

- name: Install OpenMP runtime (Linux only)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libgomp1

- name: Compile
run: |
${{ env.FC }} --version
Expand All @@ -111,4 +119,4 @@ jobs:
- name: Test
run: |
${{ env.FC }} --version
fpm test --profile release --compiler ${{ env.FC }}
fpm test --profile release --compiler ${{ env.FC }}
7 changes: 7 additions & 0 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@ jobs:
compiler: ${{ matrix.toolchain.fortran-compiler }}
version: ${{ matrix.toolchain.fc-version }}

- name: Install OpenMP runtime (Linux only)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libgomp1

- name: Install OpenMP runtime (macOS only)
if: runner.os == 'macOS'
run: brew install libomp

- name: Install python dependencies
run: |
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:
cancel-in-progress: false

jobs:
build-and-test-python-debug:
build-and-test-python:
environment:
name: github-pages
name: Build and test in debug mode
Expand All @@ -38,18 +38,13 @@ jobs:
os: [ubuntu-latest, macos-latest]
python-version: [ "3.11", "3.12", "3.13" ]
toolchain:
- {fortran-compiler: gcc, fc-version: 13}
# - {compiler: intel, version: '2024.1'}
# - {compiler: intel-classic, version: '2021.10'}
# exclude:
# - os: macos-latest
# toolchain: {compiler: intel, version: '2024.1'}
# - os: macos-latest
# toolchain: {compiler: intel-classic, version: '2021.10'}
- {fortran-compiler: gcc, fc-version: 14}
build_type: [Serial, Release]

steps:
- name: checkout repo
uses: actions/checkout@v4

- name: actions-setup-python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
Expand All @@ -59,13 +54,13 @@ jobs:
uses: jwlawson/actions-setup-cmake@v2.0.1
with:
cmake-version: '3.24.x'

- uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.fortran-compiler }}
version: ${{ matrix.toolchain.fc-version }}

- name: Install python dependencies
run: |
python --version
Expand All @@ -75,14 +70,19 @@ jobs:
python -m piptools compile -o requirements.txt pyproject.toml --all-build-deps
python -m pip install -r requirements.txt

- name: Compile
- name: Install OpenMP runtime (Linux only)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libgomp1

- name: Build and install Python package with CMAKE_BUILD_TYPE=${{ matrix.build_type }}
env:
CMAKE_BUILD_TYPE: ${{ matrix.build_type }}
run: |
cmake --version
python --version
${{ env.FC }} --version
python -m pip install '.[ase]'
echo "Building with CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
python -m pip install ".[ase]" --config-settings="cmake.define.CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"

- name: Test
- name: Run tests
run: |
${{ env.FC }} --version
python -m pytest
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/nedtaylor/fortran-format-hooks
rev: 5400a80b67ac12f16dd70d1200d6c5a06dbf8855
rev: e757850a2edabf0c06326ea18acc8125d12054ec
hooks:
- id: check-fortran-indentation
args: [--line-length=80, --ignore-directories 'src/wrapper']
Loading
Loading