| 
					
				 | 
			
			
				@@ -11,12 +11,13 @@ if [[ $BASH_SOURCE = */* ]]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   cd -- "${BASH_SOURCE%/*}/" || exit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 fi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-# If the master NUMA commands are set, use them for Floram 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-if [ "$NUMA_P0" != "" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    export FLORAM_NUMA_P0="$NUMA_P0" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+# If the Duoram NUMA commands are set, but Floram-specific ones are not, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+# use them for Floram 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+if [ "$FLORAM_NUMA_P0" == "" -a "$DUORAM_NUMA_P0" != "" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    export FLORAM_NUMA_P0="$DUORAM_NUMA_P0" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 fi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-if [ "$NUMA_P1" != "" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    export FLORAM_NUMA_P1="$NUMA_P1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+if [ "$FLORAM_NUMA_P1" == "" -a "$DUORAM_NUMA_P1" != "" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    export FLORAM_NUMA_P1="$DUORAM_NUMA_P1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 fi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 # Allow running only subsets of the experiment suite.  Valid values are 
			 |