Skip to content

Commit 7a31fdb

Browse files
hlyang1992Han Wang
authored andcommitted
Select the appropriate shared library suffix based on the operating system
1 parent 6b9c29e commit 7a31fdb

16 files changed

+137
-25
lines changed

source/op/_prod_force_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_prod_force_se_a_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_prod_force_se_r_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_prod_virial_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_prod_virial_se_a_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_prod_virial_se_r_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_soft_min_force_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/op/_soft_min_virial_grad.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"""
55

66
import os
7+
import platform
78
import tensorflow as tf
89
from tensorflow.python.framework import ops
910
from tensorflow.python.ops import array_ops
1011
from tensorflow.python.ops import sparse_ops
1112

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

source/scripts/freeze.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# freeze.py :
44
# see https://blog.metaflow.fr/tensorflow-how-to-freeze-a-model-and-serve-it-with-a-python-api-d4f3596b3adc
55

6+
import platform
67
import os, argparse, json
78
import sys
89

@@ -13,9 +14,15 @@
1314
from tensorflow.python.framework import ops
1415

1516
# load force module
17+
if platform.system() == "Windows":
18+
ext = "dll"
19+
elif platform.system() == "Darwin":
20+
ext = "dylib"
21+
else:
22+
ext = "so"
1623
module_path = os.path.dirname(os.path.realpath(__file__)) + "/../"
17-
assert (os.path.isfile (module_path + "deepmd/libop_abi.so" )), "force module does not exist"
18-
op_module = tf.load_op_library(module_path + "deepmd/libop_abi.so")
24+
assert (os.path.isfile (module_path + "deepmd/libop_abi.{}".format(ext) )), "force module does not exist"
25+
op_module = tf.load_op_library(module_path + "deepmd/libop_abi.{}".format(ext))
1926

2027
# load grad of force module
2128
sys.path.append (module_path )

source/train/DeepEval.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
#!/usr/bin/env python3
2-
2+
import platform
33
import os,sys
44
import numpy as np
55

66
from deepmd.env import tf
77

88
from tensorflow.python.framework import ops
9+
10+
if platform.system() == "Windows":
11+
ext = "dll"
12+
elif platform.system() == "Darwin":
13+
ext = "dylib"
14+
else:
15+
ext = "so"
916
module_path = os.path.dirname(os.path.realpath(__file__))
10-
assert (os.path.isfile (os.path.join(module_path, "libop_abi.so"))), "op module does not exist"
11-
op_module = tf.load_op_library(os.path.join(module_path, "libop_abi.so"))
17+
assert (os.path.isfile (os.path.join(module_path, "libop_abi.{}".format(ext)))), "op module does not exist"
18+
op_module = tf.load_op_library(os.path.join(module_path, "libop_abi.{}".format(ext)))
1219

1320
class DeepEval():
1421
"""

0 commit comments

Comments
 (0)