X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FsalomeContext.py;h=84ab538d38948dae4a2e438c652117654e876549;hb=654942c4e9de5eb50e45e28c5c947e056d4cd800;hp=bcf54f5626156e74acd8e35d04eecbe67ca8b1aa;hpb=b76554af6dd3104d010d0462690e05fb98e3c005;p=modules%2Fkernel.git diff --git a/bin/salomeContext.py b/bin/salomeContext.py index bcf54f562..84ab538d3 100644 --- a/bin/salomeContext.py +++ b/bin/salomeContext.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -36,37 +36,53 @@ def usage(): #exeName = os.path.splitext(os.path.basename(__file__))[0] msg = '''\ -Usage: salome [command] [options] [--config=file1,...,filen] +Usage: salome [command] [options] [--config=] Commands: - start Launches SALOME virtual application [DEFAULT] - shell Executes a script under SALOME application environment - connect Connects a Python console to the active SALOME session - killall Kill all SALOME running sessions - info Display some information about SALOME - help Show this message - coffee Yes! SALOME can also make coffee!!" - -Use salome start --help or salome shell --help -to show help on start and shell commands. +========= + start Starts a SALOME session (through virtual application) + context Initializes SALOME context. + shell Initializes SALOME context, and executes scripts passed + as command arguments + connect Connects a Python console to the active SALOME session + kill Terminate SALOME session running on given ports for current user + Port numbers must be separated by blank characters + killall Kill *all* SALOME running sessions for current user + test Run SALOME tests. + info Display some information about SALOME + help Show this message + coffee Yes! SALOME can also make coffee!! + +If no command is given, default to start. + +Command options: +================ + Use salome --help to show help on command ; available for commands: + start, shell, test. + +--config= +========================== + Initialize SALOME context from a list of context files and/or a list + of folders containing context files. The list is comma-separated, whithout + any blank characters. ''' print msg # """ -The SalomeContext class in an API to configure SALOME environment then +The SalomeContext class in an API to configure SALOME context then start SALOME using a single python command. """ class SalomeContext: """ - Initialize environment from a list of configuration files + Initialize context from a list of configuration files identified by their names. These files should be in appropriate (new .cfg) format. However you can give old .sh environment files; in this case, the SalomeContext class will try to automatically convert them - to .cfg format before setting the environment. + to .cfg format before setting the context. """ def __init__(self, configFileNames=0): #it could be None explicitely (if user use multiples setVariable...for standalone) @@ -76,18 +92,18 @@ class SalomeContext: if len(configFileNames) == 0: raise SalomeContextException("No configuration files given") - reserved=['PATH', 'DYLD_LIBRARY_PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'MANPATH', 'PV_PLUGIN_PATH'] + reserved=['PATH', 'DYLD_LIBRARY_PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'MANPATH', 'PV_PLUGIN_PATH', 'INCLUDE', 'LIBPATH', 'SALOME_PLUGINS_PATH'] for filename in configFileNames: basename, extension = os.path.splitext(filename) if extension == ".cfg": - self.__setEnvironmentFromConfigFile(filename, reserved) + self.__setContextFromConfigFile(filename, reserved) elif extension == ".sh": #new convert procedures, temporary could be use not to be automatically deleted #temp = tempfile.NamedTemporaryFile(suffix='.cfg', delete=False) temp = tempfile.NamedTemporaryFile(suffix='.cfg') try: convertEnvFileToConfigFile(filename, temp.name, reserved) - self.__setEnvironmentFromConfigFile(temp.name, reserved) + self.__setContextFromConfigFile(temp.name, reserved) temp.close() except (ConfigParser.ParsingError, ValueError) as e: self.getLogger().error("Invalid token found when parsing file: %s\n"%(filename)) @@ -97,20 +113,36 @@ class SalomeContext: self.getLogger().warning("Unrecognized extension for configuration file: %s", filename) # + def __loadMPI(self, module_name): + print "Trying to load MPI module: %s..."%module_name, + try: + out, err = subprocess.Popen(["modulecmd", "python", "load", module_name], stdout=subprocess.PIPE).communicate() + exec out # define specific environment variables + print " OK" + except: + print " ** Failed **" + pass + # + def runSalome(self, args): + import os # Run this module as a script, in order to use appropriate Python interpreter - # according to current path (initialized from environment files). -# kill = False -# for e in args: -# if "--shutdown-server" in e: -# kill = True -# args.remove(e) + # according to current path (initialized from context files). + mpi_module_option = "--with-mpi-module=" + mpi_module = [x for x in args if x.startswith(mpi_module_option)] + if mpi_module: + mpi_module = mpi_module[0][len(mpi_module_option):] + self.__loadMPI(mpi_module) + args = [x for x in args if not x.startswith(mpi_module_option)] + else: + mpi_module = os.getenv("SALOME_MPI_MODULE_NAME", None) + if mpi_module: + self.__loadMPI(mpi_module) absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','') - proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","salomeContext.py"), pickle.dumps(self), pickle.dumps(args)], shell=False, close_fds=True) + env_copy = os.environ.copy() + proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","salomeContext.py"), pickle.dumps(self), pickle.dumps(args)], shell=False, close_fds=True, env=env_copy) msg = proc.communicate() - # if kill: - # self._killAll(args) return msg, proc.returncode # @@ -181,13 +213,17 @@ class SalomeContext: options = args[1:] availableCommands = { - 'start' : '_runAppli', - 'shell' : '_runSession', + 'start' : '_runAppli', + 'context' : '_setContext', + 'shell' : '_runSession', 'connect' : '_runConsole', - 'killall': '_killAll', - 'info': '_showInfo', - 'help': '_usage', - 'coffee' : '_makeCoffee' + 'kill' : '_kill', + 'killall' : '_killAll', + 'test' : '_runTests', + 'info' : '_showInfo', + 'help' : '_usage', + 'coffee' : '_makeCoffee', + 'car' : '_getCar', } if not command in availableCommands.keys(): @@ -203,6 +239,19 @@ class SalomeContext: See usage for details on commands. """ def _startSalome(self, args): + import os + import sys + try: + from setenv import add_path + absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH') + path = os.path.realpath(os.path.join(absoluteAppliPath, "bin", "salome")) + add_path(path, "PYTHONPATH") + path = os.path.realpath(os.path.join(absoluteAppliPath, "bin", "salome", "appliskel")) + add_path(path, "PYTHONPATH") + + except: + pass + command, options = self.__parseArguments(args) sys.argv = options @@ -230,7 +279,7 @@ class SalomeContext: sys.exit(1) # - def __setEnvironmentFromConfigFile(self, filename, reserved=None): + def __setContextFromConfigFile(self, filename, reserved=None): if reserved is None: reserved = [] try: @@ -246,7 +295,7 @@ class SalomeContext: temp = tempfile.NamedTemporaryFile(suffix='.cfg') try: convertEnvFileToConfigFile(sh_file, temp.name, reserved) - self.__setEnvironmentFromConfigFile(temp.name, reserved) + self.__setContextFromConfigFile(temp.name, reserved) msg += "OK\n" self.getLogger().warning(msg) temp.close() @@ -264,18 +313,24 @@ class SalomeContext: for var in unsetVars: self.unsetVariable(var) - # set environment + # set context for reserved in reservedDict: a = filter(None, reservedDict[reserved]) # remove empty elements + a = [ os.path.realpath(x) for x in a ] reformattedVals = os.pathsep.join(a) - self.addToVariable(reserved, reformattedVals) + if reserved in ["INCLUDE", "LIBPATH"]: + self.addToVariable(reserved, reformattedVals, separator=' ') + else: + self.addToVariable(reserved, reformattedVals) pass for key,val in configVars: self.setVariable(key, val, overwrite=True) pass - sys.path[:0] = os.getenv('PYTHONPATH','').split(os.pathsep) + pythonpath = os.getenv('PYTHONPATH','').split(os.pathsep) + pythonpath = [ os.path.realpath(x) for x in pythonpath ] + sys.path[:0] = pythonpath # def _runAppli(self, args=None): @@ -290,12 +345,32 @@ class SalomeContext: runSalome.runSalome() # + def _setContext(self, args=None): + salome_context_set = os.getenv("SALOME_CONTEXT_SET") + if salome_context_set: + print "***" + print "*** SALOME context has already been set." + print "*** Enter 'exit' (only once!) to leave SALOME context." + print "***" + return + + os.environ["SALOME_CONTEXT_SET"] = "yes" + print "***" + print "*** SALOME context is now set." + print "*** Enter 'exit' (only once!) to leave SALOME context." + print "***" + + cmd = ["/bin/bash"] + proc = subprocess.Popen(cmd, shell=False, close_fds=True) + return proc.communicate() + # + def _runSession(self, args=None): if args is None: args = [] sys.argv = ['runSession'] + args import runSession - params, args = runSession.configureSession(args) + params, args = runSession.configureSession(args, exe="salome shell") sys.argv = ['runSession'] + args import setenv @@ -317,9 +392,26 @@ class SalomeContext: return proc.communicate() # - def _killAll(self, args=None): + def _kill(self, args=None): if args is None: args = [] + ports = args + if not ports: + print "Port number(s) not provided to command: salome kill " + return + + from multiprocessing import Process + from killSalomeWithPort import killMyPort + import tempfile + for port in ports: + with tempfile.NamedTemporaryFile(): + p = Process(target = killMyPort, args=(port,)) + p.start() + p.join() + pass + # + + def _killAll(self, unused=None): try: import PortManager # mandatory from multiprocessing import Process @@ -337,10 +429,20 @@ class SalomeContext: from killSalome import killAllPorts killAllPorts() pass + # + + def _runTests(self, args=None): + if args is None: + args = [] + sys.argv = ['runTests'] + import setenv + setenv.main(True) + import runTests + return runTests.runTests(args, exe="salome test") # - def _showInfo(self, args=None): + def _showInfo(self, unused=None): print "Running with python", platform.python_version() self._runAppli(["--version"]) # @@ -349,7 +451,7 @@ class SalomeContext: usage() # - def _makeCoffee(self, args=None): + def _makeCoffee(self, unused=None): print " (" print " ) (" print " ___...(-------)-....___" @@ -360,9 +462,9 @@ class SalomeContext: print " | | | |" print " \\ \\ | |" print " `\\ `\\ | |" - print " `\\ `| |" - print " _/ /\\ /" - print " (__/ \\ /" + print " `\\ `| SALOME |" + print " _/ /\\ 4 EVER /" + print " (__/ \\ <3 /" print " _..---\"\"` \\ /`\"\"---.._" print " .-\' \\ / \'-." print " : `-.__ __.-\' :" @@ -372,6 +474,43 @@ class SalomeContext: print " \'._ \"\"\"----.....______.....----\"\"\" _.\'" print " `\"\"--..,,_____ _____,,..--\"\"`" print " `\"\"\"----\"\"\"`" + print "" + print " SALOME is working for you; what else?" + print "" + sys.exit(0) + # + + def _getCar(self, unused=None): + print " _____________" + print " ..---:::::::-----------. ::::;;." + print " .\'\"\"\"\"\"\" ;; \\ \":." + print " .\'\' ; \\ \"\\__." + print " .\' ;; ; \\\\\";" + print " .\' ; _____; \\\\/" + print " .\' :; ;\" \\ ___:\'." + print " .\'--........................... : = ____:\" \\ \\" + print " ..-\"\" \"\"\"\' o\"\"\" ; ; :" + print " .--\"\" .----- ..----... _.- --. ..-\" ; ; ; ;" + print " .\"\"_- \"--\"\"-----\'\"\" _-\" .-\"\" ; ; .-." + print " .\' .\' SALOME .\" .\" ; ; /. |" + print " /-./\' 4 EVER <3 .\" / _.. ; ; ;;;|" + print " : ;-.______ / _________==. /_ \\ ; ; ;;;;" + print " ; / | \"\"\"\"\"\"\"\"\"\"\".---.\"\"\"\"\"\"\" : /\" \". |; ; _; ;;;" + print " /\"-/ | / / / / ;|; ;-\" | ;\';" + print ":- : \"\"\"----______ / / ____. . .\"\'. ;; .-\"..T\" ." + print "\'. \" ___ \"\": \'\"\"\"\"\"\"\"\"\"\"\"\"\"\" . ; ; ;; ;.\" .\" \'--\"" + print " \", __ \"\"\" \"\"---... :- - - - - - - - - \' \' ; ; ; ;;\" .\"" + print " /. ; \"\"\"---___ ; ; ; ;|.\"\"" + print " : \": \"\"\"----. .-------. ; ; ; ;:" + print " \\ \'--__ \\ \\ \\ / | ; ;;" + print " \'-.. \"\"\"\"---___ : .______..\\ __/..-\"\"| ; ; ;" + print " \"\"--.. \"\"\"--\" m l s . \". . ;" + print " \"\"------... ..--\"\" \" :" + print " \"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\" \\ /" + print " \"------\"" + print "" + print " Drive your simulation properly with SALOME!" + print "" sys.exit(0) #