[Python] avoid logging both 'generating' and 'compiling' module in two lines

python/dune/generator/cmakebuilder.py

@@ -245,6 +245,19 @@ class Builder:
                 self.savedOutput[1].write("\n###############################\n")
 
     def load(self, moduleName, source, pythonName, extraCMake=None):
+        # use with-statement to log info if compiling takes some time
+        class PrintCompiling:
+            def handle_signal(self, signum, frame):
+                logger.info("Compiling "+pythonName)
+            def __enter__(self):
+                signal.signal(signal.SIGALRM, self.handle_signal)
+                signal.alarm(1)
+            def __exit__(self, type, value, traceback):
+                signal.alarm(0)
+        class EmptyPrintCompiling:
+            def __enter__(self): pass
+            def __exit__(self, type, value, traceback): pass
+
         ## TODO replace if rank with something better
         ## and remove barrier further down
         if not self.initialized:
@@ -265,6 +278,8 @@ class Builder:
                             found = line in out.read()
                         if not os.path.isfile(sourceFileName) or not found:
                             logger.info("Generating " + pythonName)
+                            # don't print 'Compiling' twice
+                            PrintCompiling = EmptyPrintCompiling
 
                             code = str(source)
                             with open(os.path.join(sourceFileName), 'w') as out:
@@ -301,6 +316,8 @@ class Builder:
                                     raise
                         elif isString(source) and not source == open(os.path.join(sourceFileName), 'r').read():
                             logger.info("Compiling " + pythonName + " (updated)")
+                            # don't print 'Compiling' twice
+                            PrintCompiling = EmptyPrintCompiling
 
                             code = str(source)
                             with open(os.path.join(sourceFileName), 'w') as out:
@@ -320,21 +337,11 @@ class Builder:
                 # that dune-py was updated in the mean time.
                 # This step is quite fast but there is room for optimization.
 
-                # use with-statement to log info if compiling takes some time
-                class printCompiling:
-                    def handle_signal(self, signum, frame):
-                        logger.info("Compiling "+pythonName)
-                    def __enter__(self):
-                        signal.signal(signal.SIGALRM, self.handle_signal)
-                        signal.alarm(1)
-                    def __exit__(self, type, value, traceback):
-                        signal.alarm(0)
-
                 # for compilation a shared lock is enough
                 with Lock(os.path.join(self.dune_py_dir, '..', 'lock-module.lock'), flags=LOCK_SH):
                     # lock generated module
                     with Lock(os.path.join(self.dune_py_dir, 'lock-'+moduleName+'.lock'), flags=LOCK_EX):
-                        with printCompiling():
+                        with PrintCompiling():
                             self.compile(target=moduleName)
 
         ## TODO remove barrier here