Changeset 3580

Show
Ignore:
Timestamp:
10/26/2009 07:41:48 PM (1 month ago)
Author:
brian
Message:

Added LSF provider to the BatchSystem? infrastructure. This means all batch systems now use the same generic provider.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gip/trunk/gip/lib/python/gip/batch_systems/condor.py

    r3545 r3580  
    463463        return total, unclaimed, {} 
    464464 
     465    def bootstrap(self): 
     466        try: 
     467            condor_path = cp_get(self.cp, "condor", "condor_path", None) 
     468            if condor_path != None: 
     469                addToPath(condor_path) 
     470        except Exception, e: 
     471            log.exception(e) 
     472 

  • gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py

    r3579 r3580  
    1717from gip.batch_systems.forwarding import Forwarding 
    1818from gip.batch_systems.sge import SgeBatchSystem 
     19from gip.batch_systems.lsf import LsfBatchSystem 
    1920 
    2021log = getLogger("GIP.Batch") 
    …… 
    188189        elif impl == 'sge': 
    189190            batch = SgeBatchSystem(cp) 
     191        elif impl == 'lsf': 
     192            batch = LsfBatchSystem(cp) 
    190193        else: 
    191194            log.error("Unknown job manager: %s" % impl) 

  • gip/trunk/gip/providers/batch_system.py

    r3561 r3580  
    2020        log.error("Job manager not specified!") 
    2121        sys.exit(2) 
    22     if job_manager == 'lsf': 
    23         lsf_main() 
    24     else: 
    25         generic_main() 
     22    generic_main() 
    2623 
    2724if __name__ == '__main__': 

  • gip/trunk/test/test_configs/red.config.ini

    r2277 r3580  
    7979[Site Information] 
    8080city = Lincoln, NE 
    81 site_name = Nebraska 
     81site_name = Nebraska2 
     82resource_group_name = Nebraska 
    8283country = USA 
    8384longitude = -96.68