Skip to content

Commit c42bb65

Browse files
tlunetbrownbaerchenpancetta
authored
qmat switch (#445)
* Some fixes for new numpy version * Fix for Allen-Cahn project * Update environment.yml * TL: added qmat dependency in env files * TL: corrected pyproject.toml * TL: full qmat integration * TL: adapted numpy2 changes * TL: of course ... * TL: fixing tests ... * TL: fix projects dependencies * TL: still adapting to numpy2 * TL: still fixing project tests ... * TL: minor change to trigger CI * TL: opening Pandora's box ... * TL: ty linting * TL: adding a note * TL: corrected bugged reference data for parallelSDC_reloaded * TL: trying stuff for parallelSDC tests * TL: investigating * TL: adapted to new qmat version * TL: let's stop beeing stupid * TL: ... starting now * TL: checking hypothesis * TL: RK sweeper based on qmat * TL: oh, thanks black ! * TL: partial solution for parallelSDC tests * TL: back to partial working version * TL: trying another idea * TL: trying this * TL: no covering for (problematic) ploting function for parallelSDC * TL: finalized qmat-switch with correct naming for core sub-packages * TL: omg * TL: minimum version for qmat dependencies * TL: minor fixes * Update collocation.py * Update collocation.py * Update sweeper.py * TL: minor corrections following @pancetta's comments --------- Co-authored-by: Thomas Baumann <[email protected]> Co-authored-by: Robert Speck <[email protected]>
1 parent 53248af commit c42bb65

File tree

300 files changed

+1921
-3118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+1921
-3118
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ Others are specific conventions chosen for the pySDC library, that may follow Py
99
Finally, while `pySDC` provides many base functionalities that implement classical flavors of SDC, it also allows problem-specific applications through Object-Oriented Programming (OOP) and the implementation of custom inherited classes.
1010
This follows a specific OOP framework, you can look at the page on [custom implementations](./docs/contrib/04_custom_implementations.md) for more details. Additional guideline are also given on how to [document the code](./docs/contrib/05_documenting_code.md) in `pySDC`.
1111

12+
> 📣 Some core components (collocation matrix, $Q-\Delta$ coefficients, Lagrange barycentric interpolation)
13+
> are implemented and developed in the [`qmat` companion package](https://github.com/Parallel-in-Time/qmat).
14+
> Checkout its own [contributing guide](https://qmat.readthedocs.io/en/latest/contributing.html)
15+
> to add any new coefficient / feature on this part.
16+
1217
1. [GitHub Forks and Pull Requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/getting-started/about-collaborative-development-models)
1318
2. [Pull Requests Recommendations](./docs/contrib/01_pull_requests.md)
1419
3. [Continuous Integration](./docs/contrib/02_continuous_integration.md)

docs/contrib/06_new_project.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ channels:
2525
- defaults
2626
dependencies:
2727
- numpy
28+
- pip
29+
- pip:
30+
- qmat>=0.1.8
2831
```
2932
3033
The list of dependencies can be extended as needed.

etc/environment-base.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ dependencies:
1111
- sympy>=1.0
1212
- numba>=0.35
1313
- dill>=0.2.6
14+
- pip
15+
- pip:
16+
- qmat>=0.1.8

etc/environment-cupy.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ dependencies:
1010
- matplotlib>=3.0
1111
- dill>=0.2.6
1212
- cupy
13+
- pip
14+
- pip:
15+
- qmat>=0.1.8

etc/environment-fenics.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ dependencies:
1111
- dill>=0.2.6
1212
- fenics>=2019.1.0
1313
- mpi4py<=3.1.4
14+
- pip
15+
- pip:
16+
- qmat>=0.1.8

etc/environment-mpi4py.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ dependencies:
1212
- mpich
1313
- mpi4py-fft>=2.0.2
1414
- mpi4py>=3.0.0
15+
- pip
16+
- pip:
17+
- qmat>=0.1.8

etc/environment-petsc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ dependencies:
1212
- mpich
1313
- petsc4py<3.20
1414
- mpi4py>=3.0.0
15+
- pip
16+
- pip:
17+
- qmat>=0.1.8

etc/environment-postprocess.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ dependencies:
1818
- sphinxemoji
1919
- m2r2
2020
- genbadge[all]
21+
- qmat>=0.1.8

etc/environment-pytorch.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ dependencies:
1313
- dill
1414
- mpich
1515
- mpi4py>=3.0.0
16+
- pip
17+
- pip:
18+
- qmat>=0.1.8

pySDC/core/Collocation.py

Lines changed: 0 additions & 237 deletions
This file was deleted.

0 commit comments

Comments
 (0)