Skip to content

Commit 218588b

Browse files
committed
update to v0.2.1
1 parent 9bbf570 commit 218588b

File tree

4 files changed

+26
-25
lines changed

4 files changed

+26
-25
lines changed

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
author = 'Qiang Zhu, Howard Yanxon, David Zagaceta'
2424

2525
# The short X.Y version
26-
version = '0.2.0'
26+
version = '0.2.1'
2727
# The full version, including alpha/beta/rc tags
28-
release = 'Feb 2022'
28+
release = 'May 2022'
2929

3030

3131
# -- General configuration ---------------------------------------------------

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PyXtal_FF
22
======================================
33
The aim of PyXtalFF project is to provide an automated computational infrastructure to train the interatomic potentials for inorganic periodic systems from high-end quantum mechanical calculations.
44

5-
The current version is ``0.2.0`` at `GitHub <https://github.com/qzhu2017/pyxtal_ff>`_.
5+
The current version is ``0.2.1`` at `GitHub <https://github.com/qzhu2017/pyxtal_ff>`_.
66

77
Expect updates upon request by `Qiang Zhu\'s group <https://qzhu2017.github.io>`_ at University of Nevada Las Vegas.
88

pyxtal_ff/models/neuralnetwork.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -616,31 +616,32 @@ def calculate_properties(self, descriptor, bforce=True, bstress=False):
616616
scale = (1 - 0) / (_drange[:, 1] - _drange[:, 0])
617617

618618
e = np.where(np.array(descriptor['elements'])==element)[0]
619-
ee0 = np.where(descriptor['seq'][:,0]==e[0])[0][0]
620-
ee1 = np.where(descriptor['seq'][:,0]==e[-1])[0][-1]
619+
if len(e) > 0:
620+
ee0 = np.where(descriptor['seq'][:,0]==e[0])[0][0]
621+
ee1 = np.where(descriptor['seq'][:,0]==e[-1])[0][-1]
621622

622-
i_size = list(descriptor['elements']).count(element) #number of atoms in type i
623-
m_size = ee1-ee0+1# number of pairs
623+
i_size = list(descriptor['elements']).count(element) #number of atoms in type i
624+
m_size = ee1-ee0+1# number of pairs
624625

625-
d['x'][element] = torch.zeros([i_size, no_of_descriptors])
626-
d['dxdr'][element] = torch.zeros([m_size, no_of_descriptors, 3], dtype=torch.float64) ####
627-
d['rdxdr'][element] = torch.zeros([i_size, no_of_descriptors, 6])
626+
d['x'][element] = torch.zeros([i_size, no_of_descriptors])
627+
d['dxdr'][element] = torch.zeros([m_size, no_of_descriptors, 3], dtype=torch.float64) ####
628+
d['rdxdr'][element] = torch.zeros([i_size, no_of_descriptors, 6])
628629

629-
if e.size > 0:
630-
des = 0 + np.einsum('j,ij->ij', scale, (descriptor['x'][e[0]:e[-1]+1] - np.expand_dims(_drange[:, 0], 0)))
631-
desp = np.einsum('j,ijk->ijk', scale, descriptor['dxdr'][ee0:ee1+1])
632-
dess = np.einsum('j,ijk->ijk', scale, descriptor['rdxdr'][e[0]:e[-1]+1])
633-
634-
d['x'][element] += torch.from_numpy(des)
635-
d['seq'][element] = deepcopy(descriptor['seq'][ee0:ee1+1])
630+
if e.size > 0:
631+
des = 0 + np.einsum('j,ij->ij', scale, (descriptor['x'][e[0]:e[-1]+1] - np.expand_dims(_drange[:, 0], 0)))
632+
desp = np.einsum('j,ijk->ijk', scale, descriptor['dxdr'][ee0:ee1+1])
633+
dess = np.einsum('j,ijk->ijk', scale, descriptor['rdxdr'][e[0]:e[-1]+1])
634+
635+
d['x'][element] += torch.from_numpy(des)
636+
d['seq'][element] = deepcopy(descriptor['seq'][ee0:ee1+1])
636637

637-
if self.unit == 'eV':
638-
d['dxdr'][element] += torch.from_numpy(desp)
639-
d['rdxdr'][element] += torch.from_numpy(dess)
640-
else:
641-
d['dxdr'][element] += torch.from_numpy(0.529177 * desp)
642-
d['rdxdr'][element] += torch.from_numpy(0.529177**3*desp)
643-
d['seq'][element][:, 0] -= min(d['seq'][element][:, 0]) #adjust the initial position
638+
if self.unit == 'eV':
639+
d['dxdr'][element] += torch.from_numpy(desp)
640+
d['rdxdr'][element] += torch.from_numpy(dess)
641+
else:
642+
d['dxdr'][element] += torch.from_numpy(0.529177 * desp)
643+
d['rdxdr'][element] += torch.from_numpy(0.529177**3*desp)
644+
d['seq'][element][:, 0] -= min(d['seq'][element][:, 0]) #adjust the initial position
644645

645646
x = d['x']
646647
if bforce:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
'scipy>=1.6.1',
4040
'matplotlib>=2.0.0',
4141
'ase>=3.20.1',
42-
'torch>=1.1.0',
42+
'torch>=1.10.2',
4343
'phonopy==2.3.2', #tmp fix
4444
'spglib>=1.12.1',
4545
'monty>=3.0.2',

0 commit comments

Comments
 (0)