Changeset 5125

Timestamp:

Jan 6, 2022 3:26:31 PM (17 months ago)

Author:

toby

Message:

successful Raspberry Pi install

Files:

• Binaries/linux_arm32_p2.7_n1.16 (added)
• Binaries/linux_arm32_p2.7_n1.16/Build.notes.txt (added)
• Binaries/linux_arm32_p3.7_n1.16 (added)
• Binaries/linux_arm32_p3.7_n1.16/Build.notes.txt (added)
• Binaries/linux_arm32_p3.7_n1.16/histogram2d.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/histosigma2d.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/pack_f.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/polymask.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/pydiffax.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/pypowder.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/pyspg.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/pytexture.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/spotmask.cpython-37m-arm-linux-gnueabihf.so (added)
• Binaries/linux_arm32_p3.7_n1.16/unpack_cbf.cpython-37m-arm-linux-gnueabihf.so (added)
• trunk/GSASIIpath.py (modified) (3 diffs)
• trunk/fsource/SConstruct (modified) (8 diffs)

trunk/GSASIIpath.py

@@ -782 +782 @@
 
 def GetBinaryPrefix(pyver=None):
+    '''Creates the first part of the binary directory name
+    such as linux_64_p3.9 (where the full name will be 
+    linux_64_p3.9_n1.21). 
+
+    Note that any change made here is also needed in GetBinaryDir in 
+    fsource/SConstruct
+    '''
     if sys.platform == "win32":
         prefix = 'win'
@@ -791 +798 @@
         print(u'Unknown platform: '+sys.platform)
         raise Exception('Unknown platform')
-    if 'arm' in platform.machine():
+    if 'arm' in platform.machine() and platform.architecture()[0] == '64bit':
         bits = 'arm'
+    elif 'arm' in platform.machine():
+        bits = 'arm32'
     elif platform.architecture()[0] == '64bit':
         bits = '64'
@@ -804 +813 @@
         pyver = 'p{}.{}'.format(*sys.version_info[0:2])
 
-    items = [prefix,bits,pyver]
-    return '_'.join(items)
+    return '_'.join([prefix,bits,pyver])
 
 def svnList(URL,verbose=True):

trunk/fsource/SConstruct

@@ -5 +5 @@
 # know the details of what OS, compiler and python you are using as well as the command-line
 # options you need. 
+from __future__ import division, print_function
 import platform
 import sys
@@ -41 +42 @@
         print(u'Unknown platform: '+sys.platform)
         raise Exception('Unknown platform')
-    if 'arm' in platform.machine() and sys.platform == "darwin":
+    if 'arm' in platform.machine() and platform.architecture()[0] == '64bit':
         bits = 'arm'
+    elif 'arm' in platform.machine():
+        bits = 'arm32'
     elif platform.architecture()[0] == '64bit':
         bits = '64'
     else:
         bits = '32'
-    pyver = 'p{}.{}'.format(*sys.version_info[0:2])
-    npver = 'n' + np.__version__[:np.__version__.find('.',2)]
+    pyver = 'p{}.{}'.format(pyVersions[0].strip(),pyVersions[1].strip())
+    #pyver = 'p{}.{}'.format(*sys.version_info[0:2])
+    npver = 'n' + pyVersions[3][:pyVersions[3].find('.',2)]
     return '_'.join([prefix,bits,pyver,npver])
 #==========================================================================================
@@ -61 +65 @@
 for pth in [F2PYpath,spath,os.path.normpath(os.path.join(spath,'..')),os.path.join(spath,'Scripts')]:
     if not pth: continue
+    if sys.platform == "win32":
+        program = 'f2py3.exe'
+    else:
+        program = 'f2py3'
+    f2pyprogram = os.path.join(pth,program)
+    if is_exe(f2pyprogram):
+        F2PYpath,F2PYprog = os.path.split(f2pyprogram)
+        break
     if sys.platform == "win32":
         program = 'f2py.exe'
@@ -207 +219 @@
        (builds into ../bin<platform-dir> for module distribution)
     """)
-    #sys.exit()
+    sys.exit()
 #==========================================================================================
 # override from command-line options
@@ -220 +232 @@
 # then run it to get info about the verision and the number of bits
 pythonpath = ''
-for program in ['python','../python']:
+for program in ['python3','../python3','python','../python']:
     if sys.platform == "win32" and os.path.splitext(program)[1].lower() != '.exe':
         program = program + '.exe'
@@ -230 +242 @@
     print ('python not found')
     sys.exit()
-#p = subprocess.Popen(pythonprogram, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
-#p.stdin.write("import sys,platform;print (str(sys.version_info[0]));print (str(sys.version_info[1]));print (platform.architecture()[0]);sys.exit()")
-#p.stdin.close()
-#p.wait()
-#versions = p.stdout.readlines()
-versions = platform.python_version_tuple()
-version = str(int(versions[0])) + '.' + str(int(versions[1]))
+p = subprocess.Popen(pythonprogram, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+p.stdin.write("""
+import sys,platform;
+print (str(sys.version_info[0]))
+print (str(sys.version_info[1]))
+print (platform.architecture()[0])
+import numpy as np
+print(np.__version__)
+sys.exit()""")
+p.stdin.close()
+p.wait()
+pyVersions = p.stdout.readlines()
+#pyVersions = platform.python_version_tuple()
+version = str(int(pyVersions[0])) + '.' + str(int(pyVersions[1]))
 PlatformBits = '64bits'
 if 'arm' in platform.machine() and sys.platform == "darwin":
    PlatformBits = 'arm'
-if '32' in platform.architecture()[0]:
+elif 'arm' in platform.machine() and '32' in platform.architecture()[0]:
+   PlatformBits = 'arm32'
+elif 'arm' in platform.machine():
+   PlatformBits = 'arm'
+elif '32' in platform.architecture()[0]:
    PlatformBits = '32bits'
-#PlatformBits = versions[2][:-1]
+#PlatformBits = pyVersions[2][:-1]
 #
 # Set install location
@@ -257 +280 @@
         if FORTflags == "": FORTflags = ' -w -O2 -fPIC -m64'
         if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m64"' # --arch="-arch x86_64"'
+    elif sys.platform.startswith("linux") and 'arm' in platform.machine():
+        if FORTflags == "": FORTflags = ' -w -O2 -fPIC'
+        if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check"'
     elif sys.platform.startswith("linux"):
         if FORTflags == "": FORTflags = ' -w -O2 -fPIC -m32'
@@ -387 +413 @@
 for mod in modlist: print (" " + mod,)
 print ("")
+print ('Use "scons help" to see build options')
 print (80*'=')
 #print (env.Dump())
 if 'help' in COMMAND_LINE_TARGETS: sys.exit()
-if not os.path.exists(InstallLoc):
+if not os.path.exists(InstallLoc) and not GetOption('no_exec'):
     import datetime
     print('Creating '+InstallLoc)
     os.makedirs(InstallLoc)
+if not GetOption('no_exec'):
     fp = open(os.path.join(InstallLoc,'Build.notes.txt'),'w')
     fp.write('Created {} on {}\n'.format(datetime.datetime.isoformat(datetime.datetime.now()),