Changeset 6363

Timestamp:

10/21/10 12:29:51 (14 years ago)

Author:

Eric.Larour

Message:

added hyperthreading

File:

• issm/trunk/src/m/classes/clusters/pfe.m (modified) (4 diffs)

issm/trunk/src/m/classes/clusters/pfe.m

@@ -22 +22 @@
                  bbftp=0;
                  numstreams=8;
+                 hyperthreading=0;
          end
          properties (SetAccess=private) 
@@ -56 +57 @@
                          disp(sprintf('    executionpath: %s',cluster.executionpath));
                          disp(sprintf('    interactive: %i',cluster.interactive));
+                         disp(sprintf('    hyperthreading: %i',cluster.hyperthreading));
                  end
                  %}}}
@@ -68 +70 @@
                          %now, check cluster.cpuspernode according to processor type
                          if (strcmpi(cluster.processor,'har') | strcmpi(cluster.processor,'neh')),
-                                 if ((cluster.cpuspernode>8 ) | (cluster.cpuspernode<1)),
-                                         error('IsConsistent error message: cpuspernode should be between 1 and 8 for ''neh'' and ''har'' processors');
+                                 if cluster.hyperthreading,
+                                         if ((cluster.cpuspernode>16 ) | (cluster.cpuspernode<1)),
+                                                 error('IsConsistent error message: cpuspernode should be between 1 and 16 for ''neh'' and ''har'' processors in hyperthreading mode');
+                                         end
+                                 else
+                                         if ((cluster.cpuspernode>8 ) | (cluster.cpuspernode<1)),
+                                                 error('IsConsistent error message: cpuspernode should be between 1 and 8 for ''neh'' and ''har'' processors');
+                                         end
                                  end
                          elseif strcmpi(cluster.processor,'wes'),
-                                 if ((cluster.cpuspernode>12 ) | (cluster.cpuspernode<1)),
-                                         error('IsConsistent error message: cpuspernode should be between 1 and 12 for ''wes'' processors');
+                                 if cluster.hyperthreading,
+                                         if ((cluster.cpuspernode>24 ) | (cluster.cpuspernode<1)),
+                                                 error('IsConsistent error message: cpuspernode should be between 1 and 24 for ''wes'' processors in hyperthreading mode');
+                                         end
+                                 else
+                                         if ((cluster.cpuspernode>12 ) | (cluster.cpuspernode<1)),
+                                                 error('IsConsistent error message: cpuspernode should be between 1 and 12 for ''wes'' processors');
+                                         end
                                  end
                          else
@@ -215 +229 @@
                         %copy files from cluster to present directory
                         if ~cluster.bbftp,
+                                packages
+                                cluster.name 
+                                cluster.login
+                                cluster.port 
+                                directory
                                 issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
                         else