Skip to content

Commit 823e3f1

Browse files
committed
fix(ci): make pyabacus optional at import time and bump numpy pin
1 parent 14b5f70 commit 823e3f1

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

deepks/model/utils.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
import torch.nn.functional as F
66
from deepks.default import DEVICE, TYPE_NAME
77
from deepks.utils import R2iR
8-
from pyabacus import ModuleBase as base
9-
from pyabacus import ModuleNAO as nao
8+
try:
9+
from pyabacus import ModuleBase as base
10+
from pyabacus import ModuleNAO as nao
11+
except ImportError:
12+
base = None
13+
nao = None
1014
import gc
1115
try:
1216
import deepks
@@ -422,6 +426,8 @@ def nlocalVSidx(types, orb, nlocal):
422426
return nlocal2idx, idx2nlocal
423427

424428
def make_integrator(orb_files, alpha_files):
429+
if base is None or nao is None:
430+
raise ImportError("pyabacus is required for make_integrator()")
425431
orb = nao.RadialCollection()
426432
alpha = nao.RadialCollection()
427433
orb.build(len(orb_files), orb_files)

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ channels:
55
- defaults
66
dependencies:
77
- python=3.12
8-
- numpy=1.26.0
8+
- numpy=1.26.4
99
- scipy
1010
- h5py
1111
- paramiko

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
numpy==1.26.0
1+
numpy==1.26.4
22
scipy
33
h5py
44
paramiko

0 commit comments

Comments
 (0)