Skip to content

Commit eea72bf

Browse files
committed
refactor(io): switch core reader imports to canonical exports
1 parent 8ef08e6 commit eea72bf

4 files changed

Lines changed: 32 additions & 3 deletions

File tree

deepks/core/ml/eval/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
sys.path.append(os.path.dirname(os.path.realpath(__file__)) + "/../../")
1010
from deepks.default import DEVICE
1111
from deepks.core.ml.models.corrnet import CorrNet
12-
from deepks.io.readers.group_reader import GroupReader
12+
from deepks.io.readers import GroupReader
1313
from deepks.utils import load_yaml, load_dirs, check_list
1414

1515

deepks/core/ml/train/train.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
sys.path.append(os.path.dirname(os.path.realpath(__file__)) + "/../../")
1111
from deepks.default import DEVICE
1212
from deepks.core.ml.models.corrnet import CorrNet
13-
from deepks.io.readers.group_reader import GroupReader
13+
from deepks.io.readers import GroupReader
1414
from deepks.utils import load_dirs, load_elem_table
1515
from deepks.core.ml.utils import preprocess, fit_elem_const, make_loss
1616
from deepks.core.ml.eval.evaluator import Evaluator, NatomLossList

deepks/model/reader.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
"""Compatibility shim for the legacy model reader module."""
22

3-
from deepks.io.readers.group_reader import * # noqa: F401,F403
3+
from deepks.io.readers import GroupReader, Reader, SimpleReader
4+
5+
__all__ = ["Reader", "GroupReader", "SimpleReader"]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
"""
2+
Reader exports compatibility coverage.
3+
4+
Tests:
5+
- `test_reader_export_identity`
6+
"""
7+
8+
from deepks.io.readers import GroupReader as GroupReaderPkg
9+
from deepks.io.readers import Reader as ReaderPkg
10+
from deepks.io.readers import SimpleReader as SimpleReaderPkg
11+
from deepks.io.readers.group_reader import GroupReader as GroupReaderLegacy
12+
from deepks.io.readers.group_reader import Reader as ReaderLegacy
13+
from deepks.io.readers.group_reader import SimpleReader as SimpleReaderLegacy
14+
from deepks.model.reader import GroupReader as GroupReaderModelShim
15+
from deepks.model.reader import Reader as ReaderModelShim
16+
from deepks.model.reader import SimpleReader as SimpleReaderModelShim
17+
18+
19+
def test_reader_export_identity():
20+
"""Canonical exports and compatibility shims should point to identical class objects."""
21+
assert ReaderPkg is ReaderLegacy
22+
assert GroupReaderPkg is GroupReaderLegacy
23+
assert SimpleReaderPkg is SimpleReaderLegacy
24+
25+
assert ReaderPkg is ReaderModelShim
26+
assert GroupReaderPkg is GroupReaderModelShim
27+
assert SimpleReaderPkg is SimpleReaderModelShim

0 commit comments

Comments
 (0)