Changeset 2316


Ignore:
Timestamp:
Oct 31, 2014 11:01:43 AM (3 years ago)
Author:
tkr
Message:

Syncing with trunk at r2315

Location:
stable/5.6
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/5.6

  • stable/5.6/Dependencies

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/5.6/INSTALL

    r2249 r2316  
    156156=== SHARED MEMORY PARALLEL ===
    157157
    158   1. To compile a shared memory version of SYMPHONY using the autotools,
    159   simply use an OpenMP compliant compiler. Version 5.5 should work with any
    160   gcc compiler older then 4.2 by configuring with
     158 1. To compile a shared memory version of SYMPHONY, simply use an OpenMP compliant
     159 compiler. Version \VER\  builds with OpenMP support enabled automatically when
     160 the compiler provides it. This should be the case for all recent versions of
     161 gcc and recent Microsoft compilers. Clang on OS X does not support OpenMP,
     162 though it is possible to build a version that does yourself. You can manually
     163 enable or disable OpenMP support with configure options by doing, e.g.,
    161164
    162165 {{{./configure --enable-openmp}}}
    163166
    164 Note that this will be the default starting with release 5.6.0 when building
    165 with the gcc compiler, so it will then be technically unnecessary to add this
    166 option, though it never hurts. In the Microsoft Visual Studio, enable OpenMP
    167 support in the properties for the SYMPHONY projects (it doesn't need to be
    168 enabled for the dependent projects). In a future version, this will also be
    169 made the default.
     167 In the Microsoft Visual Studio, enable OpenMP
     168 support in the properties for the SYMPHONY projects (it doesn't need to be
     169 enabled for the dependent projects). In a future version, this will also be
     170 made the default.
    170171
    171172 2. Follow the instructions above for building and testing.
    172173
    173  3. To invoke SYMPHONY from the command-line with multiple threads, specify
    174  the number of threads with the '-p' option, i.e.,
    175 
    176 {{{bin/symphony -p 2 -F SYMPHONY/Datasets/sample.mps}}}
    177 
    178 Note that when more than 1 thread is used, the first thread is the "master"
    179 thread and only prints out periodic status messages, as well as doing some
    180 bookkeeping work. Therefore, it is recommended to always use at least two
    181 threads. Starting in version 5.6.0, the number of threads used will be
    182 automatically set equal to the number of available cores.
     174 3. To invoke SYMPHONY from the command-line with multiple threads, specify the
     175 number of \emph{additional} worker threads with the \code{-p} option, i.e.,
     176 invoking SYMPHONY with
     177
     178 {{{bin/symphony -p 2 -F SYMPHONY/Datasets/sample.mps}}}
     179
     180 will utilize two worker threads to process subproblems in parallel.
     181 When more than 1 thread is used, the first thread is the ``master''
     182 thread and only prints out periodic status messages, as well as doing some
     183 bookkeeping work. Therefore, it is recommended to always use at least one
     184 worker thread (\code{-p 1}}). Starting in version 5.6.0, the number of
     185 threads used is automatically set equal to the number of available cores if no
     186 option is specified. For a fully sequential run with just one thread, invoke
     187 SYMPHONY with
     188
     189 {{{bin/symphony -p 2 -F SYMPHONY/Datasets/sample.mps}}}
    183190
    184191=== DISTRIBUTED PARALLEL ===
  • stable/5.6/SYMPHONY

  • stable/5.6/SYMPHONY/README

    r2312 r2316  
    29294. Bug fix for reliability branching.
    3030
    31 5. Updates to externals to fix bugs in dependent projects.
     315. Bug fix for addition of column cuts
     32
     336. Updates to externals to fix bugs in dependent projects.
    3234
    3335Release 5.6.1
  • stable/5.6/SYMPHONY/test/unitTestSym.cpp

    r2272 r2316  
    1414
    1515#include "CoinPragma.hpp"
     16#include "CoinHelperFunctions.hpp"
    1617#include "SymConfig.h"
    1718
     
    133134    int test_status;
    134135    int symargc;
    135     const char* symargv[7];
     136    char* symargv[7];
    136137    testingMessage( "Testing MIPLIB files\n" );
    137138
     
    139140    /* assemble arguments for symphony: -T miplibdir, and -p 2 if we run the punittest */
    140141    symargc = 5;
    141     symargv[0] = argv[0];
     142    symargv[0] = CoinStrdup(argv[0]);
    142143    symargv[1] = "-T";
    143     symargv[2] = miplib3Dir.c_str();
     144    symargv[2] = CoinStrdup(miplib3Dir.c_str());
    144145    if( argv[0][0] == 'p' || argv[0][0] == 'P' ) {
    145146       symargv[3] = "-p";
     
    149150       symargv[4] = "0";
    150151    }
    151     sym_parse_command_line(env, symargc, const_cast<char**>(symargv));
     152    //sym_parse_command_line(env, symargc, const_cast<char**>(symargv));
    152153    sym_set_int_param(env, "verbosity", -10);
    153     sym_test(env, &test_status);
     154    sym_test(env, symargc, symargv, &test_status);
    154155
    155156#ifdef COIN_HAS_OSITESTS
Note: See TracChangeset for help on using the changeset viewer.