Merge branch 'feature/safesinglecore'

Author: giadarol

ring_of_CPUs.py

@@ -4,17 +4,27 @@
 
 import communication_helpers as ch
 
-
 class RingOfCPUs(object):
-	def __init__(self, sim_content):
+	def __init__(self, sim_content, single_CPU_mode = False):
 
 		self.sim_content = sim_content
 		self.N_turns = sim_content.N_turns
 
 		self.sim_content.ring_of_CPUs = self
 
-		self.comm = MPI.COMM_WORLD
-		
+		# check if user is forcing simulation mode
+		if single_CPU_mode:
+			print '\nSingle_CPU_forced_by_user!\n'
+			self.comm = SingleCoreComminicator()
+		else:
+			from mpi4py import MPI
+			self.comm = MPI.COMM_WORLD
+			
+		#check if there is only one node
+		if self.comm.Get_size()==1:
+			#in case it is forced by user it will be rebound but there is no harm in that
+			self.comm = SingleCoreComminicator()
+			
 		# get info on the grid
 		self.N_nodes = self.comm.Get_size()
 		self.N_wkrs = self.N_nodes-1
@@ -23,7 +33,7 @@ def __init__(self, sim_content):
 		self.I_am_a_worker = self.myid!=self.master_id
 		self.I_am_the_master = not(self.I_am_a_worker)
 
-		# allocate buffers for communation
+		# allocate buffers for communication
 		self.N_buffer_float_size = 1000000
 		self.buf_float = np.array(self.N_buffer_float_size*[0.])
 		self.N_buffer_int_size = 100
@@ -147,6 +157,40 @@ def run(self):
 				if 'stop' in orders_from_master:
 					break
 
+# # usage
+# from Simulation import Simulation
+# sim_content = Simulation()
+
+# myring = RingOfCPUs(sim_content, N_turns)
+
+# myring.run()
+
+class SingleCoreComminicator(object):
+	def __init__(self):
+		print '\n\n\n'
+		print '****************************************'	
+		print '*** Using single core MPI simulator! ***'	
+		print '****************************************'
+		print '\n\n\n'
+		
+	def Get_size(self):
+		return 1
+	
+	def Get_rank(self):
+		return 0
+	
+	def Barrier(self):
+		pass
+
+	def Sendrecv(self, sendbuf, dest, sendtag, recvbuf, source, recvtag):
+		if dest!=0 or sendtag!=0 or source!=-1 or recvtag!=0:
+			raise ValueError('Input of Sendrecv not compatible with single core operation!!!')
+		recvbuf[:len(sendbuf)]=sendbuf
+		
+	def Bcast(self, buf, root=0):
+		if root!=0:
+			raise ValueError('Input of Bcast not compatible with single core operation!!!')
+		#Does not really have to do anything
 
 # # usage
 # from Simulation import Simulation

test_ring_with_objects/001_plot_results_from_000.py

@@ -46,17 +46,17 @@
 twax[0].plot(epsx, '-g')
 axes[0].set_xlabel('Turns')
 axes[0].set_ylabel(r'$\sigma_x$')
-twax[0].set_ylabel(r'$\varepsilon_y$')
+twax[0].set_ylabel(r'$\varepsilon_x$')
 axes[1].plot(sy)
 twax[1].plot(epsy, '-g')
 axes[1].set_xlabel('Turns')
-axes[1].set_ylabel(r'$\sigma_x$')
+axes[1].set_ylabel(r'$\sigma_y$')
 twax[1].set_ylabel(r'$\varepsilon_y$')
 axes[2].plot(sz)
 twax[2].plot(epsz, '-g')
 axes[2].set_xlabel('Turns')
-axes[2].set_ylabel(r'$\sigma_x$')
-twax[2].set_ylabel(r'$\varepsilon_y$')
+axes[2].set_ylabel(r'$\sigma_z$')
+twax[2].set_ylabel(r'$\varepsilon_z$')
 axes[0].grid()
 axes[1].grid()
 axes[2].grid()