BLD: use BUFFERSIZE=20 in OpenBLAS

1 files changed, 139 insertions, 58 deletions

diff --git a/tools/openblas_support.py b/tools/openblas_support.py
index cbb6a5e43..50837177b 100644
--- a/tools/openblas_support.py
+++ b/tools/openblas_support.py
@@ -10,39 +10,86 @@ import zipfile
 
 from tempfile import mkstemp, gettempdir
 from urllib.request import urlopen, Request
+from urllib.error import HTTPError
 
-OPENBLAS_V = '0.3.9'
+OPENBLAS_V = '0.3.12'
 # Temporary build of OpenBLAS to test a fix for dynamic detection of CPU
-OPENBLAS_LONG = 'v0.3.7-527-g79fd006c'  # the 0.3.7 is misleading
+OPENBLAS_LONG = 'v0.3.12-buffersize20'
 BASE_LOC = 'https://anaconda.org/multibuild-wheels-staging/openblas-libs'
 BASEURL = f'{BASE_LOC}/{OPENBLAS_LONG}/download'
-ARCHITECTURES = ['', 'windows', 'darwin', 'aarch64', 'x86_64', 'i686', 'ppc64le', 's390x']
+ARCHITECTURES = ['', 'windows', 'darwin', 'aarch64', 'x86_64',
+                 'i686', 'ppc64le', 's390x']
 sha256_vals = {
-"openblas-v0.3.7-527-g79fd006c-win_amd64-gcc_7_1_0.zip": "7249d68c02e6b6339e06edfeab1fecddf29ee1e67a3afaa77917c320c43de840",
-"openblas64_-v0.3.7-527-g79fd006c-win_amd64-gcc_7_1_0.zip": "6488e0961a5926e47242f63b63b41cfdd661e6f1d267e8e313e397cde4775c17",
-"openblas-v0.3.7-527-g79fd006c-win32-gcc_7_1_0.zip": "5fb0867ca70b1d0fdbf68dd387c0211f26903d74631420e4aabb49e94aa3930d",
-"openblas-v0.3.7-527-g79fd006c-macosx_10_9_x86_64-gf_1becaaa.tar.gz": "69434bd626bbc495da9ce8c36b005d140c75e3c47f94e88c764a199e820f9259",
-"openblas64_-v0.3.7-527-g79fd006c-macosx_10_9_x86_64-gf_1becaaa.tar.gz": "093f6d953e3fa76a86809be67bd1f0b27656671b5a55b233169cfaa43fd63e22",
-"openblas-v0.3.7-527-g79fd006c-manylinux2014_aarch64.tar.gz": "42676c69dc48cd6e412251b39da6b955a5a0e00323ddd77f9137f7c259d35319",
-"openblas64_-v0.3.7-527-g79fd006c-manylinux2014_aarch64.tar.gz": "5aec167af4052cf5e9e3e416c522d9794efabf03a2aea78b9bb3adc94f0b73d8",
-"openblas-v0.3.7-527-g79fd006c-manylinux2010_x86_64.tar.gz": "fa67c6cc29d4cc5c70a147c80526243239a6f95fc3feadcf83a78176cd9c526b",
-"openblas64_-v0.3.7-527-g79fd006c-manylinux2010_x86_64.tar.gz": "9ad34e89a5307dcf5823bf5c020580d0559a0c155fe85b44fc219752e61852b0",
-"openblas-v0.3.7-527-g79fd006c-manylinux2010_i686.tar.gz": "0b8595d316c8b7be84ab1f1d5a0c89c1b35f7c987cdaf61d441bcba7ab4c7439",
-"openblas-v0.3.7-527-g79fd006c-manylinux2014_ppc64le.tar.gz": "3e1c7d6472c34e7210e3605be4bac9ddd32f613d44297dc50cf2d067e720c4a9",
-"openblas64_-v0.3.7-527-g79fd006c-manylinux2014_ppc64le.tar.gz": "a0885873298e21297a04be6cb7355a585df4fa4873e436b4c16c0a18fc9073ea",
-"openblas-v0.3.7-527-g79fd006c-manylinux2014_s390x.tar.gz": "79b454320817574e20499d58f05259ed35213bea0158953992b910607b17f240",
-"openblas64_-v0.3.7-527-g79fd006c-manylinux2014_s390x.tar.gz": "9fddbebf5301518fc4a5d2022a61886544a0566868c8c014359a1ee6b17f2814",
-"openblas-v0.3.7-527-g79fd006c-manylinux1_i686.tar.gz": "24fb92684ec4676185fff5c9340f50c3db6075948bcef760e9c715a8974e4680",
-"openblas-v0.3.7-527-g79fd006c-manylinux1_x86_64.tar.gz": "ebb8236b57a1b4075fd5cdc3e9246d2900c133a42482e5e714d1e67af5d00e62",
-"openblas-v0.3.7-527-g79fd006c-manylinux1_i686.tar.gz": "24fb92684ec4676185fff5c9340f50c3db6075948bcef760e9c715a8974e4680",
-"openblas-v0.3.7-527-g79fd006c-manylinux1_x86_64.tar.gz": "ebb8236b57a1b4075fd5cdc3e9246d2900c133a42482e5e714d1e67af5d00e62",
-"openblas-v0.3.7-527-g79fd006c-manylinux1_i686.tar.gz": "24fb92684ec4676185fff5c9340f50c3db6075948bcef760e9c715a8974e4680",
-"openblas-v0.3.7-527-g79fd006c-manylinux1_x86_64.tar.gz": "ebb8236b57a1b4075fd5cdc3e9246d2900c133a42482e5e714d1e67af5d00e62",
+    "openblas-v0.3.7-527-g79fd006c-win_amd64-gcc_7_1_0.zip":
+    "7249d68c02e6b6339e06edfeab1fecddf29ee1e67a3afaa77917c320c43de840",
+    "openblas64_-v0.3.7-527-g79fd006c-win_amd64-gcc_7_1_0.zip":
+    "6488e0961a5926e47242f63b63b41cfdd661e6f1d267e8e313e397cde4775c17",
+    "openblas-v0.3.7-527-g79fd006c-win32-gcc_7_1_0.zip":
+    "5fb0867ca70b1d0fdbf68dd387c0211f26903d74631420e4aabb49e94aa3930d",
+    "openblas-v0.3.7-527-g79fd006c-macosx_10_9_x86_64-gf_1becaaa.tar.gz":
+    "69434bd626bbc495da9ce8c36b005d140c75e3c47f94e88c764a199e820f9259",
+    "openblas64_-v0.3.7-527-g79fd006c-macosx_10_9_x86_64-gf_1becaaa.tar.gz":
+    "093f6d953e3fa76a86809be67bd1f0b27656671b5a55b233169cfaa43fd63e22",
+    "openblas-v0.3.7-527-g79fd006c-manylinux2014_aarch64.tar.gz":
+    "42676c69dc48cd6e412251b39da6b955a5a0e00323ddd77f9137f7c259d35319",
+    "openblas64_-v0.3.7-527-g79fd006c-manylinux2014_aarch64.tar.gz":
+    "5aec167af4052cf5e9e3e416c522d9794efabf03a2aea78b9bb3adc94f0b73d8",
+    "openblas-v0.3.7-527-g79fd006c-manylinux2010_x86_64.tar.gz":
+    "fa67c6cc29d4cc5c70a147c80526243239a6f95fc3feadcf83a78176cd9c526b",
+    "openblas64_-v0.3.7-527-g79fd006c-manylinux2010_x86_64.tar.gz":
+    "9ad34e89a5307dcf5823bf5c020580d0559a0c155fe85b44fc219752e61852b0",
+    "openblas-v0.3.7-527-g79fd006c-manylinux2010_i686.tar.gz":
+    "0b8595d316c8b7be84ab1f1d5a0c89c1b35f7c987cdaf61d441bcba7ab4c7439",
+    "openblas-v0.3.7-527-g79fd006c-manylinux2014_ppc64le.tar.gz":
+    "3e1c7d6472c34e7210e3605be4bac9ddd32f613d44297dc50cf2d067e720c4a9",
+    "openblas64_-v0.3.7-527-g79fd006c-manylinux2014_ppc64le.tar.gz":
+    "a0885873298e21297a04be6cb7355a585df4fa4873e436b4c16c0a18fc9073ea",
+    "openblas-v0.3.7-527-g79fd006c-manylinux2014_s390x.tar.gz":
+    "79b454320817574e20499d58f05259ed35213bea0158953992b910607b17f240",
+    "openblas64_-v0.3.7-527-g79fd006c-manylinux2014_s390x.tar.gz":
+    "9fddbebf5301518fc4a5d2022a61886544a0566868c8c014359a1ee6b17f2814",
+    "openblas-v0.3.7-527-g79fd006c-manylinux1_i686.tar.gz":
+    "24fb92684ec4676185fff5c9340f50c3db6075948bcef760e9c715a8974e4680",
+    "openblas-v0.3.7-527-g79fd006c-manylinux1_x86_64.tar.gz":
+    "ebb8236b57a1b4075fd5cdc3e9246d2900c133a42482e5e714d1e67af5d00e62",
+    "openblas-v0.3.10-win_amd64-gcc_7_1_0.zip":
+    "e5356a2aa4aa7ed9233b2ca199fdd445f55ba227f004ebc63071dfa2426e9b09",
+    "openblas64_-v0.3.10-win_amd64-gcc_7_1_0.zip":
+    "aea3f9c8bdfe0b837f0d2739a6c755b12b6838f6c983e4ede71b4e1b576e6e77",
+    "openblas-v0.3.10-win32-gcc_7_1_0.zip":
+    "af1ad3172b23f7c6ef2234151a71d3be4d92010dad4dfb25d07cf5a20f009202",
+    "openblas64_-v0.3.10-macosx_10_9_x86_64-gf_1becaaa.tar.gz":
+    "38b61c58d63048731d6884fea7b63f8cbd610e85b138c6bac0e39fd77cd4699b",
+    "openblas-v0.3.10-manylinux2014_aarch64.tar.gz":
+    "c4444b9836ec26f7772fae02851961bf73177ff2aa436470e56fab8a1ef8d405",
+    "openblas-v0.3.10-manylinux2010_x86_64.tar.gz":
+    "cb7988c4a015aece9c49b1169f51c4ac2287fb9aab8114c8ab67792138ffc85e",
+    "openblas-v0.3.10-manylinux2010_i686.tar.gz":
+    "dc637801dd80ebd6394ea8b4a97f8858e4224870ea9214de08bebbdddd8e206e",
+    "openblas-v0.3.10-manylinux1_x86_64.tar.gz":
+    "ec1f9e9b2a62d5cb9e2634b88ee2da7cb6b07702d5a0e8b190d680a31adfa23a",
+    "openblas-v0.3.10-manylinux1_i686.tar.gz":
+    "b13d9d14e6bd452c0fbadb5cd5fda05b98b1e14043edb13ead90694d4cc07f0e",
+    "openblas-v0.3.10-manylinux2014_ppc64le.tar.gz":
+    "1cbc8176986099cf0cbb8f64968d5a14880d602d4b3c59a91d75b69b8760cde3",
+    "openblas-v0.3.10-manylinux2014_s390x.tar.gz":
+    "fa6722f0b12507ab0a65f38501ed8435b573df0adc0b979f47cdc4c9e9599475",
+    "openblas-v0.3.10-macosx_10_9_x86_64-gf_1becaaa.tar.gz":
+    "c6940b5133e687ae7a4f9c7c794f6a6d92b619cf41e591e5db07aab5da118199",
+    "openblas64_-v0.3.10-manylinux2014_s390x.tar.gz":
+    "e0347dd6f3f3a27d2f5e76d382e8a4a68e2e92f5f6a10e54ef65c7b14b44d0e8",
+    "openblas64_-v0.3.10-manylinux2014_ppc64le.tar.gz":
+    "4b96a51ac767ec0aabb821c61bcd3420e82e987fc93f7e1f85aebb2a845694eb",
+    "openblas64_-v0.3.10-manylinux2010_x86_64.tar.gz":
+    "f68fea21fbc73d06b7566057cad2ed8c7c0eb71fabf9ed8a609f86e5bc60ce5e",
+    "openblas64_-v0.3.10-manylinux2014_aarch64.tar.gz":
+    "15e6eed8cb0df8b88e52baa136ffe1769c517e9de7bcdfd81ec56420ae1069e9",
 }
 
 
 IS_32BIT = sys.maxsize < 2**32
 
+
 def get_arch():
     if platform.system() == 'Windows':
         ret = 'windows'
@@ -53,10 +100,11 @@ def get_arch():
         # What do 32 bit machines report?
         # If they are a docker, they can report x86_64
         if 'x86' in ret and IS_32BIT:
-            arch = 'i686'
+            ret = 'i686'
     assert ret in ARCHITECTURES, f'invalid architecture {ret}'
     return ret
 
+
 def get_ilp64():
     if os.environ.get("NPY_USE_BLAS_ILP64", "0") == "0":
         return None
@@ -64,6 +112,7 @@ def get_ilp64():
         raise RuntimeError("NPY_USE_BLAS_ILP64 set on 32-bit arch")
     return "64_"
 
+
 def get_manylinux(arch):
     if arch in ('x86_64', 'i686'):
         default = '2010'
@@ -75,13 +124,13 @@ def get_manylinux(arch):
     return ret
 
 
-def download_openblas(target, arch, ilp64):
+def download_openblas(target, arch, ilp64, is_32bit):
     ml_ver = get_manylinux(arch)
     fnsuffix = {None: "", "64_": "64_"}[ilp64]
     filename = ''
-    headers = {'User-Agent': ('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 ; '
-                              '(KHTML, like Gecko) Chrome/41.0.2228.0 '
-                              'Safari/537.3')}
+    headers = {'User-Agent':
+               ('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 ; '
+                '(KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.3')}
     if arch in ('aarch64', 'ppc64le', 's390x', 'x86_64', 'i686'):
         suffix = f'manylinux{ml_ver}_{arch}.tar.gz'
         filename = f'{BASEURL}/openblas{fnsuffix}-{OPENBLAS_LONG}-{suffix}'
@@ -91,16 +140,20 @@ def download_openblas(target, arch, ilp64):
         filename = f'{BASEURL}/openblas{fnsuffix}-{OPENBLAS_LONG}-{suffix}'
         typ = 'tar.gz'
     elif arch == 'windows':
-        if IS_32BIT:
-            suffix = 'win32-gcc_7_1_0.zip'
+        if is_32bit:
+            suffix = 'win32-gcc_8_1_0.zip'
         else:
-            suffix = 'win_amd64-gcc_7_1_0.zip'
+            suffix = 'win_amd64-gcc_8_1_0.zip'
         filename = f'{BASEURL}/openblas{fnsuffix}-{OPENBLAS_LONG}-{suffix}'
         typ = 'zip'
     if not filename:
         return None
     req = Request(url=filename, headers=headers)
-    response = urlopen(req)
+    try:
+        response = urlopen(req)
+    except HTTPError:
+        print(f'Could not download "{filename}"', file=sys.stderr)
+        raise
     length = response.getheader('content-length')
     if response.status != 200:
         print(f'Could not download "{filename}"', file=sys.stderr)
@@ -110,18 +163,21 @@ def download_openblas(target, arch, ilp64):
     # Verify hash
     key = os.path.basename(filename)
     sha256_returned = hashlib.sha256(data).hexdigest()
-    if key not in sha256_vals:
-        raise ValueError(
-            f'key "{key}" with hash "{sha256_returned}" not in sha256_vals')
-    sha256_expected = sha256_vals[key]
-    if sha256_returned != sha256_expected:
-        raise ValueError(f'sha256 hash mismatch for filename {filename}')
+    if 0:
+        if key not in sha256_vals:
+            raise ValueError(
+                f'\nkey "{key}" with hash "{sha256_returned}" not in sha256_vals\n')
+        sha256_expected = sha256_vals[key]
+        if sha256_returned != sha256_expected:
+            # print(f'\nkey "{key}" with hash "{sha256_returned}" mismatch\n')
+            raise ValueError(f'sha256 hash mismatch for filename {filename}')
     print("Saving to file", file=sys.stderr)
     with open(target, 'wb') as fid:
         fid.write(data)
     return typ
 
-def setup_openblas(arch=get_arch(), ilp64=get_ilp64()):
+
+def setup_openblas(arch=get_arch(), ilp64=get_ilp64(), is_32bit=IS_32BIT):
     '''
     Download and setup an openblas library for building. If successful,
     the configuration script will find it automatically.
@@ -135,24 +191,25 @@ def setup_openblas(arch=get_arch(), ilp64=get_ilp64()):
     _, tmp = mkstemp()
     if not arch:
         raise ValueError('unknown architecture')
-    typ = download_openblas(tmp, arch, ilp64)
+    typ = download_openblas(tmp, arch, ilp64, is_32bit)
     if not typ:
         return ''
     if arch == 'windows':
         if not typ == 'zip':
-            return 'expecting to download zipfile on windows, not %s' % str(typ)
+            return f'expecting to download zipfile on windows, not {typ}'
         return unpack_windows_zip(tmp)
     else:
         if not typ == 'tar.gz':
             return 'expecting to download tar.gz, not %s' % str(typ)
         return unpack_targz(tmp)
 
+
 def unpack_windows_zip(fname):
     with zipfile.ZipFile(fname, 'r') as zf:
         # Get the openblas.a file, but not openblas.dll.a nor openblas.dev.a
         lib = [x for x in zf.namelist() if OPENBLAS_LONG in x and
-                  x.endswith('a') and not x.endswith('dll.a') and
-                  not x.endswith('dev.a')]
+               x.endswith('a') and not x.endswith('dll.a') and
+               not x.endswith('dev.a')]
         if not lib:
             return 'could not find libopenblas_%s*.a ' \
                     'in downloaded zipfile' % OPENBLAS_LONG
@@ -161,6 +218,7 @@ def unpack_windows_zip(fname):
             fid.write(zf.read(lib[0]))
     return target
 
+
 def unpack_targz(fname):
     target = os.path.join(gettempdir(), 'openblas')
     if not os.path.exists(target):
@@ -171,6 +229,7 @@ def unpack_targz(fname):
         extract_tarfile_to(zf, target, prefix)
         return target
 
+
 def extract_tarfile_to(tarfileobj, target_path, archive_path):
     """Extract TarFile contents under archive_path/ to target_path/"""
 
@@ -194,6 +253,7 @@ def extract_tarfile_to(tarfileobj, target_path, archive_path):
 
     tarfileobj.extractall(target_path, members=get_members())
 
+
 def make_init(dirname):
     '''
     Create a _distributor_init.py file for OpenBlas
@@ -228,33 +288,51 @@ def make_init(dirname):
                             DLL_filenames.append(filename)
                     if len(DLL_filenames) > 1:
                         import warnings
-                        warnings.warn("loaded more than 1 DLL from .libs:\\n%s" %
-                                      "\\n".join(DLL_filenames),
+                        warnings.warn("loaded more than 1 DLL from .libs:"
+                                      "\\n%s" % "\\n".join(DLL_filenames),
                                       stacklevel=1)
     """))
 
+
 def test_setup(arches):
     '''
     Make sure all the downloadable files exist and can be opened
     '''
     def items():
+        """ yields all combinations of arch, ilp64, is_32bit
+        """
         for arch in arches:
-            yield arch, None
-            if arch not in ('i686'):
-                yield arch, '64_'
+            yield arch, None, False
+            if arch not in ('i686',):
+                yield arch, '64_', False
+            if arch in ('windows',):
+                yield arch, None, True
+            if arch in ('i686', 'x86_64'):
+                oldval = os.environ.get('MB_ML_VER', None)
+                os.environ['MB_ML_VER'] = '1'
+                yield arch, None, False
+                # Once we create x86_64 and i686 manylinux2014 wheels...
+                # os.environ['MB_ML_VER'] = '2014'
+                # yield arch, None, False
+                if oldval:
+                    os.environ['MB_ML_VER'] = oldval
+                else:
+                    os.environ.pop('MB_ML_VER')
 
     errs = []
-    for arch, ilp64 in items():
+    for arch, ilp64, is_32bit in items():
         if arch == '':
             continue
-
+        if arch not in arches:
+            continue
         target = None
         try:
             try:
-                target = setup_openblas(arch, ilp64)
+                target = setup_openblas(arch, ilp64, is_32bit)
             except Exception as e:
-                print(f'Could not setup {arch}:')
-                print(str(e))
+                print(f'Could not setup {arch} with ilp64 {ilp64}, '
+                      f'32bit {is_32bit}:')
+                print(e)
                 errs.append(e)
                 continue
             if not target:
@@ -290,28 +368,31 @@ def test_version(expected_version, ilp64=get_ilp64()):
         get_config = dll.openblas_get_config64_
     else:
         get_config = dll.openblas_get_config
-    get_config.restype=ctypes.c_char_p
+    get_config.restype = ctypes.c_char_p
     res = get_config()
     print('OpenBLAS get_config returned', str(res))
     if not expected_version:
         expected_version = OPENBLAS_V
     check_str = b'OpenBLAS %s' % expected_version.encode()
     print(check_str)
-    assert check_str in res, '%s not found in %s' %(expected_version, res)
+    assert check_str in res, f'{expected_version} not found in {res}'
     if ilp64:
         assert b"USE64BITINT" in res
     else:
         assert b"USE64BITINT" not in res
 
+
 if __name__ == '__main__':
     import argparse
     parser = argparse.ArgumentParser(
-        description='Download and expand an OpenBLAS archive for this ' \
+        description='Download and expand an OpenBLAS archive for this '
                     'architecture')
     parser.add_argument('--test', nargs='*', default=None,
-        help='Test different architectures. "all", or any of %s' % ARCHITECTURES)
+                        help='Test different architectures. "all", or any of '
+                             f'{ARCHITECTURES}')
     parser.add_argument('--check_version', nargs='?', default='',
-        help='Check provided OpenBLAS version string against available OpenBLAS')
+                        help='Check provided OpenBLAS version string '
+                             'against available OpenBLAS')
     args = parser.parse_args()
     if args.check_version != '':
         test_version(args.check_version)