Merge remote-tracking branch 'origin/feature/shared_memory' into feature/shared_memory

Author: gjbex

source-code/multiprocessing/julia_shmem.py

@@ -18,12 +18,12 @@ def init_z(nr_points):
 
 def compute_partial_julia(args):
     z_shmem, n_shmem, idx_begin, idx_end, max_iters, max_norm = args
-    z_sizeof = np.dtype(np.complex).itemsize
+    z_size = np.dtype(np.complex).itemsize
     z_array = np.ndarray((idx_end - idx_begin, ), dtype=np.complex,
-                         buffer=z_shmem.buf[z_sizeof*idx_begin:z_sizeof*idx_end])
-    n_sizeof = np.dtype(np.int32).itemsize
+                         buffer=z_shmem.buf[z_size*idx_begin:z_size*idx_end])
+    n_size = np.dtype(np.int32).itemsize
     n = np.ndarray((idx_end - idx_begin, ), dtype=np.int32,
-                   buffer=n_shmem.buf[n_sizeof*idx_begin:n_sizeof*idx_end])
+                   buffer=n_shmem.buf[n_size*idx_begin:n_size*idx_end])
     for i, z in enumerate(z_array):
         while (n[i] <= max_iters and np.abs(z) <= max_norm):
             z = z**2 - 0.622772 + 0.42193j
@@ -34,14 +34,14 @@ def compute_partial_julia(args):
 def compute_julia(nr_points=100, pool_size=2, work_size=15, verbose=False,
                   max_iters=255, max_norm=2.0):
     size = nr_points**2
-    complex_size = np.dtype(np.complex).itemsize
-    int32_size = np.dtype(np.int32).itemsize
+    z_size = np.dtype(np.complex).itemsize
+    n_size = np.dtype(np.int32).itemsize
     with SharedMemoryManager() as shmem_mgr:
         with mp.Pool(pool_size) as pool:
-            z_shmem = shmem_mgr.SharedMemory(size=complex_size*size)
+            z_shmem = shmem_mgr.SharedMemory(size=z_size*size)
             z_buf = np.ndarray((size, ), dtype=np.complex, buffer=z_shmem.buf)
             z_buf[:] = init_z(nr_points)
-            n_shmem = shmem_mgr.SharedMemory(size=int32_size*size)
+            n_shmem = shmem_mgr.SharedMemory(size=n_size*size)
             n_buf = np.ndarray((size, ), dtype=np.int32, buffer=n_shmem.buf)
             n_buf[:] = np.zeros((size, ), dtype=np.int32)
             args = [(z_shmem, n_shmem, i*work_size, min(z_buf.size, (i + 1)*work_size),