Skip to content

Commit c833cd1

Browse files
committed
add update numpy dependency
1 parent 2d11596 commit c833cd1

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

pyxtal/optimize/common.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,11 @@ def optimizer(
236236
for i, calculator in enumerate(calculators):
237237
if calculator == "CHARMM":
238238
if i == 0:
239-
calc = CHARMM(struc, tag, steps=[1000], atom_info=atom_info)
240-
calc.run()#clean=False); import sys; sys.exit()
239+
calc = CHARMM(struc, tag, steps=[1000], atom_info=atom_info, debug=True)
240+
calc.run() #clean=False); import sys; sys.exit()
241241
# print("CCCCCC", calc.optimized); import sys; sys.exit()
242+
#print(calc.error)
243+
#print(calc.struc.lattice, calc.error, calc.structure.energy)
242244
if calc.error:
243245
os.chdir(cwd)
244246
return None
@@ -294,7 +296,7 @@ def optimizer(
294296
else:
295297
struc = calc.structure
296298
struc.resort()
297-
299+
print(struc.lattice, calc.structure.energy)
298300
os.chdir(cwd)
299301

300302
# density should not be too small

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ networkx==3.3
3838
# via
3939
# pyxtal (setup.py)
4040
# pymatgen
41-
numpy==1.26.4
41+
numpy==2.0.0
4242
# via
4343
# pyxtal (setup.py)
4444
# ase

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def run(self):
6666
"networkx>=2.3",
6767
"ase>=3.23.0",
6868
"scipy>=1.7.3",
69-
"numpy>=1.26,<2", # prevent the use of numpy2
69+
#"numpy>=1.26,<2", # prevent the use of numpy2
7070
"vasprun-xml>=1.0.4", # prevent the use of numpy2
7171
"importlib_metadata>=1.4",
7272
"typing-extensions>=4.12",

0 commit comments

Comments
 (0)