Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
db4d485
try using parallel pSA calculation
lispandfound Nov 27, 2025
b68b8c9
feat: rust parallel psa and rotd calculation
lispandfound Dec 3, 2025
6363f04
fix(rotd): optimise rust rotd calculations
lispandfound Dec 4, 2025
5cd66e9
refactor(ims): update pSA python interface
lispandfound Dec 4, 2025
b9d3d0e
fix(im_calculation): rearrange waveform for the expected values in im…
lispandfound Dec 4, 2025
b6354be
fix(ims): ensure contiguous array memory layout
lispandfound Dec 4, 2025
b5a055e
fix(psa): choose the linear solver less aggressively
lispandfound Dec 4, 2025
f257619
fix: update tests for new pSA results
lispandfound Dec 4, 2025
3eb1c9e
deps: add tqdm dependency
lispandfound Dec 4, 2025
4806e48
tests: simplify dataframe comparison checks
lispandfound Dec 4, 2025
53f3cfc
fix: clippy warnings
lispandfound Dec 4, 2025
510020b
ci: consolidate CI actions with new rust actions
lispandfound Dec 4, 2025
df138a7
ci: remove empty deptry action (now in lint.yml)
lispandfound Dec 4, 2025
f774557
fix(ims): use correct component for comp_90_response
lispandfound Dec 4, 2025
981a534
fix: ruff fixes
lispandfound Dec 4, 2025
afadae5
tests(psa): fix slicing iteration for waveform test
lispandfound Dec 4, 2025
e19afd6
fix(ims): use the correct period for vertical component calculations
lispandfound Dec 4, 2025
ca441f4
fix: type checking fixes
lispandfound Dec 4, 2025
50a8574
ci: add missing tests file
lispandfound Dec 4, 2025
8568198
ci: bump testing python version
lispandfound Dec 4, 2025
3e01d3f
add test cases
joelridden Dec 4, 2025
53d9cca
docs(ims): add numpydoc check
lispandfound Dec 4, 2025
837fbe7
docs: add missing module docstrings
lispandfound Dec 4, 2025
f511b3c
Merge branch 'parallel_psa' of github.com:ucgmsim/IM_calculation into…
lispandfound Dec 4, 2025
585f725
refactor(ims): remove newmark psa numba function
lispandfound Dec 5, 2025
78ab923
fix(im_calculation): correctly reorder array
lispandfound Dec 5, 2025
60b24ce
deps: add rich testing dependency
lispandfound Dec 5, 2025
b50e2e8
tests(ims): update type signatures for test code
lispandfound Dec 5, 2025
7a9f87d
tests(ims): improve IM benchmark testing
lispandfound Dec 5, 2025
1bf4517
tests(ims): remove newmark numba tests
lispandfound Dec 5, 2025
9b9a89e
tests(ims): only check FAS in tests when we can compute it
lispandfound Dec 5, 2025
126ea1b
tests(ims): remove several IM benchmark tests
lispandfound Dec 5, 2025
a259e94
ci: install fd-find for finding files to apply numpydoc to
lispandfound Dec 5, 2025
43eaa99
ci: install pip dependencies with uv
lispandfound Dec 5, 2025
2fdee27
fix: add __init__.py to scripts
lispandfound Dec 5, 2025
d186260
fix: use qcore-utils
lispandfound Dec 11, 2025
912cd65
fix: pin to python < 3.14
lispandfound Dec 11, 2025
4b127d4
fix(ims): incorrect AnyStr type variable passed
lispandfound Dec 11, 2025
a9a9e7c
Merge branch 'master' into parallel_psa
lispandfound Dec 11, 2025
544b917
fix: ignore N999 for IM package name
lispandfound Dec 11, 2025
4452859
ci(test): run pytest with `uv run`
lispandfound Dec 11, 2025
6409da6
Merge branch 'master' into parallel_psa
lispandfound Dec 18, 2025
57bd78d
refactor(psa): use concrete f64 type instead of f32
lispandfound Jan 8, 2026
3432315
deps: commit cargo dependencies
lispandfound Jan 8, 2026
c9918c2
build: prune rust src
lispandfound Jan 8, 2026
bfb5f75
Revert "build: prune rust src"
lispandfound Jan 8, 2026
3a2e7a6
build: prune .gitignore
lispandfound Jan 8, 2026
010bb4a
ci: uv lock for reproducible CI
lispandfound Jan 8, 2026
284ecc3
fix: type checking fixes
lispandfound Jan 8, 2026
c445b29
docs(psa): correct invalid docstring
lispandfound Jan 8, 2026
1c6fa3e
update benchmark tests
joelridden Jan 8, 2026
1afbe70
refactor(ims): remove unused rotate_components function
lispandfound Jan 8, 2026
458f0a9
Merge branch 'parallel_psa' of github.com:ucgmsim/IM_calculation into…
lispandfound Jan 8, 2026
4be6b5e
feat: add rust calculations for other intensity measures
lispandfound Jan 8, 2026
061cbe9
tests(arias_intensity): add arias intensity tests
lispandfound Jan 9, 2026
41504cd
tests(psa): use approx for testing
lispandfound Jan 9, 2026
234430e
tests(rotd): remove unnecessary f64
lispandfound Jan 9, 2026
1b29a46
tests(cav): add cav tests
lispandfound Jan 9, 2026
3344782
fix(trapz): accumulate trapezium rule properly
lispandfound Jan 9, 2026
b69d1ce
refactor(trapz): remove trapz_one
lispandfound Jan 9, 2026
6ada8a4
fix(trapz): shift accumulation over one element
lispandfound Jan 9, 2026
f77252e
fix(trapz): `trapz_with_fun` should accumulate over columns not rows
lispandfound Jan 9, 2026
e30b3bf
refactor(trapz): remove trapz functions
lispandfound Jan 9, 2026
61c34e8
docs(trapz): document trapezium rule module
lispandfound Jan 9, 2026
d4e8693
tests(trapz): add test suite for trapezium rule module
lispandfound Jan 9, 2026
8805d58
deps(rust): add rust dev dependencies
lispandfound Jan 9, 2026
2debee1
Revert "tests(rotd): remove unnecessary f64"
lispandfound Jan 9, 2026
800ea5e
refactor(ims): remove numba code
lispandfound Jan 9, 2026
d3faeff
refactor(ims): introduce WaveformArray type
lispandfound Jan 9, 2026
7980879
refactor(ims): use type-aliases for arrays
lispandfound Jan 9, 2026
9fa0ba9
build: uv should know to rebuild when rust changes
lispandfound Jan 9, 2026
58af66f
refactor(ims): float32 -> float64
lispandfound Jan 9, 2026
f5ea0c3
refactor(ims): swap CAV order
lispandfound Jan 9, 2026
730ee3e
fix(ims): use correct functions for _cav
lispandfound Jan 9, 2026
fc8f024
feat(ims): support parallel cav
lispandfound Jan 9, 2026
f5e155d
feat(rotd): add single-threaded rotd calculation codepath
lispandfound Jan 9, 2026
a737b9a
feat(significant_duration): add rust significant duration calculation…
lispandfound Jan 9, 2026
a4b31f0
feat(lib): add _rotd python wrapper
lispandfound Jan 9, 2026
ac7ea0e
refactor(ims): use rust for all ims
lispandfound Jan 9, 2026
3ffbfa2
deps: remove numexpr dependency
lispandfound Jan 9, 2026
60bb99b
refactor(significant_duration): optimise significant duration calcula…
lispandfound Jan 11, 2026
cc214b4
refactor(ims): cores should be integer
lispandfound Jan 11, 2026
79905e1
docs(ims): update docstrings to reflect changes
lispandfound Jan 11, 2026
3c04ccc
fix: various fixes for passing tests
lispandfound Jan 11, 2026
6e40e3d
ci: remove numexpr from lock file
lispandfound Jan 11, 2026
547fc81
Merge branch 'rust_calculations' of github.com:ucgmsim/IM_calculation…
lispandfound Jan 11, 2026
e98cb6c
tests: fix tests for new waveform layout
lispandfound Jan 12, 2026
ec535ce
feat: add benchmarks for intensity measure calculations
lispandfound Jan 12, 2026
adfb8f9
fix(utils): remove doctests
lispandfound Jan 12, 2026
3e7504d
refactor(benches): simplify benchmarks
lispandfound Jan 12, 2026
0f3d3a8
feat(ims): swap to sequential run when stations < 1000
lispandfound Jan 13, 2026
64e29ee
refactor(trapz): avoid unnecessary copies
lispandfound Jan 13, 2026
71a3bea
tests(ims): fix FAS tests
lispandfound Jan 13, 2026
da0bdc0
tests: shift and remove overlapping tests
lispandfound Jan 13, 2026
036412d
tests: modernise benchmark test generation
lispandfound Jan 13, 2026
7429375
fix(trapz): apply clippy fixes
lispandfound Jan 15, 2026
9bab745
tests: fix column check test
lispandfound Jan 15, 2026
54cd9db
Merge branch 'master' into rust_calculations
lispandfound Jan 15, 2026
0626206
tests: revert im calc benchmark
lispandfound Jan 18, 2026
d4ce2cc
tests: reintroduce PGD column
lispandfound Jan 18, 2026
8a83d17
tests: fix nyquist frequency im benchmark file
lispandfound Jan 18, 2026
ccb9400
tests: correct labels for rows
lispandfound Jan 18, 2026
8efd1f0
fix(ims): PGD should integrate along time axis
lispandfound Jan 18, 2026
3db166c
refactor(ims): remove stations multi-core threshold
lispandfound Jan 18, 2026
19ebfc4
refactor: address PR naming comments
lispandfound Feb 10, 2026
ae8149e
fix(ims): add coverage exclusions
lispandfound Feb 11, 2026
d5117bf
build: do not exclude 3.14
lispandfound Feb 11, 2026
2fc14eb
docs: update documentation errors
lispandfound Feb 11, 2026
05261d4
docs(arias_intensity): update inconsistent documentation
lispandfound Feb 11, 2026
819eba3
Merge branch 'rust_calculations' of github.com:ucgmsim/IM_calculation…
lispandfound Feb 11, 2026
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
14 changes: 0 additions & 14 deletions .github/workflows/deptry.yml

This file was deleted.

77 changes: 77 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Lint
on: [pull_request]

env:
RUSTFLAGS: "-Dwarnings"

jobs:
ruff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: chartboost/ruff-action@v1

clippy_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Run Clippy
run: cargo clippy --all-targets --all-features

typecheck:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v5

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.13"

- name: Install uv
uses: astral-sh/setup-uv@v5
with:
enable-cache: true

- name: Install project with types
run: uv sync --all-extras --dev

- name: Run type checking with ty
run: uv run ty check

dependencies:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
# Install uv
- uses: astral-sh/setup-uv@v4
# Install project
- run: uv sync --dev --all-extras
# Run deptry to check that all dependencies are present.
- run: uv run deptry . -ddg test,dev,types

numpydoc:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5

- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: fd-find
version: 1.0

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.13"

- name: Install dependencies
run: |
pip install numpydoc

- name: Run Numpydoc Lint
run: |
fdfind . IM/ -E "__init__.py" --extension py | xargs numpydoc lint
8 changes: 0 additions & 8 deletions .github/workflows/ruff.yml

This file was deleted.

26 changes: 16 additions & 10 deletions .github/workflows/pytest.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pytest Check
name: Tests

on: [pull_request]

Expand All @@ -8,20 +8,19 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e ".[test]"
python-version: 3.13
- uses: astral-sh/setup-uv@v4
# Install project
- run: uv sync --dev --all-extras

- name: Run tests
run: |
pytest --cov=IM --cov-report=html tests
uv run pytest --cov=IM --cov-report=html tests

- name: Upload coverage data
uses: actions/upload-artifact@v4
Expand All @@ -37,12 +36,12 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.13

- name: Install dependencies
run: |
Expand Down Expand Up @@ -71,3 +70,10 @@ jobs:
path: htmlcov

if: ${{ failure() }}

cargo_test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Run cargo test
run: cargo test
32 changes: 0 additions & 32 deletions .github/workflows/types.yml

This file was deleted.

Loading