Changeset 2312

Timestamp:

Feb 11, 2010 11:26:25 AM (11 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:

• . (modified) (1 prop)
• scripts/kill_pyro_mip_servers (copied) (copied from coopr.misc/trunk/scripts/kill_pyro_mip_servers)
• scripts/launch_pyro_mip_servers (copied) (copied from coopr.misc/trunk/scripts/launch_pyro_mip_servers)
• scripts/pyro_mip_server (modified) (1 diff)
• util/README.txt (modified) (1 diff)
• util/coopr.py (modified) (1 diff)
• util/coopr_install (modified) (9 diffs)

coopr.misc/stable/2.2/scripts/pyro_mip_server

@@ -35 +35 @@
             raise ValueError, "Problem constructing solver `"+data.opt+"'"
         opt.mipgap = data.mipgap
+        opt.suffixes = data.suffixes
 
         # here is where we should set any options required by the solver, available

coopr.misc/stable/2.2/util/README.txt

@@ -1 +1 @@
 The coopr_install script is created by executing:
 
-  vpy_create coopr.py coopr_install
+  lbin vpy_create coopr.py coopr_install
 
 The vpy_create command is provided by the pyutilib.virtualenv package.

coopr.misc/stable/2.2/util/coopr.py

@@ -31 +31 @@
                 continue
             if sys.version_info < (2,6,4):
-                self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
+                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))
             else:
-                self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
+                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))
 
 

coopr.misc/stable/2.2/util/coopr_install

@@ -2606 +2606 @@
 #
 
+import commands
 import re
 import urllib2
@@ -2616 +2617 @@
 import errno
 import stat
+
+using_subversion = True
 
 #
@@ -2691 +2694 @@
 #
 def guess_release(svndir):
-    output = urllib2.urlopen(svndir).read()
-    if output=="":
-       return None
-    links = re.findall('\<li>\<a href[^>]+>[^\<]+\</a>',output)
-    versions = []
-    for link in links:
-        versions.append( re.split('>', link[:-5])[-1] )
+    if using_subversion:
+        output = commands.getoutput('svn ls '+svndir)
+        if output=="":
+            return None
+        #print output
+        versions = []
+        for link in re.split('/',output.strip()):
+            tmp = link.strip()
+            if tmp != '':
+                versions.append( tmp )
+        #print versions
+    else:
+        output = urllib2.urlopen(svndir, timeout=30).read()
+        if output=="":
+            return None
+        links = re.findall('\<li>\<a href[^>]+>[^\<]+\</a>',output)
+        versions = []
+        for link in links:
+            versions.append( re.split('>', link[:-5])[-1] )
     latest = None
     latest_str = None
@@ -2818 +2833 @@
     def guess_versions(self, offline=False):
         if not self.config.root is None:
+            if using_subversion:
+                rootdir_output = commands.getoutput('svn ls ' + self.config.root)
+            else:
+                rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read()
             try:
                 self.trunk = self.config.root+'/trunk'
@@ -2825 +2844 @@
                 self.trunk_root = None
             try:
-                if offline:
+                if offline or not 'stable' in rootdir_output:
                     raise IOError
                 self.stable = guess_release(self.config.root+'/stable')
@@ -2833 +2852 @@
                 self.stable_root = None
             try:
-                if offline:
+                if offline or not 'releases' in rootdir_output:
                     raise IOError
                 self.release = guess_release(self.config.root+'/releases')
@@ -2840 +2859 @@
             except (urllib2.HTTPError,IOError):
                 try:
-                    if offline:
+                    if offline or not 'tags' in rootdir_output:
                         raise IOError
                     self.release = guess_release(self.config.root+'/tags')
@@ -3619 +3638 @@
             parser.readfp(fp, '<default configuration>')
         elif not os.path.exists(file):
+            if not '/' in file and not self.config_file is None:
+                file = os.path.dirname(self.config_file)+"/"+file
             try:
-                output = urllib2.urlopen(file).read()
+                output = urllib2.urlopen(file, timeout=30).read()
             except Exception, err:
                 print "Problems opening configuration url:",file
@@ -3830 +3851 @@
                 continue
             if sys.version_info < (2,6,4):
-                self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
+                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))
             else:
-                self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
+                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))