Linux/Mac --output-windows. Fix np.fromiter() workaround.

Author: lschoe

demos/np_lpsolver.py

@@ -210,18 +210,15 @@ async def main():
     print(f'max = {mx} / {cd} / {scale} = {mx / cd / scale} in {iteration} iterations')
 
     logging.info('Solution x')
-    sum_powers = secint.array(np.zeros((N,), dtype='O'))  # TODO: compare with fromiter approach below
-    for i in range(m):
-        x_powers = pow_list(T[i+1][-1] / N, basis[i], N)
-        sum_powers += x_powers
     coefs = Zp.array([[w_powers[(j * k) % N].value for k in range(N)] for j in range(n)])   ## TODO: vandermonde ff array
+    sum_powers = np.sum(np.fromiter((pow_list(T[i+1][-1] / N, basis[i], N) for i in range(m)), 'O'))
     x = coefs @ sum_powers
     Ax_bounded_by_b = mpc.all((A @ x <= b * cd).tolist())      ## TODO: np.all
     x_nonnegative = mpc.all((x >= 0).tolist())
 
     logging.info('Dual solution y')
     coefs = Zp.array([[w_powers[((n + i) * k) % N].value for k in range(N)] for i in range(m)])
-    sum_powers = np.sum(np.fromiter((pow_list(T[0][j] / N, cobasis[j], N) for j in range(n)), 'O'))   #TODO fix for Numpy 1.22, WSL
+    sum_powers = np.sum(np.fromiter((pow_list(T[0][j] / N, cobasis[j], N) for j in range(n)), 'O'))
     y = coefs @ sum_powers
     yA_bounded_by_c = mpc.all((y @ A >= c * cd).tolist())
     y_nonnegative = mpc.all((y >= 0).tolist())

demos/np_lpsolverfxp.py

@@ -192,18 +192,14 @@ async def main():
     print(f'max = {mx} (error {rel_error:.3%}) in {iteration} iterations')
 
     logging.info('Solution x')
-    x = secfxp.array(np.zeros((n,), dtype='O'))
-    for i in range(m):
-        u = mpc.unit_vector(basis[i], m + n)[:n]
-        x += T[i+1, -1] * mpc.np_fromlist(u)
+    x = np.sum(np.fromiter((T[i+1, -1] * mpc.np_fromlist(mpc.unit_vector(basis[i], m + n)[:n]) for i in range(m)), 'O'))
     cx = c @ x
     Ax = A @ x
     Ax_bounded_by_b = mpc.all((Ax <= 1.01 * b + 0.0001).tolist())
     x_nonnegative = mpc.all((x >= 0).tolist())
 
     logging.info('Dual solution y')
     y = np.sum(np.fromiter((T[0, j] * mpc.np_fromlist(mpc.unit_vector(cobasis[j], m + n)[n:]) for j in range(n)), 'O'))
-    #TODO: fix issue Numpy 1.20, see mpyc.numpy._fromiter()
     yb = y @ b
     yA = y @ A
     yA_bounded_by_c = mpc.all((yA >= np.where(c > 0, 1/1.01, 1.01) * c - 0.0001).tolist())

mpyc/__init__.py

@@ -114,6 +114,7 @@ def get_arg_parser():
         logging.basicConfig(format='{asctime} {message}', style='{', level=level, stream=sys.stdout)
         logging.debug(f'Set logging level to {level}: {logging.getLevelName(level)}')
         del ch, level
+    logging.debug(f'On {sys.platform=}')
 
     # Ensure numpy will not be loaded by mpyc.numpy, if demanded (saving resources).
     env_no_numpy = os.getenv('MPYC_NONUMPY') == '1'  # check if variable MPYC_NONUMPY is set

mpyc/numpy.py

@@ -165,10 +165,15 @@ def _item_shape(shape, key):
 
     if np.lib.NumpyVersion(np.__version__) < '1.23.0':
         def _fromiter(iterable, dtype, **kwargs):
-            if np.dtype(dtype) != np.object: # and dtype != 'O':
+            if np.dtype(dtype) != object:
                 return np.fromiter(iterable, dtype, **kwargs)
-            # No dtype=object for np.fromiter(), workaround via np.array():
-            return np.array(list(iterable), dtype=object)
+
+            # No dtype=object for np.fromiter(), workaround via 1D array:
+            x = list(iterable)
+            a = np.empty(len(x), dtype=object)
+            for i in range(len(x)):
+                a[i] = x[i]
+            return a
 
         np.fromiter = _fromiter
 

mpyc/runtime.py

@@ -3276,7 +3276,6 @@ def hop(a):
         # use default port for each local party
         m = options.M or 1
         if m > 1 and options.index is None:
-            import platform
             import subprocess
             # convert sys.flags into command line arguments
             flgmap = {'debug': 'd', 'inspect': 'i', 'interactive': 'i', 'optimize': 'O',
@@ -3292,8 +3291,14 @@ def hop(a):
             xopts = ['-X' + a + ('' if c is True else '=' + c) for a, c in sys._xoptions.items()]
             for i in range(m-1, 0, -1):
                 cmd_line = [sys.executable] + flags + xopts + argv + ['-I', str(i)]
-                if options.output_windows and platform.platform().startswith('Windows'):
-                    subprocess.Popen(['start'] + cmd_line, shell=True)
+                if options.output_windows and sys.platform.startswith(('win32', 'linux', 'darwin')):
+                    if sys.platform.startswith('win32'):
+                        subprocess.Popen(['start'] + cmd_line, shell=True)
+                    elif sys.platform.startswith('linux'):
+                        # TODO: check for other common Linux terminals
+                        subprocess.Popen(['gnome-terminal', '--'] + cmd_line)
+                    elif sys.platform.startswith('darwin'):
+                        subprocess.Popen(['open', '-a', 'Terminal', '--args'] + cmd_line)
                 elif options.output_file:
                     with open(f'party{options.M}_{i}.log', 'a') as f:
                         f.write('\n')