JSOC/localize.py - diff

Return to localize.py CVS log

Up to [Development] / JSOC

Diff for /JSOC/localize.py between version 1.24 and 1.25

version 1.24, 2016/04/18 18:14:44

version 1.25, 2016/09/23 16:22:18

Line 77 PERL_FXNS_B = """sub get

}

1;"""

PY_BINPATH = '#/usr/bin/python\n'

PY_BINPATH = '#!/usr/bin/python\n'

PY_FXNS_A = """

class DRMSParams(object):

Line 105 PY_FXNS_C = """ def getBool(self, nam

return None

"""

SH_BINPATH = '#!/bin/bash\n'

SUMRM_COMMENT = """# This is the configuration file for the sum_rm program. It was auto-generated by the DRMS master configure script.

# It controls the behavior of the sum_rm program, and is loaded each time sum_rm runs. To change the

Line 264 def createPyConst(key, val, keyColLen, s

Line 266 def createPyConst(key, val, keyColLen, s

status = bool(0)

return key + ' = ' + spaces + val + '\n'

def createShConst(key, val, status):

status = bool(0)

return key + '=' + val + '\n'

def isSupportedPlat(plat):

regexp = re.compile(r"\s*(^x86_64|^ia32|^ia64|^avx)", re.IGNORECASE)

matchobj = regexp.match(plat);

Line 299 def processMakeParam(mDefs, key, val, pl

Line 306 def processMakeParam(mDefs, key, val, pl

machDict[varMach] = {}

machDict[varMach][varName] = varValu

def processParam(cfgfile, line, regexpQuote, regexp, keymap, defs, cDefs, mDefsGen, mDefsMake, perlConstSection, perlInitSection, pyConstSection, pyInitSection, platDict, machDict, section):

def processParam(cfgfile, line, regexpQuote, regexp, keymap, defs, cDefs, mDefsGen, mDefsMake, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection, platDict, machDict, section):

status = 0

if ''.join(section) == 'defs' or not cfgfile:

Line 361 def processParam(cfgfile, line, regexpQu

Line 368 def processParam(cfgfile, line, regexpQu

# Python file

pyConstSection.extend(list(createPyConst(key, "'" + val + "'", 40, status)))

# Shell source file

shConstSection.extend(list(createShConst(key, "'" + val + "'", status)))

if status:

raise Exception('paramNameTooLong', key)

Line 465 def determineSection(line, regexpDefs, r

Line 475 def determineSection(line, regexpDefs, r

# projMkRules is the list containing the make_basic.mk content.

# projRules is the list containing the Rules.mk content.

# projTargert is the list containing the target.mk content.

def parseConfig(fin, keymap, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection):

def parseConfig(fin, keymap, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection):

rv = bool(0)

# Open required config file (config.local)

Line 526 def parseConfig(fin, keymap, addenda, de

Line 536 def parseConfig(fin, keymap, addenda, de

# Intentional fall through to next if statement

if section == 'defs' or section == 'make':

iscfg = bool(1)

ppRet = processParam(iscfg, line, regexpQuote, regexp, keymap, defs, cDefs, mDefsGen, mDefsMake, perlConstSection, perlInitSection, pyConstSection, pyInitSection, platDict, machDict, section)

ppRet = processParam(iscfg, line, regexpQuote, regexp, keymap, defs, cDefs, mDefsGen, mDefsMake, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection, platDict, machDict, section)

if ppRet:

break

Line 599 def parseConfig(fin, keymap, addenda, de

Line 609 def parseConfig(fin, keymap, addenda, de

raise

if not rv:

if not xml is None:

# Always create a Rules.mk and target.mk, even if no proj XML is provided. All builds should have the proj/example and

# Process xml.

# proj/cookbook directories.

projRules.extend(list(RULESPREFIX))

projTarget.extend(list(TARGETPREFIX))

if not xml is None:

# Process xml.

rv = processXML(xml, projRules, projTarget)

projRules.extend(RULESSUFFIX)

Line 612 def parseConfig(fin, keymap, addenda, de

Line 625 def parseConfig(fin, keymap, addenda, de

iscfg = bool(0)

for key in addenda:

item = key + ' ' + addenda[key]

ppRet = processParam(iscfg, item, regexpQuote, regexp, keymap, defs, cDefs, mDefsGen, mDefsMake, perlConstSection, perlInitSection, pyConstSection, pyInitSection, platDict, machDict, 'defs')

ppRet = processParam(iscfg, item, regexpQuote, regexp, keymap, defs, cDefs, mDefsGen, mDefsMake, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection, platDict, machDict, 'defs')

if ppRet:

break;

Line 779 def configureComps(defs, mDefs):

Line 792 def configureComps(defs, mDefs):

return rv

def writeParamsFiles(base, cfile, mfile, pfile, pyfile, cDefs, mDefsGen, mDefsMake, mDefsComps, perlConstSection, perlInitSection, pyConstSection, pyInitSection):

def writeParamsFiles(base, cfile, mfile, pfile, pyfile, shfile, cDefs, mDefsGen, mDefsMake, mDefsComps, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection):

rv = bool(0)

# Merge mDefsGen, mDefsMake, and mDefsComps into a single string with compiler configuration first, general parameters next, then

Line 787 def writeParamsFiles(base, cfile, mfile,

Line 800 def writeParamsFiles(base, cfile, mfile,

mDefs = '\n# Compiler Selection\n' + ''.join(mDefsComps) + '\n\n# General Parameters\n' + ''.join(mDefsGen) + '\n\n# Parameters to Configure make\n' + ''.join(mDefsMake)

try:

with open(cfile, 'w') as cout, open(mfile, 'w') as mout, open(pfile, 'w') as pout, open(pyfile, 'w') as pyout:

with open(cfile, 'w') as cout, open(mfile, 'w') as mout, open(pfile, 'w') as pout, open(pyfile, 'w') as pyout, open(shfile, 'w') as shout:

# C file of macros

print(C_PREFIX, file=cout)

print('/* This file contains a set of preprocessor macros - one for each configuration parameter. */\n', file=cout)

Line 827 def writeParamsFiles(base, cfile, mfile,

Line 840 def writeParamsFiles(base, cfile, mfile,

print(PY_FXNS_B, file=pyout)

print(PY_FXNS_C, file=pyout)

# Shell (bash) source file

print(SH_BINPATH, file=shout)

print(PREFIX, file=shout)

print('# This file contains a set of variable assignments - one for each configuration parameter.\n', file=shout)

print(''.join(shConstSection), file=shout)

except IOError as exc:

type, value, traceback = sys.exc_info()

print(exc.strerror, file=sys.stderr)

Line 989 def generateSumRmCfg(defs):

Line 1008 def generateSumRmCfg(defs):

return rv

def configureNet(cfgfile, cfile, mfile, pfile, pyfile, pCfile, pMfile, pRfile, pTfile, base, keymap, createSumRmCfg):

def configureNet(cfgfile, cfile, mfile, pfile, pyfile, shfile, pCfile, pMfile, pRfile, pTfile, base, keymap, createSumRmCfg):

rv = bool(0)

defs = {}

Line 1005 def configureNet(cfgfile, cfile, mfile,

Line 1024 def configureNet(cfgfile, cfile, mfile,

perlInitSection = list()

pyConstSection = list()

pyInitSection = list()

shConstSection = list()

addenda = {}

# There are three parameters that were not included in the original config.local parameter set, for some reason.

Line 1022 def configureNet(cfgfile, cfile, mfile,

Line 1042 def configureNet(cfgfile, cfile, mfile,

try:

with open(cfgfile, 'r') as fin:

# Process configuration parameters

rv = parseConfig(fin, keymap, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection)

rv = parseConfig(fin, keymap, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection)

if not rv:

# Must add a parameter for the SUMS_MANAGER UID (for some reason). This must be done after the

# config file is processed since an input to getMgrUIDLine() is one of the config file's

Line 1030 def configureNet(cfgfile, cfile, mfile,

Line 1050 def configureNet(cfgfile, cfile, mfile,

uidParam = {}

rv = getMgrUIDLine(defs, uidParam)

if rv == bool(0):

rv = parseConfig(None, keymap, uidParam, defs, cDefs, mDefsGen, None, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection)

rv = parseConfig(None, keymap, uidParam, defs, cDefs, mDefsGen, None, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection)

# Configure the compiler-selection make variables.

if not rv:

rv = configureComps(defs, mDefsComps)

# Write out the parameter files.

if not rv:

rv = writeParamsFiles(base, cfile, mfile, pfile, pyfile, cDefs, mDefsGen, mDefsMake, mDefsComps, perlConstSection, perlInitSection, pyConstSection, pyInitSection)

rv = writeParamsFiles(base, cfile, mfile, pfile, pyfile, shfile, cDefs, mDefsGen, mDefsMake, mDefsComps, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection)

# Write out the project-specific make files (make_basic.mk, Rules.mk, and target.mk).

if not rv:

Line 1074 def configureNet(cfgfile, cfile, mfile,

Line 1094 def configureNet(cfgfile, cfile, mfile,

return rv

def configureSdp(cfgfile, cfile, mfile, pfile, pyfile, pCfile, pMfile, pRfile, pTfile, base):

def configureSdp(cfgfile, cfile, mfile, pfile, pyfile, shfile, pCfile, pMfile, pRfile, pTfile, base):

rv = bool(0)

defs = {}

Line 1090 def configureSdp(cfgfile, cfile, mfile,

Line 1110 def configureSdp(cfgfile, cfile, mfile,

perlInitSection = list()

pyConstSection = list()

pyInitSection = list()

shConstSection = list()

addenda = {}

Line 1104 def configureSdp(cfgfile, cfile, mfile,

Line 1125 def configureSdp(cfgfile, cfile, mfile,

try:

with open(cfgfile, 'r') as fin:

rv = parseConfig(fin, None, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection)

rv = parseConfig(fin, None, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection)

if not rv:

# Must add a parameter for the SUMS_MANAGER UID (for some reason)

uidParam = {}

rv = getMgrUIDLine(defs, uidParam)

if not rv:

rv = parseConfig(None, None, uidParam, defs, cDefs, mDefsGen, None, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection)

rv = parseConfig(None, None, uidParam, defs, cDefs, mDefsGen, None, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection)

# Configure the compiler-selection make variables.

if not rv:

Line 1119 def configureSdp(cfgfile, cfile, mfile,

Line 1140 def configureSdp(cfgfile, cfile, mfile,

# Write out the parameter files.

if not rv:

rv = writeParamsFiles(base, cfile, mfile, pfile, pyfile, cDefs, mDefsGen, mDefsMake, mDefsComps, perlConstSection, perlInitSection, pyConstSection, pyInitSection)

rv = writeParamsFiles(base, cfile, mfile, pfile, pyfile, shfile, cDefs, mDefsGen, mDefsMake, mDefsComps, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection)

# Write out the project-specific make files (make_basic.mk, Rules.mk, and target.mk).

if not rv:

Line 1186 if rv == RET_SUCCESS:

Line 1207 if rv == RET_SUCCESS:

mfile = optD['dir'] + '/' + optD['base'] + '.mk'

pfile = optD['dir'] + '/' + optD['base'] + '.pm'

pyfile = optD['dir'] + '/' + optD['base'] + '.py'

shfile = optD['dir'] + '/' + optD['base'] + '.sh'

pCfile = optD['dir'] + '/configure'

pMfile = optD['dir'] + '/make_basic.mk'

pRfile = optD['dir'] + '/Rules.mk'

Line 1216 if rv == RET_SUCCESS:

Line 1238 if rv == RET_SUCCESS:

# We also need to set the UID of the SUMS manager. We have the name of the

# SUMS manager (it is in the configuration file)

configureNet(NET_CFG, cfile, mfile, pfile, pyfile, pCfile, pMfile, pRfile, pTfile, optD['base'], keymap, 'server' in optD)

configureNet(NET_CFG, cfile, mfile, pfile, pyfile, shfile, pCfile, pMfile, pRfile, pTfile, optD['base'], keymap, 'server' in optD)

else:

# A Stanford user can override the parameters in configsdp.txt by copying that file to config.local,

# and then editing config.local. So, if config.local exists, use that.

if os.path.isfile(cdir + '/' + NET_CFG):

configureSdp(NET_CFG, cfile, mfile, pfile, pyfile, pCfile, pMfile, pRfile, pTfile, optD['base'])

configureSdp(NET_CFG, cfile, mfile, pfile, pyfile, shfile, pCfile, pMfile, pRfile, pTfile, optD['base'])

else:

configureSdp(SDP_CFG, cfile, mfile, pfile, pyfile, pCfile, pMfile, pRfile, pTfile, optD['base'])

configureSdp(SDP_CFG, cfile, mfile, pfile, pyfile, shfile, pCfile, pMfile, pRfile, pTfile, optD['base'])

Legend:

Removed from v.1.24
changed lines
	Added in v.1.25

Karen Tian