Ajout de décorateur pour les apply des opérateurs continus. Fix gpu_transfer

HySoP/hysop/gpu/__init__.py

@@ -44,7 +44,3 @@ GPU_SRC = os.path.join(__path__[0], "cl_src", '')
 
 ## If use OpenCL profiling events to time computations
 CL_PROFILE = False
-
-## Transfert direction
-HostToDevice = 9876
-DeviceToHost = 6789

HySoP/hysop/gpu/gpu_transfer.py

 from parmepy.operator.computational import Computational
-from parmepy.gpu import HostToDevice, DeviceToHost
+from parmepy.methods_keys import Support
 
 
 class DataTransfer(Computational):
     """Operator for moving data between CPU and GPU."""
 
-    def __init__(self, way, freq=1, **kwds):
+    def __init__(self, source, target, freq=1, **kwds):
         """
         @param way: HostToDevice or DeviceToHost flag setting
         the data copy direction.
         """
         super(DataTransfer, self).__init__(**kwds)
-        ## Transfer way
-        self.way = way
+        ## Source operator or topology
+        self.source = source
+        ## Target operator
+        self.target = target
         ## Transfer frequency in iteration number
         self.freq = freq
+
+        source_is_gpu = False
+        try:
+            if source.method[Support].find('gpu') >= 0:
+                source_is_gpu = True
+        except:
+            pass
+        target_is_gpu = False
+        try:
+            if target.method[Support].find('gpu') >= 0:
+                target_is_gpu = True
+        except:
+            pass
         ## Current transfer function
-        if self.way == HostToDevice:
+        if source_is_gpu:
+            self._transfer = self._apply_toHost
+        elif target_is_gpu:
             self._transfer = self._apply_toDevice
         else:
-            self._transfer = self._apply_toHost
+            raise RuntimeError("Source or target mus bu a GPU operator.")
 
     def setup(self):
-        pass
+        self.target.addRedistributeRequirement(self)
 
     def apply(self, simulation):
         ite = simulation.currentIteration
@@ -33,10 +50,13 @@ class DataTransfer(Computational):
         for v in self.variables:
             df = self.discreteFields[v]
             df.toHost()
-            df.wait()
 
     def _apply_toDevice(self):
         for v in self.variables:
             df = self.discreteFields[v]
             df.toDevice()
+
+    def wait(self):
+        for v in self.variables:
+            df = self.discreteFields[v]
             df.wait()

HySoP/hysop/operator/__init__.py

@@ -21,3 +21,21 @@
 # preset dictionnaries.
 #
 # Keys in methods dict are given in parmepy.method_keys.
+from parmepy.tools.profiler import ftime
+
+
+def apply_decoration(f):
+    """
+    Decorator for operators apply functions.
+    """
+    def deco(*args, **kwargs):
+        """args[0] contains the object"""
+        assert args[0]._is_discretized
+        for req in args[0].requirements:
+            req.wait()
+        t0 = ftime()
+        res = f(*args, **kwargs)
+        prof = args[0].profiler[f.func_name]
+        prof += ftime() - t0
+        return res
+    return deco

HySoP/hysop/operator/computational.py

@@ -8,7 +8,7 @@ from parmepy.constants import debug
 from parmepy.operator.continuous import Operator
 from parmepy.mpi.topology import Cartesian
 from parmepy.tools.parameters import Discretization
-from parmepy.tools.profiler import profile
+from parmepy.operator import apply_decoration
 
 
 class Computational(Operator):
@@ -289,8 +289,7 @@ class Computational(Operator):
         if self.discreteOperator is not None:
             self.discreteOperator.finalize()
 
-    @debug
-    @profile
+    @apply_decoration
     def apply(self, simulation=None):
         """
         Apply this operator to its variables.
@@ -298,9 +297,6 @@ class Computational(Operator):
         parameters (time, time step, iteration number ...), see
         parmepy.problem.simulation.Simulation for details.
         """
-        for req in self.requirements:
-            req.wait()
-        assert self._is_discretized
         self.discreteOperator.apply(simulation)
 
     def printComputeTime(self):

HySoP/hysop/operator/hdf_io.py

@@ -5,6 +5,7 @@ File output for field(s) value on a grid.
 """
 from parmepy.constants import S_DIR, debug, HDF5, PARMES_REAL
 from parmepy.operator.computational import Computational
+from parmepy.operator import apply_decoration
 import parmepy.tools.numpywrappers as npw
 import parmepy.tools.io_utils as io
 from parmepy.tools.parameters import IO_params
@@ -199,8 +200,7 @@ class HDF_Writer(HDF_IO):
         self._get_filename = lambda i: self.io_params.filename + \
             "_{0:05d}".format(i) + '.h5'
 
-    @debug
-    @profile
+    @apply_decoration
     def apply(self, simulation=None):
         if simulation is None:
             raise ValueError("Missing simulation value for monitoring.")