Changeset 4439

Timestamp:

May 26, 2020 9:34:42 AM (5 years ago)

Author:

toby

Message:

bootstrap w/selected binary; update svn switch cmd; save build output

Files:

• install/g2complete/build.sh (modified) (1 diff)
• install/g2complete/meta.yaml.template (modified) (1 diff)
• install/g2complete/src/bootstrap.py (modified) (11 diffs)
• trunk/GSASIIpath.py (modified) (2 diffs)

install/g2complete/build.sh ¶

@@ -8 +8 @@
 mkdir -p $PREFIX/GSASII
 cp $RECIPE_DIR/src/bootstrap.py $PREFIX/GSASII
-python $PREFIX/GSASII/bootstrap.py --noproxy --noinstall
+python $PREFIX/GSASII/bootstrap.py --binary=1.18 >> $HOME/build_log.txt

install/g2complete/meta.yaml.template ¶

@@ -18 +18 @@
     - pillow
     - pyopengl
-    - wxpython>=4.0
+    - wxpython>=4.
     - svn
     - hdf5

install/g2complete/src/bootstrap.py ¶

@@ -9 +9 @@
 path2GSAS2 = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
 
-skipInstallSteps = False
-skipDownloadSteps = False
-skipProxy = False
-showWXerror = False
-help = False
-allBinaries = False
+skipInstallChecks = False  # if set to True, continue installation even if current Python lacks packages and
+                           # skips platform-dependent installation steps
+skipDownloadSteps = False  # if False, svn is used to download GSAS-II files and binaries 
+skipProxy = False          # if False then the script creates a prompt asking for proxy info
+showWXerror = False        # if True, errors are shown in wxPython windows (used on Windows only)
+help = False               # if True, a help message is shown
+allBinaries = False        # if True, causes all binaries to be installed
+binaryVersion=None         # if specified, gives a specific numpy version to use (such as 1.18)
+                           # for selecting a set of binaries to use
+
 for a in sys.argv[1:]:
     if 'noinstall' in a.lower():
-        skipInstallSteps = True
+        skipInstallChecks = True
         if sys.platform.startswith('win'): showWXerror = True
     elif 'nonet' in a.lower():
@@ -24 +28 @@
     elif 'noproxy' in a.lower():
         skipProxy = True
-    elif 'help' in a.lower():
-        help = True
     elif 'allbin' in a.lower() or 'server' in a.lower():
         allBinaries = True
+    elif 'binary' in a.lower():
+        numpyVersion = a.split('=')[1]
+        skipInstallChecks = True
+        if sys.platform.startswith('win'): showWXerror = True
+        skipProxy = True
     else:
+        help = True
+    if 'help' in a.lower():
         help = True
 
@@ -35 +44 @@
   bootstrap.py options:
 
-    --noinstall skip post-install, such as creating run shortcuts
-    --noproxy   do not ask for proxy information
-    --server    load all binary versions 
-    --allbin    load all binary versions (same as --server)
-    --help      this message
-    --nonet     skip steps requiring internet
-
+    --noinstall   skip post-install, such as creating run shortcuts, turns on 
+                  wxpython error display in Windows
+    --noproxy     do not ask for proxy information
+    --server      load all binary versions 
+    --allbin      load all binary versions (same as --server)
+    --help        this message
+    --nonet       skip steps requiring internet
+    --binary=ver  specifies a specific numpy binary directory to use (such as 
+                  --binary=1.18); turns on --noinstall and --noproxy
 ''')
     sys.exit()
@@ -47 +58 @@
 now = str(datetime.datetime.now())
 print('Running bootstrap from {} at {}\n\tId: {}'.format(path2GSAS2,now,version))
+print ("Python:     %s"%sys.version.split()[0])
+try:
+    import numpy as np
+    print ("numpy:      %s"%np.__version__)
+except:
+    pass
 fp = open(os.path.join(path2GSAS2,'bootstrap.log'),'a')
 fp.write('Running bootstrap from {} at {}\n\tId: {}\n'.format(path2GSAS2,now,version))
@@ -251 +268 @@
         missing.append(pkg)
 
-if missing and not skipInstallSteps:
+if missing and not skipInstallChecks:
     msg = """Sorry, this version of Python cannot be used
 for GSAS-II. It is missing the following package(s):
@@ -379 +396 @@
     except Exception as err:
         print('Error writing file {}:\n{}'.format(proxyinfo,err))
+        
 if not skipDownloadSteps:
     # patch: switch GSAS-II location if linked to XOR server (relocated May/June 2017)
@@ -465 +483 @@
     print('\n'+75*'*')
 
+# subsequent commands require GSASIIpath which better be here now, import it
 try:
     import GSASIIpath
@@ -473 +492 @@
     BailOut(msg)
 
-if allBinaries and not skipDownloadSteps:
+if skipDownloadSteps:
+    pass
+elif allBinaries:
     print('Loading all binaries with command...')
     if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):
         msg = 'Binary load failed. Subversion problem? Please seek help'
         BailOut(msg)
+elif numpyVersion:
+    binaryVersion = GSASIIpath.GetBinaryPrefix()+'n'+numpyVersion
+    if not GSASIIpath.svnSwitchDir('bindist','',g2home+ 'Binaries/'+binaryVersion,None,True):
+        msg = 'Binary load failed with '+binaryVersion+'. Subversion problem? Please seek help'
+        BailOut(msg)
 else:
     GSASIIpath.DownloadG2Binaries(g2home)
@@ -484 +510 @@
 # 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(loadBinary=False)
-    import pyspg
-    import histogram2d
-    import polymask
-    import pypowder
-    import pytexture
-    pyspg.sgforpy('P -1')
-    print('==OK==')
-except Exception as err:
-    print(err)
-"""
-p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
-                     cwd=path2GSAS2)
-res,err = MakeByte2str(p.communicate())
-if '==OK==' not in str(res) or p.returncode != 0:
-    #print('\n'+75*'=')
-    msg = 'Failed when testing the GSAS-II compiled files. GSAS-II will not run'
-    msg += ' without correcting this.\n\nError message:\n'
-    if res: 
-        msg += res
-        msg += '\n'
-    if err:
-        msg += err
-    #print('\nAttempting to open a web page on compiling GSAS-II...')
-    msg += '\n\nPlease see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII if you wish to compile for yourself (usually not needed for windows and Mac, but sometimes required for Linux.)'
-    BailOut(msg)
-    #import webbrowser
-    #webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
-    #print(75*'=')
-#    if '86' in platform.machine() and (sys.platform.startswith('linux')
-#                                        or sys.platform == "darwin"
-#                                        or sys.platform.startswith('win')):
-#        print('Platform '+sys.platform+' with processor type '+platform.machine()+' is supported')
-#    else:
-#        print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
-else:
-    print('Successfully tested compiled routines')
+if not skipInstallChecks:
+    script = """  # commands that test each module can at least be loaded & run something in pyspg
+    try:
+        import GSASIIpath
+        GSASIIpath.SetBinaryPath(loadBinary=False)
+        import pyspg
+        import histogram2d
+        import polymask
+        import pypowder
+        import pytexture
+        pyspg.sgforpy('P -1')
+        print('==OK==')
+    except Exception as err:
+        print(err)
+    """
+    p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
+                         cwd=path2GSAS2)
+    res,err = MakeByte2str(p.communicate())
+    if '==OK==' not in str(res) or p.returncode != 0:
+        #print('\n'+75*'=')
+        msg = 'Failed when testing the GSAS-II compiled files. GSAS-II will not run'
+        msg += ' without correcting this.\n\nError message:\n'
+        if res: 
+            msg += res
+            msg += '\n'
+        if err:
+            msg += err
+        #print('\nAttempting to open a web page on compiling GSAS-II...')
+        msg += '\n\nPlease see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII if you wish to compile for yourself (usually not needed for windows and Mac, but sometimes required for Linux.)'
+        BailOut(msg)
+        #import webbrowser
+        #webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
+        #print(75*'=')
+    #    if '86' in platform.machine() and (sys.platform.startswith('linux')
+    #                                        or sys.platform == "darwin"
+    #                                        or sys.platform.startswith('win')):
+    #        print('Platform '+sys.platform+' with processor type '+platform.machine()+' is supported')
+    #    else:
+    #        print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
+    else:
+        print('Successfully tested compiled routines')
 #===========================================================================
 # import all .py files so that .pyc files get created
-if not skipInstallSteps:
+if not skipInstallChecks:
     print('Byte-compiling all .py files...')
     import compileall
@@ -533 +559 @@
     print('done')
 #===========================================================================
-# platform-dependent stuff
+# do platform-dependent stuff
 #===========================================================================
 if sys.version_info[0] > 2:
@@ -540 +566 @@
             exec(source_file.read())
 
-if skipInstallSteps:
+if skipInstallChecks:
     pass
 #===========================================================================

trunk/GSASIIpath.py ¶

@@ -539 +539 @@
     cmd = [svn,'switch',URL,fpath,
            '--non-interactive','--trust-server-cert',
-           '--accept','theirs-conflict','--force']
+           '--accept','theirs-conflict','--force','-rHEAD']
     if svnVersionNumber(svn) > 1.6: cmd += ['--ignore-ancestry']
     if proxycmds: cmd += proxycmds
-    if verbose: print(u"Loading files to "+fpath+u"\n  from "+URL)
+    if verbose:
+        print(u"Loading files to "+fpath+u"\n  from "+URL)
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = MakeByte2str(s.communicate())
@@ -566 +567 @@
         return False
     if verbose:
-        print('=== Output from svn switch'+(43*'='))
+        s = '\nsvn command:  '
+        for i in cmd: s += i + ' '
+        print(s)
+        print('\n=== Output from svn switch'+(43*'='))
         print(out.strip())
         print((70*'=')+'\n')