Merge remote-tracking branch 'upstream/master' into feat-pt-expt-deepspin

Author: Han Wang

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
         exclude: ^source/3rdparty
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.8
+    rev: v0.15.9
     hooks:
       - id: ruff
         args: ["--fix"]

deepmd/dpmodel/utils/__init__.py

@@ -6,6 +6,14 @@
     AtomExcludeMask,
     PairExcludeMask,
 )
+from .lmdb_data import (
+    DistributedSameNlocBatchSampler,
+    LmdbDataReader,
+    LmdbTestData,
+    SameNlocBatchSampler,
+    is_lmdb,
+    make_neighbor_stat_data,
+)
 from .network import (
     EmbeddingNet,
     FittingNet,
@@ -44,13 +52,17 @@
 
 __all__ = [
     "AtomExcludeMask",
+    "DistributedSameNlocBatchSampler",
     "EmbeddingNet",
     "EnvMat",
     "FittingNet",
+    "LmdbDataReader",
+    "LmdbTestData",
     "NativeLayer",
     "NativeNet",
     "NetworkCollection",
     "PairExcludeMask",
+    "SameNlocBatchSampler",
     "aggregate",
     "build_multiple_neighbor_list",
     "build_neighbor_list",
@@ -59,10 +71,12 @@
     "get_graph_index",
     "get_multiple_nlist_key",
     "inter2phys",
+    "is_lmdb",
     "load_dp_model",
     "make_embedding_network",
     "make_fitting_network",
     "make_multilayer_network",
+    "make_neighbor_stat_data",
     "nlist_distinguish_types",
     "normalize_coord",
     "phys2inter",