more Install.py refactoring

lib/plumed/Install.py

@@ -5,6 +5,8 @@
 
 from __future__ import print_function
 import sys,os,re,subprocess,hashlib,shutil
+sys.path.append('..')
+from install_helpers import error,get_cpus,fullpath,which,geturl,checkmd5sum
 
 # help message
 
@@ -42,74 +44,11 @@ checksums = { \
         '2.5b'  : 'e341bdef469be1da058b8a0b97a3db22', \
         }
 
-# print error message or help
-def error(str=None):
-  if not str: print(help)
-  else: print("ERROR",str)
-  sys.exit()
-
-# expand to full path name
-# process leading '~' or relative path
-
-def fullpath(path):
-  return os.path.abspath(os.path.expanduser(path))
-
-def which(program):
-  def is_exe(fpath):
-    return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-  fpath, fname = os.path.split(program)
-  if fpath:
-    if is_exe(program):
-      return program
-  else:
-    for path in os.environ["PATH"].split(os.pathsep):
-      path = path.strip('"')
-      exe_file = os.path.join(path, program)
-      if is_exe(exe_file):
-        return exe_file
-
-  return None
-
-def geturl(url,fname):
-  success = False
-
-  if which('curl') != None:
-    cmd = 'curl -L -o "%s" %s' % (fname,url)
-    try:
-      subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
-      success = True
-    except subprocess.CalledProcessError as e:
-      print("Calling curl failed with: %s" % e.output.decode('UTF-8'))
-
-  if not success and which('wget') != None:
-    cmd = 'wget -O "%s" %s' % (fname,url)
-    try:
-      subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
-      success = True
-    except subprocess.CalledProcessError as e:
-      print("Calling wget failed with: %s" % e.output.decode('UTF-8'))
-
-  if not success:
-    error("Failed to download source code with 'curl' or 'wget'")
-  return
-
-def checkmd5sum(md5sum,fname):
-    with open(fname,'rb') as fh:
-        m = hashlib.md5()
-        while True:
-            data = fh.read(81920)
-            if not data:
-                break
-            m.update(data)
-    fh.close()
-    return m.hexdigest() == md5sum
-
 # parse args
 
 args = sys.argv[1:]
 nargs = len(args)
-if nargs == 0: error()
+if nargs == 0: error(help=help)
 
 homepath = "."
 
@@ -121,22 +60,22 @@ linkflag = True
 iarg = 0
 while iarg < nargs:
   if args[iarg] == "-v":
-    if iarg+2 > nargs: error()
+    if iarg+2 > nargs: error(help=help)
     version = args[iarg+1]
     iarg += 2
   elif args[iarg] == "-p":
-    if iarg+2 > nargs: error()
+    if iarg+2 > nargs: error(help=help)
     plumedpath = fullpath(args[iarg+1])
     pathflag = True
     iarg += 2
   elif args[iarg] == "-m":
-    if iarg+2 > nargs: error()
+    if iarg+2 > nargs: error(help=help)
     mode = args[iarg+1]
     iarg += 2
   elif args[iarg] == "-b":
     buildflag = True
     iarg += 1
-  else: error()
+  else: error(help=help)
 
 homepath = fullpath(homepath)
 homedir = "%s/plumed2" % (homepath)
@@ -178,14 +117,14 @@ if buildflag:
 
   # build plumed
   print("Building plumed ...")
-  try:
-    import multiprocessing
-    n_cpus = multiprocessing.cpu_count()
-  except:
-    n_cpus = 1
+  n_cpus = get_cpus()
   cmd = 'cd %s/plumed-%s; ./configure --prefix=%s --enable-static-patch ; make -j%d ; make install' % (homepath,version,homedir,n_cpus)
-  txt = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
-  print(txt.decode('UTF-8'))
+  try:
+    txt = subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
+    print(txt.decode('UTF-8'))
+  except subprocess.CalledProcessError as e:
+    print("Make failed with:\n %s" % e.output.decode('UTF-8'))
+    sys.exit(1)
  
 # create 2 links in lib/plumed to plumed2 installation dir