Changeset ed9df0 in git


Ignore:
Timestamp:
Apr 12, 2013, 12:53:26 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
9feb899ed7c9fb83b7268e98afca5dddad081970
Parents:
1b2216d2c860dbf849acc8cd3cfcfea342b7cf5b
Message:
fix: removed MPtcp
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/parallel.lib

    r1b2216 red9df0  
    4747
    4848            Supported linktypes are up to now \"ssi\" and \"mp\", see
    49             @ref{Ssi links} and @ref{MP links}.
     49            @ref{Ssi links}.
    5050
    5151            Servers:
     
    7272            finished \"at the same time\". It may contain less than N results in
    7373            the case of timeout or errors occurring.
    74          @* MP links do not work with a 64 bit version of Singular. If you want
    75             to use MP links, make sure that MP is available. This can be checked
    76             by the Singular command @code{system(\"with\", \"MP\");}.
    7774         @* The check whether the jobs exceed the memory sizes given by
    7875            maxmemory is only done from time to time. This feature is
    7976            experimental and should be used with care.
    80 SEE ALSO: Ssi links, MP links, waitfirst, waitall
     77SEE ALSO: Ssi links, waitfirst, waitall
    8178KEYWORDS: parallelWaitN; Parallelization; Links, user interface;
    8279          Skeletons for parallelization; Distributed computing
     
    198195    else
    199196    {
    200       if(linktype == "ssi")
    201       {
     197      //if(linktype == "ssi")
     198      //{
    202199        link lcpu(i) = "ssi:tcp "+servers[i][1]+":"+servers[i][3];
    203       }
    204       else
    205       {
    206         if(program == "")
    207         {
    208           link lcpu(i) = "MPtcp:launch+" --MPhost "+servers[i][1];
    209         }
    210         else
    211         {
    212           link lcpu(i) = "MPtcp:launch+" --MPhost "+servers[i][1]
    213             +" --MPapplication "+servers[i][3];
    214         }
    215       }
     200      //}
    216201      open(lcpu(i));
    217202      write(lcpu(i), quote(system("cpu")));
     
    296281      if(server == "localhost")
    297282      {
    298         if(linktype == "ssi")
    299         {
     283        //if(linktype == "ssi")
     284        //{
    300285          link l(k) = "ssi:fork";
    301         }
    302         else
    303         {
    304           link l(k) = "MPtcp:fork";
    305         }
     286        //}
    306287      }
    307288      else
    308289      {
    309         if(linktype == "ssi")
    310         {
     290        //if(linktype == "ssi")
     291        //{
    311292          link l(k) = "ssi:tcp "+server+":"+program;
    312         }
    313         else
    314         {
    315           if(program == "")
    316           {
    317             link l(k) = "MPtcp:launch+" --MPhost "+server;
    318           }
    319           else
    320           {
    321             link l(k) = "MPtcp:launch+" --MPhost "+server
    322               +" --MPapplication "+program;
    323           }
    324         }
     293        //}
    325294      }
    326295      open(l(k));
     
    333302  if(havemaxmem)
    334303  {
    335     if(linktype == "ssi")
    336     {
     304    //if(linktype == "ssi")
     305    //{
    337306      link mempatrol = "ssi:fork";
    338     }
    339     else
    340     {
    341       link mempatrol = "MPtcp:fork";
    342     }
     307    //}
    343308    open(mempatrol);
    344309    write(mempatrol, quote(watchlinks()));
     
    582547         @ref{parallelWaitN} for details on optional arguments and other
    583548         remarks.
    584 SEE ALSO: Ssi links, MP links, waitfirst
     549SEE ALSO: Ssi links, waitfirst
    585550KEYWORDS: parallelWaitFirst; Parallelization; Links, user interface;
    586551          Skeletons for parallelization; Distributed computing
     
    614579         If commands is of type string, this is a shortcut for a list of size
    615580         @code{size(args)} whose entries are just this string.
    616 SEE ALSO: Ssi links, MP links, waitall
     581SEE ALSO: Ssi links, waitall
    617582KEYWORDS: parallelWaitAll; Parallelization; Links, user interface;
    618583          Skeletons for parallelization; Distributed computing
Note: See TracChangeset for help on using the changeset viewer.