Skip to content

Commit b05f237

Browse files
authored
Merge pull request #152 from njzjz/clean
clean codes
2 parents 044c38d + ce6e68a commit b05f237

35 files changed

+48
-349
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from skbuild.cmaker import get_cmake_version
44
from packaging.version import LegacyVersion
55
from os import path, makedirs
6-
import imp,sys
6+
import imp
77

88
readme_file = path.join(path.dirname(path.abspath(__file__)), 'README.md')
99
try:

source/op/_prod_force_grad.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,8 @@
33
Gradients for prod force.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
12-
13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
7+
from deepmd.env import op_grads_module
238

249
@ops.RegisterGradient("ProdForce")
2510
def _prod_force_grad_cc (op, grad):

source/op/_prod_force_se_a_grad.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,8 @@
33
Gradients for prod force.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
12-
13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
7+
from deepmd.env import op_grads_module
238

249
@ops.RegisterGradient("ProdForceSeA")
2510
def _prod_force_se_a_grad_cc (op, grad):

source/op/_prod_force_se_r_grad.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,8 @@
33
Gradients for prod force.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
12-
13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
7+
from deepmd.env import op_grads_module
238

249
@ops.RegisterGradient("ProdForceSeR")
2510
def _prod_force_se_a_grad_cc (op, grad):

source/op/_prod_virial_grad.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,8 @@
33
Gradients for prod virial.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
12-
13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
7+
from deepmd.env import op_grads_module
238

249
@ops.RegisterGradient("ProdVirial")
2510
def _prod_virial_grad_cc (op, grad, grad_atom):

source/op/_prod_virial_se_a_grad.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,8 @@
33
Gradients for prod virial.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
12-
13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
7+
from deepmd.env import op_grads_module
238

249
@ops.RegisterGradient("ProdVirialSeA")
2510
def _prod_virial_se_a_grad_cc (op, grad, grad_atom):

source/op/_prod_virial_se_r_grad.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,8 @@
33
Gradients for prod virial.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
12-
13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
7+
from deepmd.env import op_grads_module
238

249
@ops.RegisterGradient("ProdVirialSeR")
2510
def _prod_virial_se_a_grad_cc (op, grad, grad_atom):

source/op/_soft_min_force_grad.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,9 @@
33
Gradients for soft min force
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
7+
from deepmd.env import op_grads_module
128

13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
239

2410
@ops.RegisterGradient("SoftMinForce")
2511
def _soft_min_force_grad_cc (op, grad):

source/op/_soft_min_virial_grad.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,9 @@
33
Gradients for soft min virial.
44
"""
55

6-
import os
7-
import platform
8-
import tensorflow as tf
96
from tensorflow.python.framework import ops
10-
from tensorflow.python.ops import array_ops
11-
from tensorflow.python.ops import sparse_ops
7+
from deepmd.env import op_grads_module
128

13-
if platform.system() == "Windows":
14-
ext = "dll"
15-
elif platform.system() == "Darwin":
16-
ext = "dylib"
17-
else:
18-
ext = "so"
19-
module_path = os.path.dirname(os.path.realpath(__file__))
20-
module_file = os.path.join(module_path, 'libop_grads.{}'.format(ext))
21-
assert (os.path.isfile(module_file)), 'module op_grads does not exist'
22-
op_grads_module = tf.load_op_library(module_file)
239

2410
@ops.RegisterGradient("SoftMinVirial")
2511
def _soft_min_virial_grad_cc (op, grad, grad_atom):

source/scripts/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
import glob,os,sys,json,argparse
3+
import glob,os,json
44
import numpy as np
55

66

0 commit comments

Comments
 (0)