Skip to content
Snippets Groups Projects
Commit 944788d1 authored by Samuel Burbulla's avatar Samuel Burbulla Committed by Andreas Dedner
Browse files

Print message when compiling code just-in-time.

Use logger and revise logger levels.

Change format and set more to debug.
parent c69ac541
No related branches found
No related tags found
1 merge request!932Merge of small MRs that make changes to the Python bindings
......@@ -3,7 +3,7 @@ import os
logger = logging.getLogger(__name__)
loglevel = None
loglevel = logging.INFO
try:
loglevel = getattr(logging, os.environ['DUNE_LOG_LEVEL'].upper())
except KeyError:
......@@ -11,16 +11,16 @@ except KeyError:
except AttributeError:
logger.warn('Invalid log level in environment variable DUNE_LOG_LEVEL')
logformat = os.environ.get('DUNE_LOG_FORMAT')
logformat = os.environ.get('DUNE_LOG_FORMAT', 'DUNE-%(levelname)s: %(message)s')
logging.basicConfig(format=logformat, level=loglevel)
try:
from mpi4py import MPI
if MPI.COMM_WORLD.Get_rank() == 0:
logger.info('MPI initialized successfully')
logger.debug('MPI initialized successfully')
except ImportError:
logger.info('mpi4py not found, MPI not initialized')
logger.debug('mpi4py not found, MPI not initialized')
from ._common import *
from .deprecated import DeprecatedObject
......
......@@ -355,7 +355,7 @@ def make_dune_py_module(dune_py_dir=None, deps=None):
logger.error('"' + dune_py_dir + '" contains version ' + str(description.version) + ' of the dune-py module, ' + str(get_dune_py_version()) + ' required.')
logger.error('If you upgraded dune-python, you can safely remove "' + dune_py_dir + '" and retry.')
raise RuntimeError('"' + dune_py_dir + '" contains a different version of the dune-py module.')
logger.info('Using dune-py module in ' + dune_py_dir)
logger.debug('Using dune-py module in ' + dune_py_dir)
def build_dune_py_module(dune_py_dir=None, cmake_args=None, build_args=None, builddir=None, deps=None):
if dune_py_dir is None:
......
......@@ -57,7 +57,7 @@ for importer, modname, ispkg in pkgutil.iter_modules(package.__path__, prefix):
_create_map.setdefault("view",{}).update(_create_map["grid"])
logMsg = logMsg + "]"
logger.info(logMsg)
logger.debug(logMsg)
############################################################################
def get(category=None,entry=None):
......
......@@ -12,13 +12,13 @@ env_save = os.environ.get('DUNE_SAVE_BUILD' , 'FALSE').upper()
builder = Builder( env_force in ('1', 'TRUE'), env_save )
def setNoDependencyCheck():
logger.info("Switching off dependency check - modules will always be compiled")
logger.debug("Switching off dependency check - modules will always be compiled")
builderModule.noDepCheck = True
def setDependencyCheck():
logger.info("Switching on dependency check")
logger.debug("Switching on dependency check")
builderModule.noDepCheck = False
def setFlags(flags="-g",noChecks=None):
logger.info("Using compile flags '"+flags+"'")
logger.debug("Using compile flags '"+flags+"'")
builderModule.cxxFlags = flags
if noChecks is True:
setNoDependencyCheck()
......@@ -28,7 +28,7 @@ def addToFlags(pre="",post="",noChecks=None):
setFlags(pre+" "+getCXXFlags()+" "+post,noChecks)
def unsetFlags(noChecks=None):
logger.info("Using compile flags from configuration of dune-py")
logger.debug("Using compile flags from configuration of dune-py")
builderModule.cxxFlags = None
if noChecks is True:
setNoDependencyCheck()
......
......@@ -73,7 +73,7 @@ class Builder:
# create .noconfigure to disable configuration for future calls
open(tagfile, 'a').close()
else:
logger.info('using pre configured dune-py module')
logger.debug('using pre configured dune-py module')
comm.barrier()
self.build_args = dune.common.module.get_default_build_args()
......@@ -145,7 +145,7 @@ class Builder:
with Lock(os.path.join(self.dune_py_dir, 'lock-'+moduleName+'.lock'), flags=LOCK_EX):
sourceFileName = os.path.join(self.generated_dir, moduleName + ".cc")
if not os.path.isfile(sourceFileName):
logger.info("Loading " + pythonName + " (new)")
logger.info("Compiling " + pythonName)
code = str(source)
# the CMakeLists.txt needs changing and cmake rerun - lock folder
with open(os.path.join(sourceFileName), 'w') as out:
......@@ -161,12 +161,12 @@ class Builder:
# update build system
self.compile()
elif isString(source) and not source == open(os.path.join(sourceFileName), 'r').read():
logger.info("Loading " + pythonName + " (updated)")
logger.info("Compiling " + pythonName + " (updated)")
code = str(source)
with open(os.path.join(sourceFileName), 'w') as out:
out.write(code)
else:
logger.info("Loading " + pythonName)
logger.debug("Loading " + pythonName)
# end of exclusive dune-py lock
# for compilation a shared lock is enough
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment