umaudemc 0.17.0__py3-none-any.whl → 0.17.1__py3-none-any.whl

umaudemc/command/sworker.py

@@ -99,10 +99,13 @@ class Worker:
 		         for k, qinfo in enumerate(program.queries)
 		         for idict, _ in make_parameter_dicts(qinfo, 1.0)]
 
+		# Compact arrays are used so that they can be sent through the socket
 		sums = array('d', [0.0] * len(qdata))
 		sum_sq = array('d', [0.0] * len(qdata))
 		counts = array('i', [0] * len(qdata))
 
+		converged = array('i')  # to store indices of converged queries
+
 		while True:
 
 			for _ in range(block):
@@ -120,14 +123,27 @@ class Worker:
 			# Check whether to continue
 			answer = conn.recv(1)
 
+			# Stop command
 			if answer == b's':
 				print('Done')
 				return
 
+			# Partial convergence
+			elif answer == b'p':
+				mcount = int.from_bytes(conn.recv(4), 'big')
+				# Safety check
+				if mcount <= len(qdata):
+					converged.frombytes(conn.recv(4 * mcount))
+					# Set the converged queries to avoid recomputing them
+					for index in converged:
+						qdata[index].converged = True
+					del converged[:]
+
 			elif answer != b'c':
 				usermsgs.print_error(f'Unknown command {answer.decode()}. Stopping.')
 				return
 
+			# Reset the accumulators for the next round
 			for k in range(len(qdata)):
 				sums[k] = 0
 				sum_sq[k] = 0

umaudemc/distributed.py

@@ -225,7 +225,7 @@ def setup_workers(args, initial_data, dspec, constants, seen_files, stack):
 			input_data['block'] = block_size  # if specified
 
 		input_data = json.dumps(input_data).encode()
-		sock.sendall(len(input_data).to_bytes(4) + input_data)
+		sock.sendall(len(input_data).to_bytes(4, 'big') + input_data)
 
 		# Send the relevant files
 		with sock.makefile('wb', buffering=0) as fobj:
@@ -249,6 +249,17 @@ def setup_workers(args, initial_data, dspec, constants, seen_files, stack):
 	return sockets
 
 
+class WorkerData:
+	"""Relevant data for the worker"""
+
+	__attrs__ = ('index', 'block', 'name')
+
+	def __init__(self, index, block, data):
+		self.index = index
+		self.block = data.get('block', block)
+		self.name = data.get('name')
+
+
 def distributed_check(args, initial_data, min_sim, max_sim, program, constants, seen_files):
 	"""Distributed statistical model checking"""
 
@@ -269,9 +280,10 @@ def distributed_check(args, initial_data, min_sim, max_sim, program, constants,
 		# Use a selector to wait for updates from any worker
 		selector = selectors.DefaultSelector()
 
-		for sock, data in zip(sockets, dspec['workers']):
-			selector.register(sock, selectors.EVENT_READ, data={'block': args.block} | data)
-			sock.send(b'c')
+		# Use a selector to be notified of the worker answers
+		for k, (sock, data) in enumerate(zip(sockets, dspec['workers'])):
+			selector.register(sock, selectors.EVENT_READ, data=WorkerData(k, args.block, data))
+			sock.send(b'c')  # continue command
 
 		buffer = array('d')
 		ibuffer = array('i')
@@ -283,6 +295,12 @@ def distributed_check(args, initial_data, min_sim, max_sim, program, constants,
 		nqueries = len(qdata)
 		num_sims = 0
 
+		# In order to tell the workers which queries have converged, we keep
+		# a list of indices of converged queries in cronological order and
+		# a list with the next index to be transmitted to each worker
+		converged_queries = array('i')
+		next_to_tell = [0] * len(sockets)
+
 		quantile = get_quantile_func()
 
 		while sockets:
@@ -294,35 +312,58 @@ def distributed_check(args, initial_data, min_sim, max_sim, program, constants,
 
 				answer = sock.recv(1)
 
+				# Block finished
 				if answer == b'b':
+					# The message is the concatenation of three arrays
+					# (sum, sum_sq, and counts) of nqueries elements each.
+					# sum and sum_sq contain 64-bit floating-point numbers
+					# and counts contains 32-bit integer numbers
 					data = sock.recv(24 * nqueries)
 					buffer.frombytes(data[:16 * nqueries])
 					ibuffer.frombytes(data[16 * nqueries:])
 
+					# Some queries may have not been evaluated because
+					# they converged, but it is easier to sum their zeros
 					for k in range(nqueries):
 						qdata[k].sum += buffer[k]
 						qdata[k].sum_sq += buffer[nqueries + k]
 						qdata[k].n += ibuffer[k]
 
-					num_sims += key.data['block']
+					num_sims += key.data.block
 
 					del buffer[:]
 					del ibuffer[:]
-					finished.append(key.fileobj)
+					finished.append(key)
 
 				else:
-					usermsgs.print_error(f'Server {key.data["name"]} disconnected or misbehaving')
+					usermsgs.print_error(f'Server {key.data.name} disconnected or misbehaving')
 					selector.unregister(key.fileobj)
 					sockets.remove(key.fileobj)
 
 			# Check whether the simulation has converged
-			converged = check_interval(qdata, num_sims, min_sim, args.alpha, quantile, args.verbose)
+			converged, which = check_interval(qdata, num_sims, min_sim, args.alpha, quantile, args.verbose)
+
+			# More converged queries
+			if which:
+				converged_queries.extend(which)
 
 			if converged or max_sim and num_sims >= max_sim:
 				break
 
-			for sock in finished:
-				sock.send(b'c')
+			for key in finished:
+				index = key.data.index
+
+				# Transmit which queries have converged
+				if next_to_tell[index] != len(converged_queries):
+					# We send p followed by the number of indices and then the indices
+					key.fileobj.send(b'p'
+						+ (len(converged_queries) - next_to_tell[index]).to_bytes(4, 'big')
+						+ converged_queries[next_to_tell[index]:].tobytes())
+					next_to_tell[index] = len(converged_queries)
+
+				# Continue without change
+				else:
+					key.fileobj.send(b'c')
 
 			finished.clear()
 

umaudemc/simulators.py

@@ -164,9 +164,9 @@ class UmaudemcSimulator(BaseSimulator):
 	def __init__(self, initial, graph, assigner):
 		super().__init__(initial)
 
-		self.state_nr = 0
 		self.graph = graph
 		self.assigner = assigner
+		self.state_nr = 0
 		self.time = 0.0
 
 	def restart(self):
@@ -310,9 +310,8 @@ class PMaudeSimulator(BaseSimulator):
 		self.nat_kind = nat_kind
 		self.val = val
 
-		# Prepares the initial term
-		self.state = self.initial.copy()
-		self.state.rewrite()
+		# restart must be called before running
+		self.state = None
 
 		# Try to find Maude's random symbol for calculating random(1). If the
 		# PMaude specification only reduces random(0), even after resetting the

umaudemc/statistical.py

@@ -139,8 +139,10 @@ def check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose):
 
 	# Whether the size of the confidence interval for all queries have converged
 	converged = True
+	# Which queries have converged
+	which = []
 
-	for query in qdata:
+	for k, query in enumerate(qdata):
 		# This query has already converged
 		if query.converged:
 			continue
@@ -164,6 +166,7 @@ def check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose):
 		if query.h <= query.delta and query.n >= min_sim:
 			query.converged = True
 			query.discarded = num_sims - query.n
+			which.append(k)
 		else:
 			converged = False
 
@@ -174,7 +177,10 @@ def check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose):
 		                    f' σ={" ".join(str(q.s) for q in qdata)}'
 		                    f' r={" ".join(str(q.h) for q in qdata)}')
 
-	return converged
+		for k in which:
+			print(f'  Query {qdata[k].query + 1} has converged')
+
+	return converged, which
 
 
 def run_single(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, block_size,
@@ -204,7 +210,7 @@ def run_single(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, blo
 					query.sum_sq += value * value
 					query.n += 1
 
-		converged = check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose)
+		converged, _ = check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose)
 
 		if converged or max_sim and num_sims >= max_sim:
 			break
@@ -215,7 +221,7 @@ def run_single(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, blo
 	return num_sims, qdata
 
 
-def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, barrier, more, dump=None):
+def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, barrier, more, convergents, dump=None):
 	"""Entry point of a calculating thread"""
 
 	maude.setRandomSeed(seed)
@@ -258,6 +264,12 @@ def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, ba
 		if not more.value:
 			break
 
+		# Disable queries that have converged
+		for k in range(len(qdata)):
+			if convergents[k] == -1:
+				break
+			qdata[convergents[k]].converged = True
+
 		# Continue for a next block
 		block = block_size
 
@@ -284,12 +296,14 @@ def run_parallel(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, b
 	queue = mp.Queue()
 	barrier = mp.Barrier(jobs + 1)
 	more = mp.Value('b', False, lock=False)
+	convergents = mp.Array('i', [-1] * len(qdata), lock=False)
 
 	rest, rest_block = num_sims % jobs, block_size % jobs
 	processes = [mp.Process(target=thread_main,
 	                        args=(program, qdata, simulator, num_sims // jobs + (k < rest),
 	                              block_size // jobs + (k < rest_block),
-	                              seeds[k], queue, barrier, more, dumps[k])) for k in range(jobs)]
+	                              seeds[k], queue, barrier, more, convergents, dumps[k]))
+	             for k in range(jobs)]
 
 	# Start all processes
 	for p in processes:
@@ -305,7 +319,7 @@ def run_parallel(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, b
 				query.sum_sq += sum_sq[k]
 				query.n += counts[k]
 
-		converged = check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose)
+		converged, which = check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose)
 
 		if converged or max_sim and num_sims >= max_sim:
 			break
@@ -313,6 +327,11 @@ def run_parallel(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, b
 		num_sims += block_size
 
 		more.value = True
+		# Inform which queries have converged
+		for k, qindex in enumerate(which):
+			convergents[k] = qindex
+		convergents[len(which)] = -1
+
 		barrier.wait()
 
 	more.value = False

{umaudemc-0.17.0.dist-info → umaudemc-0.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umaudemc
-Version: 0.17.0
+Version: 0.17.1
 Summary: Unified Maude model-checking utility
 Author-email: ningit <ningit@users.noreply.github.com>
 License-Expression: GPL-3.0-or-later

{umaudemc-0.17.0.dist-info → umaudemc-0.17.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ umaudemc/api.py,sha256=naZ5edEbvx-S-NU29yAAJtqglfYnSAYVS2RJNyxJMQQ,19893
 umaudemc/backends.py,sha256=mzJkALYwcKPInT0lBiRsCxJSewKvx5j_akQsqWN1Ezo,4590
 umaudemc/common.py,sha256=UcIf7hTpP2qjcT9u_9-UcYR0nNeosx1xRZW7wsuT2bE,7305
 umaudemc/counterprint.py,sha256=vVqM_UjGRk_xeftFxBGI5m6cQXV7mf8KvbQ_fvAvSQk,9226
-umaudemc/distributed.py,sha256=aCvU1TaM5SZhAtWahclyANc1I0YXj8SuPXO_VjaqDdo,9115
+umaudemc/distributed.py,sha256=jUxVUHtPRefwxNYZmU0ErePre6FTmH5S8RX6ADBL1vA,10611
 umaudemc/formatter.py,sha256=nbQlIsR5Xv18OEcpJdnTDGqO9xGL_amvBGFMU2OmheU,6026
 umaudemc/formulae.py,sha256=jZPPDhjgsb7cs5rWvitiQoO0fd8JIlK98at2SN-LzVE,12156
 umaudemc/grapher.py,sha256=K1chKNNlEzQvfOsiFmRPJmd9OpxRIrg6OyiMW6gqOCU,4348
@@ -17,8 +17,8 @@ umaudemc/probabilistic.py,sha256=MNvFeEd84-OYedSnyksZB87UckPfwizVNJepCItgRy8,293
 umaudemc/pyslang.py,sha256=ABSXYUQO2TmDq8EZ3EpVZV8NecZ0p0gERlSvLUIVAm8,87970
 umaudemc/quatex.py,sha256=7n7ugusjFUyO5jqKeb6-O8hdH4vj2fgnc-V_Z41w-40,27271
 umaudemc/resources.py,sha256=qKqvgLYTJVtsQHQMXFObyCLTo6-fssQeu_mG7tvVyD0,932
-umaudemc/simulators.py,sha256=K8NFgwvvTgj1lueksnWOSc-7bo6VxS1_CA9g-6l5umc,14367
-umaudemc/statistical.py,sha256=aogqx2JCur9Lw9ZfOI6jaggwLcVTflDSs_Mn7yCmOGE,10815
+umaudemc/simulators.py,sha256=1_DKaO2JYxSQHcbTE2wbB_lgd_kFBi40PPjOMvqOgaE,14341
+umaudemc/statistical.py,sha256=I_C1ymz-ue-XaX0zF7lyQUce57-BdEWhctKg6yG2c_A,11371
 umaudemc/terminal.py,sha256=B4GWLyW4Sdymgoavj418y4TI4MnWqNu3JS4BBoSYeTc,1037
 umaudemc/usermsgs.py,sha256=h4VPxljyKidEI8vpPcToKJA6mcLu9PtMkIh6vH3rDuA,719
 umaudemc/webui.py,sha256=XlDV87tOOdcclHp2_oerrvHwRmCZdqAR4PppqeZm47A,11072
@@ -41,7 +41,7 @@ umaudemc/command/check.py,sha256=PyaPDMw5OnPxSIZ10U4we0b5tTrjnYKAtAeQkJh2uLE,120
 umaudemc/command/graph.py,sha256=JqGzESC2sn-LBh2sqctrij03ItzwDO808s2qkNKUle0,6112
 umaudemc/command/pcheck.py,sha256=eV4e4GcOHanP4hcIhMKd5Js22_ONac6kYj70FXun3mY,7274
 umaudemc/command/scheck.py,sha256=mmAzCdGdIHgKbsyEi0uW-jcj9X0MSc-EEkEPR-EiB8U,6208
-umaudemc/command/sworker.py,sha256=1icakFDO_qSr4ga-5Cu6eDfLirjLPJLNtO7OkbwTUQQ,4651
+umaudemc/command/sworker.py,sha256=uxw8gmacghUMvM0MUqM-AXX-w9xOA-10Mj-ExPWoNUI,5196
 umaudemc/command/test.py,sha256=Ru21JXNF61F5N5jayjwxp8okIjOAvuZuAlV_5ltQ-GU,37088
 umaudemc/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umaudemc/data/opsem.maude,sha256=geDP3_RMgtS1rRmYOybJDCXn_-dyHHxg0JxfYg1ftv0,27929
@@ -52,9 +52,9 @@ umaudemc/data/smcgraph.js,sha256=iCNQNmsuGdL_GLnqVhGDisediFtedxw3C24rxSiQwx8,667
 umaudemc/data/smcview.css,sha256=ExFqrMkSeaf8VxFrJXflyCsRW3FTwbv78q0Hoo2UVrM,3833
 umaudemc/data/smcview.js,sha256=_fHum1DRU1mhco-9-c6KqTLgiC5u_cCUf61jIK7wcIQ,14509
 umaudemc/data/templog.maude,sha256=TZ-66hVWoG6gp7gJpS6FsQn7dpBTLrr76bKo-UfHGcA,9161
-umaudemc-0.17.0.dist-info/licenses/LICENSE,sha256=MrEGL32oSWfnAZ0Bq4BZNcqnq3Mhp87Q4w6-deXfFnA,17992
-umaudemc-0.17.0.dist-info/METADATA,sha256=HMhQv0StUz5ODf2H8vanIt_FnkK6p7BDZd-nkc8o0Fg,1654
-umaudemc-0.17.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-umaudemc-0.17.0.dist-info/entry_points.txt,sha256=8rYRlLkn4orZtAoujDSeol1t_UFBrK0bfjmLTNv9B44,52
-umaudemc-0.17.0.dist-info/top_level.txt,sha256=Yo_CF78HLGBSblk3890qLcx6XZ17zHCbGcT9iG8sfMw,9
-umaudemc-0.17.0.dist-info/RECORD,,
+umaudemc-0.17.1.dist-info/licenses/LICENSE,sha256=MrEGL32oSWfnAZ0Bq4BZNcqnq3Mhp87Q4w6-deXfFnA,17992
+umaudemc-0.17.1.dist-info/METADATA,sha256=bW8k2ctMQZPpFsXIHJ9wiBc2HoDwqw3VZHNyPgx75qk,1654
+umaudemc-0.17.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+umaudemc-0.17.1.dist-info/entry_points.txt,sha256=8rYRlLkn4orZtAoujDSeol1t_UFBrK0bfjmLTNv9B44,52
+umaudemc-0.17.1.dist-info/top_level.txt,sha256=Yo_CF78HLGBSblk3890qLcx6XZ17zHCbGcT9iG8sfMw,9
+umaudemc-0.17.1.dist-info/RECORD,,

{umaudemc-0.17.0.dist-info → umaudemc-0.17.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any