-
Notifications
You must be signed in to change notification settings - Fork 629
feat(lammps): load installed backends dynamically #5707
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
Open
njzjz
wants to merge
1
commit into
deepmodeling:master
Choose a base branch
from
njzjz:feat/lammps-dynamic-backends
base: master
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.
+168
−50
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| # SPDX-License-Identifier: LGPL-3.0-or-later | ||
| import os | ||
| import platform | ||
| from types import ( | ||
| SimpleNamespace, | ||
| ) | ||
|
|
||
| import pytest | ||
|
|
||
| if platform.system() not in {"Linux", "Darwin"}: | ||
| pytest.skip("deepmd.lmp supports Linux and Darwin", allow_module_level=True) | ||
|
|
||
| from deepmd import ( | ||
| lmp, | ||
| ) | ||
|
|
||
|
|
||
| def _missing_module(name: str) -> ModuleNotFoundError: | ||
| return ModuleNotFoundError(f"No module named {name!r}", name=name) | ||
|
|
||
|
|
||
| def test_tensorflow_library_paths_skip_missing_tensorflow(monkeypatch): | ||
| def fake_import_module(module_name): | ||
| if module_name == "deepmd.tf.env": | ||
| raise _missing_module("tensorflow") | ||
| raise AssertionError(module_name) | ||
|
|
||
| monkeypatch.setattr(lmp, "import_module", fake_import_module) | ||
|
|
||
| assert lmp._get_tensorflow_library_paths() == ([], []) | ||
|
|
||
|
|
||
| def test_tensorflow_library_paths_include_libpython_for_old_tensorflow(monkeypatch): | ||
| tf_env = SimpleNamespace( | ||
| TF_VERSION="2.11.0", | ||
| tf=SimpleNamespace( | ||
| sysconfig=SimpleNamespace(get_lib=lambda: "/opt/tensorflow") | ||
| ), | ||
| ) | ||
| find_libpython = SimpleNamespace(find_libpython=lambda: "/opt/libpython.so") | ||
|
|
||
| def fake_import_module(module_name): | ||
| if module_name == "deepmd.tf.env": | ||
| return tf_env | ||
| if module_name == "find_libpython": | ||
| return find_libpython | ||
| raise AssertionError(module_name) | ||
|
|
||
| monkeypatch.setattr(lmp, "import_module", fake_import_module) | ||
|
|
||
| assert lmp._get_tensorflow_library_paths() == ( | ||
| ["/opt/tensorflow", "/opt/tensorflow/python"], | ||
| ["/opt/libpython.so"], | ||
| ) | ||
|
|
||
|
|
||
| def test_pytorch_library_paths_skip_missing_torch(monkeypatch): | ||
| def fake_import_module(module_name): | ||
| if module_name == "torch": | ||
| raise _missing_module("torch") | ||
| raise AssertionError(module_name) | ||
|
|
||
| monkeypatch.setattr(lmp, "import_module", fake_import_module) | ||
|
|
||
| assert lmp._get_pytorch_library_paths() == [] | ||
|
|
||
|
|
||
| def test_configure_lammps_environment_keeps_op_dir_without_backends(monkeypatch): | ||
| monkeypatch.delenv(lmp.lib_env, raising=False) | ||
| monkeypatch.delenv(lmp.preload_env, raising=False) | ||
| monkeypatch.setattr(lmp, "_get_tensorflow_library_paths", lambda: ([], [])) | ||
| monkeypatch.setattr(lmp, "_get_pytorch_library_paths", lambda: []) | ||
| monkeypatch.setattr(lmp, "get_library_path", lambda module, filename: []) | ||
|
|
||
| lmp._configure_lammps_environment() | ||
|
|
||
| assert os.environ[lmp.lib_env] == lmp.op_dir | ||
| assert os.environ[lmp.preload_env] == "" | ||
|
|
||
|
|
||
| def test_configure_lammps_environment_adds_installed_backend_paths(monkeypatch): | ||
| monkeypatch.setenv(lmp.lib_env, "/existing/lib") | ||
| monkeypatch.setenv(lmp.preload_env, "/existing/preload") | ||
| monkeypatch.setattr( | ||
| lmp, | ||
| "_get_tensorflow_library_paths", | ||
| lambda: (["/tensorflow", "/tensorflow/python"], ["/libpython.so"]), | ||
| ) | ||
| monkeypatch.setattr(lmp, "_get_pytorch_library_paths", lambda: ["/torch/lib"]) | ||
| monkeypatch.setattr(lmp, "get_library_path", lambda module, filename: []) | ||
|
|
||
| lmp._configure_lammps_environment() | ||
|
|
||
| assert os.environ[lmp.lib_env] == ":".join( | ||
| [ | ||
| "/existing/lib", | ||
| "/tensorflow", | ||
| "/tensorflow/python", | ||
| "/torch/lib", | ||
| lmp.op_dir, | ||
| ] | ||
| ) | ||
| assert os.environ[lmp.preload_env] == "/existing/preload:/libpython.so" |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Non-blocking (test coverage):
source/tests/test_lmp.pyis a welcome addition, but a few reachable branches of these new helpers aren't exercised._get_tensorflow_library_pathsis only tested with TF2.11.0, so the TF >= 2.12 path (no libpython preload) and thefind_libpython() is Nonecase are untested;_get_pytorch_library_paths's success path (torch installed ->[torch/lib]) is never run because the_configure_lammps_environmenttests monkeypatch the helper and the only direct torch test covers the missing-torch case; and theexc.name != "tensorflow"/"torch"re-raise branches (which intentionally propagate unrelated import errors) have no coverage. A couple of small cases would close these.