Changeset 2312


Ignore:
Timestamp:
Feb 11, 2010 11:26:25 AM (10 years ago)
Author:
wehart
Message:

Merged revisions 2192-2311 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.misc/trunk

........

r2273 | wehart | 2010-02-05 17:39:52 -0700 (Fri, 05 Feb 2010) | 5 lines


Updating naming of CoinBazaar? projects. Although the user specifies 'neos' on the config line,
the project is really coin.neos.


Updating coopr_install with updates from pyutilib.virtualenv

........

r2276 | wehart | 2010-02-06 13:46:46 -0700 (Sat, 06 Feb 2010) | 3 lines


Updating coopr_install due to recent changes in pyutilib.virtualenv.
With this change, the --coin option works as expected.

........

r2282 | jwatson | 2010-02-08 11:27:51 -0700 (Mon, 08 Feb 2010) | 1 line


Adding propagation of the suffixes solver attribute to the pyro mip servers

........

r2286 | wehart | 2010-02-08 11:57:37 -0700 (Mon, 08 Feb 2010) | 2 lines


Eliminating some debugging IO.

........

r2294 | jwatson | 2010-02-09 14:25:49 -0700 (Tue, 09 Feb 2010) | 3 lines


Added two Python scripts that I've been using to launch and kill a set of pyro_mip_servers on a single multi-core host. Very useful, albeit restricted to linux.

........

Location:
coopr.misc/stable/2.2
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed
  • coopr.misc/stable/2.2

  • coopr.misc/stable/2.2/scripts/pyro_mip_server

    r2043 r2312  
    3535            raise ValueError, "Problem constructing solver `"+data.opt+"'"
    3636        opt.mipgap = data.mipgap
     37        opt.suffixes = data.suffixes
    3738
    3839        # here is where we should set any options required by the solver, available
  • coopr.misc/stable/2.2/util/README.txt

    r1893 r2312  
    11The coopr_install script is created by executing:
    22
    3   vpy_create coopr.py coopr_install
     3  lbin vpy_create coopr.py coopr_install
    44
    55The vpy_create command is provided by the pyutilib.virtualenv package.
  • coopr.misc/stable/2.2/util/coopr.py

    r2191 r2312  
    3131                continue
    3232            if sys.version_info < (2,6,4):
    33                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     33                self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
    3434            else:
    35                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     35                self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
    3636
    3737
  • coopr.misc/stable/2.2/util/coopr_install

    r2191 r2312  
    26062606#
    26072607
     2608import commands
    26082609import re
    26092610import urllib2
     
    26162617import errno
    26172618import stat
     2619
     2620using_subversion = True
    26182621
    26192622#
     
    26912694#
    26922695def guess_release(svndir):
    2693     output = urllib2.urlopen(svndir).read()
    2694     if output=="":
    2695        return None
    2696     links = re.findall('\<li>\<a href[^>]+>[^\<]+\</a>',output)
    2697     versions = []
    2698     for link in links:
    2699         versions.append( re.split('>', link[:-5])[-1] )
     2696    if using_subversion:
     2697        output = commands.getoutput('svn ls '+svndir)
     2698        if output=="":
     2699            return None
     2700        #print output
     2701        versions = []
     2702        for link in re.split('/',output.strip()):
     2703            tmp = link.strip()
     2704            if tmp != '':
     2705                versions.append( tmp )
     2706        #print versions
     2707    else:
     2708        output = urllib2.urlopen(svndir, timeout=30).read()
     2709        if output=="":
     2710            return None
     2711        links = re.findall('\<li>\<a href[^>]+>[^\<]+\</a>',output)
     2712        versions = []
     2713        for link in links:
     2714            versions.append( re.split('>', link[:-5])[-1] )
    27002715    latest = None
    27012716    latest_str = None
     
    28182833    def guess_versions(self, offline=False):
    28192834        if not self.config.root is None:
     2835            if using_subversion:
     2836                rootdir_output = commands.getoutput('svn ls ' + self.config.root)
     2837            else:
     2838                rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read()
    28202839            try:
    28212840                self.trunk = self.config.root+'/trunk'
     
    28252844                self.trunk_root = None
    28262845            try:
    2827                 if offline:
     2846                if offline or not 'stable' in rootdir_output:
    28282847                    raise IOError
    28292848                self.stable = guess_release(self.config.root+'/stable')
     
    28332852                self.stable_root = None
    28342853            try:
    2835                 if offline:
     2854                if offline or not 'releases' in rootdir_output:
    28362855                    raise IOError
    28372856                self.release = guess_release(self.config.root+'/releases')
     
    28402859            except (urllib2.HTTPError,IOError):
    28412860                try:
    2842                     if offline:
     2861                    if offline or not 'tags' in rootdir_output:
    28432862                        raise IOError
    28442863                    self.release = guess_release(self.config.root+'/tags')
     
    36193638            parser.readfp(fp, '<default configuration>')
    36203639        elif not os.path.exists(file):
     3640            if not '/' in file and not self.config_file is None:
     3641                file = os.path.dirname(self.config_file)+"/"+file
    36213642            try:
    3622                 output = urllib2.urlopen(file).read()
     3643                output = urllib2.urlopen(file, timeout=30).read()
    36233644            except Exception, err:
    36243645                print "Problems opening configuration url:",file
     
    38303851                continue
    38313852            if sys.version_info < (2,6,4):
    3832                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     3853                self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
    38333854            else:
    3834                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     3855                self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
    38353856
    38363857
Note: See TracChangeset for help on using the changeset viewer.