-
Notifications
You must be signed in to change notification settings - Fork 23
add manual NumPy patching to mkl_fft
#224
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
42485a7
add manual patching to mkl_fft
ndgrigorian db76eb2
add test for NumPy patching function
ndgrigorian efbd93b
fix patching test
ndgrigorian 23edc89
address feedback about patching
ndgrigorian 14d3705
use thread-local storage for bookkeeping patch calls per thread
ndgrigorian f9ec9cd
drop ContextDecorator as a parent to GlobalPatch
ndgrigorian 25a8f49
add patching to changelog
ndgrigorian 9771697
remove unnecessary shebangs
ndgrigorian a162685
add test for reentrant behavior with mkl_fft context manager
ndgrigorian 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
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
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,184 @@ | ||
| # Copyright (c) 2017, Intel Corporation | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright notice, | ||
| # this list of conditions and the following disclaimer. | ||
| # * Redistributions in binary form must reproduce the above copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # * Neither the name of Intel Corporation nor the names of its contributors | ||
| # may be used to endorse or promote products derived from this software | ||
| # without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE | ||
| # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| """Define functions for patching NumPy with MKL-based NumPy interface.""" | ||
|
|
||
| from contextlib import ContextDecorator | ||
| from threading import Lock, local | ||
|
|
||
| import numpy as np | ||
|
|
||
| import mkl_fft.interfaces.numpy_fft as _nfft | ||
|
|
||
|
|
||
| class _GlobalPatch: | ||
| def __init__(self): | ||
| self._lock = Lock() | ||
| self._patch_count = 0 | ||
| self._restore_dict = {} | ||
| # make _patched_functions a tuple (immutable) | ||
| self._patched_functions = tuple(_nfft.__all__) | ||
| self._tls = local() | ||
|
|
||
| def _register_func(self, name, func): | ||
| if name not in self._patched_functions: | ||
| raise ValueError(f"{name} not an mkl_fft function.") | ||
| if name not in self._restore_dict: | ||
| self._restore_dict[name] = getattr(np.fft, name) | ||
| setattr(np.fft, name, func) | ||
|
|
||
| def _restore_func(self, name, verbose=False): | ||
| if name not in self._patched_functions: | ||
| raise ValueError(f"{name} not an mkl_fft function.") | ||
| try: | ||
| val = self._restore_dict[name] | ||
| except KeyError: | ||
| if verbose: | ||
| print(f"failed to restore {name}") | ||
| return | ||
| else: | ||
| if verbose: | ||
| print(f"found and restoring {name}...") | ||
| setattr(np.fft, name, val) | ||
|
|
||
| def do_patch(self, verbose=False): | ||
| with self._lock: | ||
| local_count = getattr(self._tls, "local_count", 0) | ||
| if self._patch_count == 0: | ||
| if verbose: | ||
| print( | ||
| "Now patching NumPy FFT submodule with mkl_fft NumPy " | ||
| "interface." | ||
| ) | ||
| print( | ||
| "Please direct bug reports to " | ||
| "https://github.com/IntelPython/mkl_fft" | ||
| ) | ||
| for f in self._patched_functions: | ||
| self._register_func(f, getattr(_nfft, f)) | ||
| self._patch_count += 1 | ||
| self._tls.local_count = local_count + 1 | ||
|
|
||
| def do_restore(self, verbose=False): | ||
| with self._lock: | ||
| local_count = getattr(self._tls, "local_count", 0) | ||
| if local_count <= 0: | ||
| if verbose: | ||
| print( | ||
| "Warning: restore_numpy_fft called more times than " | ||
| "patch_numpy_fft in this thread." | ||
| ) | ||
| return | ||
| self._tls.local_count -= 1 | ||
| self._patch_count -= 1 | ||
| if self._patch_count == 0: | ||
| if verbose: | ||
| print("Now restoring original NumPy FFT submodule.") | ||
| for name in tuple(self._restore_dict): | ||
| self._restore_func(name, verbose=verbose) | ||
| self._restore_dict.clear() | ||
ndgrigorian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| def is_patched(self): | ||
| with self._lock: | ||
| return self._patch_count > 0 | ||
|
|
||
|
|
||
| _patch = _GlobalPatch() | ||
|
|
||
|
|
||
| def patch_numpy_fft(verbose=False): | ||
| """ | ||
| Patch NumPy's fft submodule with mkl_fft's numpy_interface. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| verbose : bool, optional | ||
| print message when starting the patching process. | ||
|
|
||
| Notes | ||
| ----- | ||
| This function uses reference-counted semantics. Each call increments a | ||
| global patch counter. Restoration requires a matching number of calls | ||
| between `patch_numpy_fft` and `restore_numpy_fft`. | ||
|
|
||
| In multi-threaded programs, prefer the `mkl_fft` context manager. | ||
|
|
||
| """ | ||
| _patch.do_patch(verbose=verbose) | ||
|
|
||
|
|
||
| def restore_numpy_fft(verbose=False): | ||
| """ | ||
| Restore NumPy's fft submodule to its original implementations. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| verbose : bool, optional | ||
| print message when starting restoration process. | ||
|
|
||
| Notes | ||
| ----- | ||
| This function uses reference-counted semantics. Each call decrements a | ||
| global patch counter. Restoration requires a matching number of calls | ||
| between `patch_numpy_fft` and `restore_numpy_fft`. | ||
|
|
||
| In multi-threaded programs, prefer the `mkl_fft` context manager. | ||
|
|
||
| """ | ||
| _patch.do_restore(verbose=verbose) | ||
|
|
||
|
|
||
| def is_patched(): | ||
| """Return True if NumPy's fft submodule is currently patched by mkl_fft.""" | ||
| return _patch.is_patched() | ||
|
|
||
|
|
||
| class mkl_fft(ContextDecorator): | ||
ndgrigorian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| """ | ||
| Context manager and decorator to temporarily patch NumPy fft submodule | ||
| with MKL-based implementations. | ||
|
|
||
| Examples | ||
| -------- | ||
| >>> import mkl_fft | ||
| >>> mkl_fft.is_patched() | ||
| # False | ||
|
|
||
| >>> with mkl_fft.mkl_fft(): # Enable mkl_fft in Numpy | ||
| >>> print(mkl_fft.is_patched()) | ||
| # True | ||
|
|
||
| >>> mkl_fft.is_patched() | ||
| # False | ||
|
|
||
| """ | ||
|
|
||
| def __enter__(self): | ||
| patch_numpy_fft() | ||
| return self | ||
|
|
||
| def __exit__(self, *exc): | ||
| restore_numpy_fft() | ||
| return False | ||
ndgrigorian marked this conversation as resolved.
Show resolved
Hide resolved
ndgrigorian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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
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
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
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
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,80 @@ | ||
| # Copyright (c) 2017, Intel Corporation | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright notice, | ||
| # this list of conditions and the following disclaimer. | ||
| # * Redistributions in binary form must reproduce the above copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # * Neither the name of Intel Corporation nor the names of its contributors | ||
| # may be used to endorse or promote products derived from this software | ||
| # without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE | ||
| # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| import numpy as np | ||
|
|
||
| import mkl_fft | ||
| import mkl_fft.interfaces.numpy_fft as _nfft | ||
|
|
||
|
|
||
| def test_patch(): | ||
| old_module = np.fft.fft.__module__ | ||
| assert not mkl_fft.is_patched() | ||
|
|
||
| mkl_fft.patch_numpy_fft() # Enable mkl_fft in Numpy | ||
| assert mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == _nfft.fft.__module__ | ||
|
|
||
| mkl_fft.restore_numpy_fft() # Disable mkl_fft in Numpy | ||
ndgrigorian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| assert not mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == old_module | ||
|
|
||
|
|
||
| def test_patch_redundant_patching(): | ||
| old_module = np.fft.fft.__module__ | ||
| assert not mkl_fft.is_patched() | ||
|
|
||
| mkl_fft.patch_numpy_fft() | ||
| mkl_fft.patch_numpy_fft() | ||
|
|
||
| assert mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == _nfft.fft.__module__ | ||
|
|
||
| mkl_fft.restore_numpy_fft() | ||
| assert mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == _nfft.fft.__module__ | ||
|
|
||
| mkl_fft.restore_numpy_fft() | ||
| assert not mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == old_module | ||
|
|
||
|
|
||
| def test_patch_reentrant(): | ||
| old_module = np.fft.fft.__module__ | ||
| assert not mkl_fft.is_patched() | ||
|
|
||
| with mkl_fft.mkl_fft(): | ||
| assert mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == _nfft.fft.__module__ | ||
|
|
||
| with mkl_fft.mkl_fft(): | ||
| assert mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == _nfft.fft.__module__ | ||
|
|
||
| assert mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == _nfft.fft.__module__ | ||
|
|
||
| assert not mkl_fft.is_patched() | ||
| assert np.fft.fft.__module__ == old_module | ||
Oops, something went wrong.
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.