ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert changes

Browse Source
This commit is contained in:
Jan Janßen
2019-02-12 08:07:28 +01:00
committed by GitHub
parent 277f8356b1
commit e7c1ca1fca
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/install.py
View File

@ -22,11 +22,6 @@ else: pydir = ""
# copy lammps.py to pydir if it exists # copy lammps.py to pydir if it exists
# if pydir not specified, install in site-packages via distutils setup() # if pydir not specified, install in site-packages via distutils setup()
if 'liblammps.dylib' in os.listdir('../src/'):
lib_ext = ".dylib"
else:
lib_ext = ".so"
if pydir: if pydir:
if not os.path.isdir(pydir): if not os.path.isdir(pydir):
print( "ERROR: pydir %s does not exist" % pydir) print( "ERROR: pydir %s does not exist" % pydir)
@ -41,7 +36,7 @@ if pydir:
str = "cp ../src/liblammps.so %s" % pydir str = "cp ../src/liblammps.so %s" % pydir
print(str) print(str)
try: try:
shutil.copyfile("../src/liblammps" + lib_ext, os.path.join(pydir,"liblammps" + lib_ext) ) shutil.copyfile("../src/liblammps.so", os.path.join(pydir,"liblammps.so") )
except shutil.Error: except shutil.Error:
pass # source and destination are identical pass # source and destination are identical
sys.exit() sys.exit()
@ -70,7 +65,7 @@ try:
url = "http://lammps.sandia.gov", url = "http://lammps.sandia.gov",
description = "LAMMPS molecular dynamics library", description = "LAMMPS molecular dynamics library",
py_modules = ["lammps"], py_modules = ["lammps"],
data_files = [(get_python_lib(), ["../src/liblammps" + lib_ext])]) data_files = [(get_python_lib(), ["../src/liblammps.so"])])
except: except:
tryuser=True tryuser=True
print ("Installation into global site-packages dir failed.\nTrying user site dir %s now." % site.USER_SITE) print ("Installation into global site-packages dir failed.\nTrying user site dir %s now." % site.USER_SITE)
@ -86,9 +81,8 @@ if tryuser:
url = "http://lammps.sandia.gov", url = "http://lammps.sandia.gov",
description = "LAMMPS molecular dynamics library", description = "LAMMPS molecular dynamics library",
py_modules = ["lammps"], py_modules = ["lammps"],
data_files = [(site.USER_SITE, ["../src/liblammps" + lib_ext])]) data_files = [(site.USER_SITE, ["../src/liblammps.so"])])
except: except:
print("Installation into user site package dir failed.\nGo to ../python and install manually.") print("Installation into user site package dir failed.\nGo to ../python and install manually.")