Changeset 2952

Timestamp:

Jul 30, 2017 7:37:08 PM (6 years ago)

Author:

toby

Message:

GSASII installation: support downloading of all binaries

Files:

• branch/2frame/GSASIIpath.py (modified) (7 diffs)
• install/bootstrap.bat (deleted)
• install/bootstrap.py (modified) (4 diffs)

branch/2frame/GSASIIpath.py

@@ -28 +28 @@
     
 path2GSAS2 = os.path.dirname(os.path.realpath(__file__)) # location of this file; save before any changes in pwd
+
+# convert version numbers as '1.2.3' to integers (1002) and back (to 1.2)
+fmtver = lambda v: str(v//1000)+'.'+str(v%1000)
+intver = lambda vs: sum([int(i) for i in vs.split('.')[0:2]]*np.array((1000,1)))
 
 def GetConfigValue(key,default=None):
@@ -432 +436 @@
     print ("Files installed at: "+loadpath)
     return True
-            
-def DownloadG2Binaries(g2home,verbose=True):
-    '''Download GSAS-II binaries from appropriate section of the
-    GSAS-II svn repository based on the platform, numpy and Python
-    version
-    '''
-    # convert version numbers as '1.2.3' to integers (1002) and back (to 1.2)
-    fmtver = lambda v: str(v//1000)+'.'+str(v%1000)
-    intver = lambda vs: sum([int(i) for i in vs.split('.')[0:2]]*np.array((1000,1)))
-    
+
+def GetBinaryPrefix():
     if sys.platform == "win32":
         prefix = 'win'
@@ -456 +452 @@
         bits = '32'
 
-    # format current python & numpy versions
+    # format current python version
     pyver = 'p{}.{}'.format(*sys.version_info[0:2])
-    npver = 'n{}.{}'.format(*np.__version__.split('.')[0:2])
+
+    items = [prefix,bits,pyver]
+    return '_'.join(items)
+
+def DownloadG2Binaries(g2home,verbose=True):
+    '''Download GSAS-II binaries from appropriate section of the
+    GSAS-II svn repository based on the platform, numpy and Python
+    version
+    '''    
+    bindir = GetBinaryPrefix()
+    #npver = 'n{}.{}'.format(*np.__version__.split('.')[0:2])
     inpver = intver(np.__version__)
-
-    items = [prefix,bits,pyver]
-    bindir = '_'.join(items)
-
     svn = whichsvn()
     if not svn:
@@ -669 +671 @@
     global BinaryPathLoaded
     if BinaryPathLoaded: return
-    BinaryPathLoaded = True
+    inpver = intver(np.__version__)
     binpath = None
+    binprfx = GetBinaryPrefix()
     for loc in os.path.abspath(sys.path[0]),os.path.abspath(os.path.split(__file__)[0]):
-        # Look at bin directory (created by a local compile) before standard dist
-        # that at the top of the path
-        for d in 'bin','bindist':
-            if not d: continue
-            fpth = os.path.join(loc,d)
+        # Look at bin directory (created by a local compile) before looking for standard dist files
+        searchpathlist = [os.path.join(loc,'bin')]
+        # also look for matching binary dist in loc/AllBinaries
+        versions = {}
+        for d in glob.glob(os.path.join(loc,'AllBinaries',binprfx+'*')):
+            v = intver(d.rstrip('/').split('_')[3].lstrip('n'))
+            versions[v] = d
+        searchpathlist = [os.path.join(loc,'bin')]
+        vmin = None
+        vmax = None
+        for v in sorted(versions.keys()):
+            if v <= inpver:
+                vmin = v
+            elif v > inpver:
+                vmax = v
+                break
+        if vmin in versions:
+            searchpathlist.append(versions[vmin])
+        if vmax in versions:
+            searchpathlist.append(versions[vmax])
+        searchpathlist.append(os.path.join(loc,'bindist'))
+        for fpth in searchpathlist:
             if TestSPG(fpth):
                 binpath = fpth
@@ -684 +704 @@
         sys.path.insert(0,binpath)
         print('GSAS-II binary directory: {}'.format(binpath))
+        BinaryPathLoaded = True
     else:                                                  # try loading them 
         print('Attempting to download GSAS-II binary files...')
@@ -693 +714 @@
             print('GSAS-II binary directory: {}'.format(binpath))
             sys.path.insert(0,binpath)
+            BinaryPathLoaded = True
         # this must be imported before anything that imports any .pyd/.so file for GSASII
         else:
@@ -699 +721 @@
             # patch: use old location based on the host OS and the python version,  
             # path is relative to location of the script that is called as well as this file
+            BinaryPathLoaded = True
             bindir = None
             if sys.platform == "win32":

install/bootstrap.py

@@ -231 +231 @@
 print('\n'+75*'*')
 print(msg + u' from ' + cmd[2])
-print('  *** If GSAS-II fails to be installed, you likely have a network access')
-print('  *** problem, most commonly because you need to use a network proxy. Please')
-print('  *** check with a network administrator or use http://www.whatismyproxy.com/\n')
 print 'svn load command:'
 for item in cmd: print item,
 print ""
-p = subprocess.call(cmd)
-if p:
-    print 'subversion returned an error; Retrying with command for older version...'
+s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+print('\nsubversion output:')
+out,err = s.communicate()
+if err:
+    print('subversion returned an error:')
+    print(err)
+    print('Retrying with command for older svn version...')
     cmd = [svn, 'co', g2home+ 'trunk/', gsaspath]
     if proxycmds: cmd += proxycmds
     for item in cmd: print item,
     print ""
-    p = subprocess.call(cmd)
+    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print('subversion returned an error:')
+        print(err)
+        print('  *** GSAS-II failed to be installed: you likely have a network access')
+        print('  *** problem, most commonly because you need to use a network proxy. Please')
+        print('  *** check with a network administrator or use http://www.whatismyproxy.com/\n')
+        sys.exit()
 print('\n'+75*'*')
 
-#===========================================================================
-# test if the compiled files load correctly
-#===========================================================================
 try:
     import GSASIIpath
@@ -261 +267 @@
     sys.exit()
 
+for a in sys.argv[1:]:
+    if 'allbin' in a.lower() or 'server' in a.lower():
+        print('Loading all binaries with command...')
+        if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):
+            print('Binary load failed')
+            sys.exit()
+        break
+else:
+    GSASIIpath.DownloadG2Binaries(g2home)
+        
+#===========================================================================
+# test if the compiled files load correctly
+#===========================================================================
+
 script = """  # commands that test each module can at least be loaded & run something in pyspg
 try:
     import GSASIIpath
+    GSASIIpath.SetBinaryPath()
     import pyspg
     import histogram2d
@@ -274 +295 @@
     pass
 """
-p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
+                     cwd=gsaspath)
 res,err = p.communicate()
 if '==OK==' not in res or p.returncode != 0:
@@ -313 +335 @@
 elif sys.platform.startswith('darwin') and os.path.exists(
     os.path.join(gsaspath,"makeMacApp.py")):
-    print('running '+os.path.join(gsaspath,"makeMacApp.py"))
-    execfile(os.path.join(gsaspath,"makeMacApp.py"))
+    sys.argv = [os.path.join(gsaspath,"makeMacApp.py")]
+    print(u'running '+sys.argv[0])
+    execfile(sys.argv[0])
 #===========================================================================
 # On linux, make desktop icon