-
Notifications
You must be signed in to change notification settings - Fork 1
WIP: Namespaced AppContext
#16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
JHopeCollins
wants to merge
22
commits into
main
Choose a base branch
from
JHopeCollins/appctx
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
8d680b1
appctx
JHopeCollins 321fefa
Merge branch 'main' into JHopeCollins/appctx
JHopeCollins 54cd6db
AppContext in __init__
JHopeCollins 4604f3d
Merge branch 'main' into JHopeCollins/appctx
JHopeCollins c7e366a
Hide AppContext internal keys from user
JHopeCollins 913eb56
updates
JHopeCollins cfe9954
appctx docstrings
JHopeCollins ec9c900
test appctx
JHopeCollins 0a4ba8f
tidy up appctx keygen
JHopeCollins 8104028
review comments - hide key from user completely
JHopeCollins d231b36
move import to top of test file
JHopeCollins 36587cc
Update petsctools/appctx.py
JHopeCollins 3c1b6cf
appctx: hide key_from_option from user.
JHopeCollins 5975b82
global appctx stack
JHopeCollins d51cd25
numpy import inside test
JHopeCollins 0c54caa
Merge branch 'main' into JHopeCollins/appctx
JHopeCollins 3e7928b
use petsc.vec.norm rather than numpy.allclose for test
JHopeCollins 660475a
trailing whitespace
JHopeCollins e042462
attach the appctx directly to the OptionsManager
JHopeCollins ffb03ef
Separate global AppContext and scoped AppContextManager
JHopeCollins f893063
AppContext()[option] = value?
JHopeCollins 65f166a
make the AppContextKey a helpfully named string
JHopeCollins File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| import itertools | ||
| from functools import cached_property | ||
| from petsctools.exceptions import PetscToolsAppctxException | ||
|
|
||
|
|
||
| class AppContextKey(int): | ||
| """A custom key type for AppContext.""" | ||
| pass | ||
|
|
||
|
|
||
| class AppContext: | ||
|
connorjward marked this conversation as resolved.
|
||
| """ | ||
| Class for passing non-primitive types to PETSc python contexts. | ||
|
|
||
| The PETSc.Options dictionary can only contain primitive types (str, | ||
| int, float, bool) as values. The AppContext allows other types to be | ||
| passed into PETSc solvers while still making use of the namespacing | ||
| provided by options prefixing. | ||
|
|
||
| A typical usage is shown below. In this example we have a python PC | ||
| type `MyCustomPC` which requires additional data in the form of a | ||
| `MyCustomData` instance. | ||
| We can add the data to the AppContext with the `appctx.add` method, | ||
| but we need to tell `MyCustomPC` how to retrieve that data. The | ||
| `add` method returns a key which is a valid PETSc.Options entry, | ||
| i.e. a primitive type instance. This key is passed via PETSc.Options | ||
| with the 'custompc_somedata' prefix. | ||
|
|
||
| The data can be retrieved in two ways. | ||
| 1) Giving the AppContext the (fully prefixed) option for the key, | ||
| in which case the AppContext will internally fetch the key from | ||
| the PETSc.Options and return the data. | ||
| 2) By manually fetching the AppContext key from the PETSc.Options, | ||
| then retrieving the data from the `AppContext` using that key. | ||
|
|
||
| .. code-block:: python3 | ||
|
|
||
| appctx = AppContext() | ||
| some_data = MyCustomData(5) | ||
|
|
||
| opts = OptionsManager( | ||
| parameters={ | ||
| 'pc_type': 'python', | ||
| 'pc_python_type': 'MyCustomPC', | ||
| 'custompc_somedata': appctx.add(some_data)}, | ||
| options_prefix='solver') | ||
|
|
||
| with opts.inserted_options(): | ||
| # 1) Let AppContext fetch key. | ||
| # Also shows providing default data. | ||
| default = MyCustomData(10) | ||
| data = appctx.get('solver_custompc_somedata', default) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. split this docstring.
JHopeCollins marked this conversation as resolved.
|
||
|
|
||
| # 2) Fetch key directly. | ||
| key = PETSc.Options()['solver_custompc_somedata'] | ||
| data = appctx[key] | ||
| """ | ||
|
|
||
| def __init__(self): | ||
| self._count = itertools.count() | ||
| self._data = {} | ||
|
|
||
| def _keygen(self): | ||
| """ | ||
| Generate a new unique internal key. | ||
|
|
||
| This should not called directly by the user. | ||
| """ | ||
| return AppContextKey(next(self._count)) | ||
|
|
||
| def _to_key(self, option): | ||
| """ | ||
| Return the internal key for the PETSc option `option`. | ||
| If `option` is already an AppContextKey, `option` is returned. | ||
|
|
||
| This should not called directly by the user. | ||
| """ | ||
| if isinstance(option, int): | ||
| return AppContextKey(option) | ||
| else: | ||
| return self.getKey(option) | ||
|
|
||
| @cached_property | ||
| def _missing_key(self): | ||
| """ | ||
| Key instance representing a missing AppContext entry. | ||
|
|
||
| PETSc requires the default value for Options.getObj() | ||
| to be the correct type, so we need a dummy key. | ||
|
|
||
| This should not called directly by the user. | ||
| """ | ||
| return self._keygen() | ||
|
JHopeCollins marked this conversation as resolved.
Outdated
|
||
|
|
||
| def getKey(self, option): | ||
|
JHopeCollins marked this conversation as resolved.
Outdated
|
||
| """ | ||
| Return the internal key for the PETSc option `option`. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| option : str | ||
| The PETSc option. | ||
|
|
||
| Returns | ||
| ------- | ||
| key : AppContextKey | ||
| An internal key corresponding to `option`. | ||
| """ | ||
| key = self.options_object.getInt(option, self._missing_key) | ||
| return AppContextKey(key) | ||
|
|
||
| def add(self, val): | ||
| """ | ||
| Add a value to the application context and | ||
| return the autogenerated key for that value. | ||
|
|
||
| The autogenerated key should be used as the value for the | ||
| corresponding entry in the solver_parameters dictionary. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| val : Any | ||
| The value to add to the AppContext. | ||
|
|
||
| Returns | ||
| ------- | ||
| key : AppContextKey | ||
| The key to put into the PETSc Options dictionary. | ||
| """ | ||
| key = self._keygen() | ||
| self._data[key] = val | ||
| return key | ||
|
|
||
| def __getitem__(self, option): | ||
| """ | ||
| Return the value with the key saved in `PETSc.Options()[option]`. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| option : Union[str, AppContextKey] | ||
| The PETSc option or key. | ||
|
|
||
| Returns | ||
| ------- | ||
| val : Any | ||
| The value for the key `option`. | ||
|
|
||
| Raises | ||
| ------ | ||
| PetscToolsAppctxException | ||
| If the AppContext does contain a value for `option`. | ||
| """ | ||
| try: | ||
| return self._data[self._to_key(option)] | ||
| except KeyError: | ||
| raise PetscToolsAppctxException( | ||
| f"AppContext does not have an entry for {option}") | ||
|
|
||
| def get(self, option, default=None): | ||
| """ | ||
| Return the value with the key saved in PETSc.Options()[option], | ||
| or if it does not exist return default. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| option : Union[str, AppContextKey] | ||
| The PETSc option or key. | ||
| default : Any | ||
| The value to return if `option` is not in the AppContext | ||
|
|
||
| Returns | ||
| ------- | ||
| val : Any | ||
| The value for the key `option`, or `default`. | ||
| """ | ||
| key = self._to_key(option) | ||
|
JHopeCollins marked this conversation as resolved.
Outdated
|
||
| if key == self._missing_key: | ||
| return default | ||
| return self._data[key] | ||
|
|
||
| @cached_property | ||
| def options_object(self): | ||
| """A PETSc.Options instance.""" | ||
| from petsc4py import PETSc | ||
| return PETSc.Options() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import pytest | ||
| import petsctools | ||
|
|
||
|
|
||
| @pytest.mark.skipnopetsc4py | ||
| def test_appctx(): | ||
| PETSc = petsctools.init() | ||
|
|
||
| appctx = petsctools.AppContext() | ||
|
|
||
| param = 10 | ||
| key = appctx.add(param) | ||
| options = PETSc.Options() | ||
| options['solver_param'] = key | ||
|
|
||
| # Can we get the key string back? | ||
| assert str(appctx.getKey('solver_param')) == options['solver_param'] | ||
|
|
||
| # Can we access param via the prefixed option? | ||
| prm = appctx.get('solver_param') | ||
| assert prm is param | ||
|
|
||
| prm = appctx['solver_param'] | ||
| assert prm is param | ||
|
|
||
| # Can we access param via the key? | ||
| prm = appctx.get(key, 20) | ||
| assert prm is param | ||
|
|
||
| prm = appctx[key] | ||
| assert prm is param | ||
|
|
||
| # Can we set a default value? | ||
| default = 20 | ||
| prm = appctx.get('param', default) | ||
| assert prm is default | ||
|
|
||
| # Will an invalid key raise an error | ||
| from petsctools.appctx import PetscToolsAppctxException | ||
|
JHopeCollins marked this conversation as resolved.
Outdated
|
||
| with pytest.raises(PetscToolsAppctxException): | ||
| appctx['param'] | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.