improve portability by using shutil.copyfile, os.path.join, and make -C (b7ab017a) · Commits · 郑智淋 / lammps

lib/message/Install.py

+13 −16

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		# used to automate the steps described in the README file in this dir

		from __future__ import print_function
		import sys,os,re,subprocess
		import sys,os,re,subprocess,shutil
		sys.path.append('..')
		from install_helpers import get_cpus,fullpath
		from argparse import ArgumentParser
		@@ -50,16 +50,16 @@ zmqflag = args.zmq
		# copy appropriate Makefile.lammps.* to Makefile.lammps

		print("Building CSlib ...")
		srcdir = fullpath("./cslib/src")
		srcdir = fullpath(os.path.join("cslib","src"))

		if mpiflag and zmqflag:
		cmd = "cd %s; make lib_parallel" % srcdir
		cmd = "make -C %s lib_parallel" % srcdir
		elif mpiflag and not zmqflag:
		cmd = "cd %s; make lib_parallel zmq=no" % srcdir
		cmd = "make -C %s lib_parallel zmq=no" % srcdir
		elif not mpiflag and zmqflag:
		cmd = "cd %s; make lib_serial" % srcdir
		cmd = "make -C %s lib_serial" % srcdir
		elif not mpiflag and not zmqflag:
		cmd = "cd %s; make lib_serial zmq=no" % srcdir
		cmd = "make -C %s lib_serial zmq=no" % srcdir

		print(cmd)
		try:
		@@ -69,14 +69,11 @@ except subprocess.CalledProcessError as e:
		print("Make failed with:\n %s" % e.output.decode('UTF-8'))
		sys.exit(1)

		if mpiflag: cmd = "cd %s; cp libcsmpi.a libmessage.a" % srcdir
		else: cmd = "cd %s; cp libcsnompi.a libmessage.a" % srcdir
		print(cmd)
		txt = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
		print(txt.decode('UTF-8'))
		slb=os.path.join(srcdir,"libcsnompi.a")
		if mpiflag: slb = os.path.join(srcdir,"libcsmpi.a")
		shutil.copyfile(slb,os.path.join(srcdir,"libmessage.a"))

		if zmqflag: cmd = "cp Makefile.lammps.zmq Makefile.lammps"
		else: cmd = "cp Makefile.lammps.nozmq Makefile.lammps"
		print(cmd)
		txt = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
		print(txt.decode('UTF-8'))
		smk="Makefile.lammps.nozmq"
		if zmqflag: smk="Makefile.lammps.zmq"
		shutil.copyfile(smk,"Makefile.lammps")
		print("Using %s for Makefile.lammps" % smk)

lib/mscg/Install.py

+22 −14

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ pgroup.add_argument("-p", "--path",
		help="specify folder of existing MSCG installation")
		parser.add_argument("-v", "--version", default=version, choices=checksums.keys(),
		help="set version of MSCG to download and build (default: %s)" % version)
		parser.add_argument("-m", "--machine", default=machine, choices=['g++_simple','intel_simple','lapack', 'mac'],
		parser.add_argument("-m", "--machine", default=machine, choices=['mpi','serial','g++_simple','intel_simple','lapack', 'mac'],
		help="set machine suffix specifies which src/Make/Makefile.suffix to use. (default: %s)" % machine)

		args = parser.parse_args()
		@@ -66,7 +66,7 @@ mscgver = args.version
		# settings

		url = "https://github.com/uchicago-voth/MSCG-release/archive/%s.tar.gz" % mscgver
		tarfile = "MS-CG-%s.tar.gz" % mscgver
		tarname = "MS-CG-%s.tar.gz" % mscgver
		tardir = "MSCG-release-%s" % mscgver

		homepath = fullpath('.')
		@@ -81,32 +81,40 @@ if pathflag:

		if buildflag:
		print("Downloading MS-CG ...")
		geturl(url,os.path.join(homepath,tarfile))
		tarname = os.path.join(homepath,tarname)
		geturl(url,tarname)

		print("Unpacking MS-CG tarfile ...")
		if os.path.exists("%s/%s" % (homepath,tardir)):
		shutil.rmtree("%s/%s" % (homepath,tardir))
		cmd = 'cd "%s"; tar -xzvf %s' % (homepath,tarfile)
		subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
		os.remove("%s/%s" % (homepath,tarfile))

		if os.path.exists(os.path.join(homepath,tardir)):
		shutil.rmtree(os.path.join(homepath,tardir))

		if tarfile.is_tarfile(tarname):
		tgz = tarfile.open(tarname)
		tgz.extractall(path=homepath)
		os.remove(tarname)
		else:
		sys.exit("File %s is not a supported archive",tarname)

		if os.path.basename(homedir) != tardir:
		if os.path.exists(homedir):
		shutil.rmtree(homedir)
		os.rename("%s/%s" % (homepath,tardir),homedir)
		os.rename(os.path.join(homepath,tardir),homedir)

		# build MS-CG

		if buildflag:
		print("Building MS-CG ...")
		if os.path.exists("%s/src/Make/Makefile.%s" % (homedir,msuffix)):
		cmd = 'cd "%s/src"; cp Make/Makefile.%s .; make -f Makefile.%s' % \
		(homedir,msuffix,msuffix)
		mkf="Makefile.%s" % msuffix
		mkp=os.path.join(homedir,'src','Make',mkf)
		if os.path.exists(mkp):
		shutil.copyfile(mkp,os.path.join(homedir,'src',mkf))
		elif os.path.exists("Makefile.%s" % msuffix):
		cmd = 'cd "%s/src"; cp ../../Makefile.%s .; make -f Makefile.%s' % \
		(homedir,msuffix,msuffix)
		shutil.copyfile("Makefile.%s" % msuffix,os.path.join(homedir,'src',mkf))
		else:
		sys.exit("Cannot find Makefile.%s" % msuffix)
		try:
		cmd = 'make -C %s -f Makefile.%s' % (os.path.join(homedir,'src'),msuffix)
		txt = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
		print(txt.decode('UTF-8'))
		except subprocess.CalledProcessError as e:

Admin message