1 diff -Naur C3PO/sources/c3po/mpi/MPICollaborativeDataManager.py C3PO_dev/sources/c3po/mpi/MPICollaborativeDataManager.py
2 --- C3PO/sources/c3po/mpi/MPICollaborativeDataManager.py 2024-01-17 08:51:14.000000000 +0100
3 +++ C3PO_dev/sources/c3po/mpi/MPICollaborativeDataManager.py 2024-04-22 15:21:40.288851916 +0200
5 """ Contain the class MPICollaborativeDataManager. """
6 from __future__ import print_function, division
8 -from mpi4py import MPI
10 + from mpi4py import MPI
12 + from openmpi.mpi4py import MPI
14 from c3po.CollaborativeDataManager import CollaborativeDataManager
15 from c3po.CollaborativeObject import CollaborativeObject
16 diff -Naur C3PO/sources/c3po/mpi/MPICoupler.py C3PO_dev/sources/c3po/mpi/MPICoupler.py
17 --- C3PO/sources/c3po/mpi/MPICoupler.py 2024-01-17 08:51:14.000000000 +0100
18 +++ C3PO_dev/sources/c3po/mpi/MPICoupler.py 2024-04-22 15:22:50.834694268 +0200
21 """ Contain the class MPICoupler. """
22 from __future__ import print_function, division
23 -from mpi4py import MPI
25 + from mpi4py import MPI
27 + from openmpi.mpi4py import MPI
29 from c3po.Coupler import Coupler
30 from c3po.mpi.MPIRemote import MPIRemote
31 diff -Naur C3PO/sources/c3po/mpi/MPIDomainDecompositionDataManager.py C3PO_dev/sources/c3po/mpi/MPIDomainDecompositionDataManager.py
32 --- C3PO/sources/c3po/mpi/MPIDomainDecompositionDataManager.py 2024-01-17 08:51:14.000000000 +0100
33 +++ C3PO_dev/sources/c3po/mpi/MPIDomainDecompositionDataManager.py 2024-04-22 15:20:26.465016893 +0200
35 """ Contain the class MPIDomainDecompositionDataManager. """
36 from __future__ import print_function, division
38 -from mpi4py import MPI
40 + from mpi4py import MPI
42 + from openmpi.mpi4py import MPI
44 from c3po.LocalDataManager import LocalDataManager
46 diff -Naur C3PO/sources/c3po/mpi/mpiExchangeMethods/MPISharedRemapping.py C3PO_dev/sources/c3po/mpi/mpiExchangeMethods/MPISharedRemapping.py
47 --- C3PO/sources/c3po/mpi/mpiExchangeMethods/MPISharedRemapping.py 2024-01-17 08:51:14.000000000 +0100
48 +++ C3PO_dev/sources/c3po/mpi/mpiExchangeMethods/MPISharedRemapping.py 2024-04-22 15:18:57.056216701 +0200
51 """ Contain the class SharedRemapping. """
52 from __future__ import print_function, division
53 -from mpi4py import MPI as mpi
55 + from mpi4py import MPI as mpi
57 + from openmpi.mpi4py import MPI as mpi
59 import c3po.medcouplingCompat as mc
60 from c3po.mpi.mpiExchangeMethods.MPIExchangeMethod import MPIExchangeMethod
61 diff -Naur C3PO/sources/c3po/mpi/mpiExchangeMethods/MPIValueBcast.py C3PO_dev/sources/c3po/mpi/mpiExchangeMethods/MPIValueBcast.py
62 --- C3PO/sources/c3po/mpi/mpiExchangeMethods/MPIValueBcast.py 2024-01-17 08:51:14.000000000 +0100
63 +++ C3PO_dev/sources/c3po/mpi/mpiExchangeMethods/MPIValueBcast.py 2024-04-22 15:19:43.425113077 +0200
66 """ Contain the class SharedRemapping. """
67 from __future__ import print_function, division
68 -from mpi4py import MPI as mpi
70 + from mpi4py import MPI as mpi
72 + from openmpi.mpi4py import MPI as mpi
74 from c3po.mpi.mpiExchangeMethods.MPIExchangeMethod import MPIExchangeMethod
76 diff -Naur C3PO/sources/c3po/mpi/MPIExchanger.py C3PO_dev/sources/c3po/mpi/MPIExchanger.py
77 --- C3PO/sources/c3po/mpi/MPIExchanger.py 2024-01-17 08:51:14.000000000 +0100
78 +++ C3PO_dev/sources/c3po/mpi/MPIExchanger.py 2024-04-22 15:22:23.057756341 +0200
81 """ Contain the classes MPIExchanger and MPIShortcutToData. MPIShortcutToData is for internal use only. """
82 from __future__ import print_function, division
83 -from mpi4py import MPI as mpi
85 + from mpi4py import MPI as mpi
87 + from openmpi.mpi4py import MPI as mpi
89 from c3po.LocalExchanger import LocalExchanger, ShortcutToField, ShortcutToValue
90 from c3po.CollaborativeExchanger import CollaborativeExchanger
91 diff -Naur C3PO/sources/c3po/mpi/MPIMasterDataManager.py C3PO_dev/sources/c3po/mpi/MPIMasterDataManager.py
92 --- C3PO/sources/c3po/mpi/MPIMasterDataManager.py 2024-01-17 08:51:14.000000000 +0100
93 +++ C3PO_dev/sources/c3po/mpi/MPIMasterDataManager.py 2024-04-22 15:23:50.434561079 +0200
95 """ Contain the class MPIMasterDataManager. """
96 from __future__ import print_function, division
98 -from mpi4py import MPI
100 + from mpi4py import MPI
102 + from openmpi.mpi4py import MPI
104 from c3po.mpi.MPITag import MPITag
106 diff -Naur C3PO/sources/c3po/mpi/MPIMasterPhysicsDriver.py C3PO_dev/sources/c3po/mpi/MPIMasterPhysicsDriver.py
107 --- C3PO/sources/c3po/mpi/MPIMasterPhysicsDriver.py 2024-01-17 08:51:14.000000000 +0100
108 +++ C3PO_dev/sources/c3po/mpi/MPIMasterPhysicsDriver.py 2024-04-22 15:18:14.976311404 +0200
110 from __future__ import print_function, division
113 -from mpi4py import MPI
115 + from mpi4py import MPI
117 + from openmpi.mpi4py import MPI
119 from c3po.PhysicsDriver import PhysicsDriver
120 from c3po.mpi.MPIRemoteProcess import MPIRemoteProcess
121 diff -Naur C3PO/sources/c3po/mpi/MPIRecipient.py C3PO_dev/sources/c3po/mpi/MPIRecipient.py
122 --- C3PO/sources/c3po/mpi/MPIRecipient.py 2024-01-17 08:51:14.000000000 +0100
123 +++ C3PO_dev/sources/c3po/mpi/MPIRecipient.py 2024-04-22 15:24:26.066481454 +0200
125 These classes recieve data from a remote process.
127 from __future__ import print_function, division
128 -from mpi4py import MPI
130 + from mpi4py import MPI
132 + from openmpi.mpi4py import MPI
135 import c3po.medcouplingCompat as mc
136 diff -Naur C3PO/sources/c3po/mpi/MPISender.py C3PO_dev/sources/c3po/mpi/MPISender.py
137 --- C3PO/sources/c3po/mpi/MPISender.py 2024-01-17 08:51:14.000000000 +0100
138 +++ C3PO_dev/sources/c3po/mpi/MPISender.py 2024-04-22 15:21:10.785917851 +0200
140 from __future__ import print_function, division
143 -from mpi4py import MPI
145 + from mpi4py import MPI
147 + from openmpi.mpi4py import MPI
149 import c3po.medcouplingCompat as mc
150 from c3po.mpi.MPITag import MPITag
151 diff -Naur C3PO/sources/c3po/mpi/MPIWorker.py C3PO_dev/sources/c3po/mpi/MPIWorker.py
152 --- C3PO/sources/c3po/mpi/MPIWorker.py 2024-01-17 08:51:14.000000000 +0100
153 +++ C3PO_dev/sources/c3po/mpi/MPIWorker.py 2024-04-22 15:23:19.730629693 +0200
156 """ Contain the class MPIWorker. """
157 from __future__ import print_function, division
158 -from mpi4py import MPI
160 + from mpi4py import MPI
162 + from openmpi.mpi4py import MPI
164 from c3po.mpi.MPITag import MPITag
165 from c3po.mpi.MPIRemoteProcess import MPIRemoteProcess
166 diff -Naur C3PO/sources/c3po/physicsDrivers/ALCYONE2Driver.py C3PO_dev/sources/c3po/physicsDrivers/ALCYONE2Driver.py
167 --- C3PO/sources/c3po/physicsDrivers/ALCYONE2Driver.py 2024-01-17 08:51:14.000000000 +0100
168 +++ C3PO_dev/sources/c3po/physicsDrivers/ALCYONE2Driver.py 2024-04-22 15:25:35.683325884 +0200
171 """ Contain the class ALCYONE2Driver. """
172 from __future__ import print_function, division
173 -import mpi4py.MPI as mpi
175 + import mpi4py.MPI as mpi
177 + import openmpi.mpi4py.MPI as mpi
181 diff -Naur C3PO/tests/listings/main_mpi_collaborative.py C3PO_dev/tests/listings/main_mpi_collaborative.py
182 --- C3PO/tests/listings/main_mpi_collaborative.py 2024-01-17 08:51:14.000000000 +0100
183 +++ C3PO_dev/tests/listings/main_mpi_collaborative.py 2024-04-22 15:12:56.254056622 +0200
185 def main_mpi_collaborative():
188 - from mpi4py import MPI
190 + from mpi4py import MPI
192 + from openmpi.mpi4py import MPI
196 diff -Naur C3PO/tests/med_1D3D/main_medmpi_collaborative.py C3PO_dev/tests/med_1D3D/main_medmpi_collaborative.py
197 --- C3PO/tests/med_1D3D/main_medmpi_collaborative.py 2024-01-17 08:51:14.000000000 +0100
198 +++ C3PO_dev/tests/med_1D3D/main_medmpi_collaborative.py 2024-04-22 15:10:42.764368751 +0200
202 def main_medmpi_collaborative():
203 - import mpi4py.MPI as mpi
205 + import mpi4py.MPI as mpi
207 + import openmpi.mpi4py.MPI as mpi
211 diff -Naur C3PO/tests/med_1D3D/main_medmpi_reloading.py C3PO_dev/tests/med_1D3D/main_medmpi_reloading.py
212 --- C3PO/tests/med_1D3D/main_medmpi_reloading.py 2024-01-17 08:51:14.000000000 +0100
213 +++ C3PO_dev/tests/med_1D3D/main_medmpi_reloading.py 2024-04-22 15:11:20.317280946 +0200
215 from __future__ import print_function, division
218 -from mpi4py import MPI as mpi
220 + from mpi4py import MPI as mpi
222 + from openmpi.mpi4py import MPI as mpi
224 import c3po.medcouplingCompat as mc
226 diff -Naur C3PO/tests/med_1D3D/main_mpi_hybrid.py C3PO_dev/tests/med_1D3D/main_mpi_hybrid.py
227 --- C3PO/tests/med_1D3D/main_mpi_hybrid.py 2024-01-17 08:51:14.000000000 +0100
228 +++ C3PO_dev/tests/med_1D3D/main_mpi_hybrid.py 2024-04-22 15:11:53.357203690 +0200
232 def main_mpi_hybrid():
233 - import mpi4py.MPI as mpi
235 + import mpi4py.MPI as mpi
237 + import openmpi.mpi4py.MPI as mpi
241 diff -Naur C3PO/tests/med_1D3D/main_workerThermo.py C3PO_dev/tests/med_1D3D/main_workerThermo.py
242 --- C3PO/tests/med_1D3D/main_workerThermo.py 2024-01-17 08:51:14.000000000 +0100
243 +++ C3PO_dev/tests/med_1D3D/main_workerThermo.py 2024-04-22 15:12:20.878139339 +0200
245 # -*- coding: utf-8 -*-
246 from __future__ import print_function, division
247 -import mpi4py.MPI as mpi
249 + import mpi4py.MPI as mpi
251 + import openmpi.mpi4py.MPI as mpi
255 diff -Naur C3PO/tests/med_Dussaix/main_master.py C3PO_dev/tests/med_Dussaix/main_master.py
256 --- C3PO/tests/med_Dussaix/main_master.py 2024-01-17 08:51:14.000000000 +0100
257 +++ C3PO_dev/tests/med_Dussaix/main_master.py 2024-04-22 15:09:19.611564683 +0200
262 - import mpi4py.MPI as mpi
264 + import mpi4py.MPI as mpi
266 + import openmpi.mpi4py.MPI as mpi
270 diff -Naur C3PO/tests/med_Dussaix/main_medmpi_collaborative.py C3PO_dev/tests/med_Dussaix/main_medmpi_collaborative.py
271 --- C3PO/tests/med_Dussaix/main_medmpi_collaborative.py 2024-01-17 08:51:14.000000000 +0100
272 +++ C3PO_dev/tests/med_Dussaix/main_medmpi_collaborative.py 2024-04-22 15:14:36.941821194 +0200
276 def main_medmpi_collaborative():
277 - from mpi4py import MPI
279 + from mpi4py import MPI
281 + from openmpi.mpi4py import MPI
285 diff -Naur C3PO/tests/med_Dussaix/main_mpi_collaborative.py C3PO_dev/tests/med_Dussaix/main_mpi_collaborative.py
286 --- C3PO/tests/med_Dussaix/main_mpi_collaborative.py 2024-01-17 08:51:14.000000000 +0100
287 +++ C3PO_dev/tests/med_Dussaix/main_mpi_collaborative.py 2024-04-22 15:06:37.271951247 +0200
291 def main_mpi_collaborative(exchangeWithFiles):
292 - from mpi4py import MPI
294 + from mpi4py import MPI
296 + from openmpi.mpi4py import MPI
300 diff -Naur C3PO/tests/med_Dussaix/main_mpi_masterWorkers.py C3PO_dev/tests/med_Dussaix/main_mpi_masterWorkers.py
301 --- C3PO/tests/med_Dussaix/main_mpi_masterWorkers.py 2024-01-17 08:51:14.000000000 +0100
302 +++ C3PO_dev/tests/med_Dussaix/main_mpi_masterWorkers.py 2024-04-22 15:08:02.538749420 +0200
306 def main_mpi_masterWorkers():
307 - import mpi4py.MPI as mpi
309 + import mpi4py.MPI as mpi
311 + import openmpi.mpi4py.MPI as mpi
313 comm = mpi.COMM_WORLD
314 rank = comm.Get_rank()
315 diff -Naur C3PO/tests/med_Dussaix/main_workerNeutro.py C3PO_dev/tests/med_Dussaix/main_workerNeutro.py
316 --- C3PO/tests/med_Dussaix/main_workerNeutro.py 2024-01-17 08:51:14.000000000 +0100
317 +++ C3PO_dev/tests/med_Dussaix/main_workerNeutro.py 2024-04-22 15:07:18.426855152 +0200
321 def main_workerNeutro():
322 - import mpi4py.MPI as mpi
324 + import mpi4py.MPI as mpi
326 + import openmpi.mpi4py.MPI as mpi
330 diff -Naur C3PO/tests/med_Dussaix/main_workerThermo.py C3PO_dev/tests/med_Dussaix/main_workerThermo.py
331 --- C3PO/tests/med_Dussaix/main_workerThermo.py 2024-01-17 08:51:14.000000000 +0100
332 +++ C3PO_dev/tests/med_Dussaix/main_workerThermo.py 2024-04-22 15:08:40.043659524 +0200
336 def main_workerThermo():
337 - import mpi4py.MPI as mpi
339 + import mpi4py.MPI as mpi
341 + import openmpi.mpi4py.MPI as mpi
345 diff -Naur C3PO/tests/med_Dussaix/MPINeutroDriver.py C3PO_dev/tests/med_Dussaix/MPINeutroDriver.py
346 --- C3PO/tests/med_Dussaix/MPINeutroDriver.py 2024-01-17 08:51:14.000000000 +0100
347 +++ C3PO_dev/tests/med_Dussaix/MPINeutroDriver.py 2024-04-22 15:10:08.236449480 +0200
349 # This class is the "neutronic" part of the two meshes model.
350 from __future__ import print_function, division
352 -from mpi4py import MPI as mpi
354 + from mpi4py import MPI as mpi
356 + from openmpi.mpi4py import MPI as mpi
358 import c3po.medcouplingCompat as mc
360 diff -Naur C3PO/tests/unitests/exchanger/main_mpi_valueBcast.py C3PO_dev/tests/unitests/exchanger/main_mpi_valueBcast.py
361 --- C3PO/tests/unitests/exchanger/main_mpi_valueBcast.py 2024-01-17 08:51:14.000000000 +0100
362 +++ C3PO_dev/tests/unitests/exchanger/main_mpi_valueBcast.py 2024-04-22 15:13:29.694978430 +0200
364 # -*- coding: utf-8 -*-
365 from __future__ import print_function
366 -import mpi4py.MPI as mpi
368 + import mpi4py.MPI as mpi
370 + import openmpi.mpi4py.MPI as mpi
374 diff -Naur C3PO/tests/unitests/masterWorkers/main_masterWorkers.py C3PO_dev/tests/unitests/masterWorkers/main_masterWorkers.py
375 --- C3PO/tests/unitests/masterWorkers/main_masterWorkers.py 2024-01-17 08:51:14.000000000 +0100
376 +++ C3PO_dev/tests/unitests/masterWorkers/main_masterWorkers.py 2024-04-22 15:13:52.957924036 +0200
378 masterDriver.terminate()
380 def main_masterWorkers():
381 - import mpi4py.MPI as mpi
383 + import mpi4py.MPI as mpi
385 + import openmpi.mpi4py.MPI as mpi
388 from tests.unitests.masterWorkers.WorkerDriver import WorkerDriver
389 diff -Naur C3PO/tests/unitests/remapper_2D/main_medmpi.py C3PO_dev/tests/unitests/remapper_2D/main_medmpi.py
390 --- C3PO/tests/unitests/remapper_2D/main_medmpi.py 2024-01-17 08:51:14.000000000 +0100
391 +++ C3PO_dev/tests/unitests/remapper_2D/main_medmpi.py 2024-04-22 15:01:51.191576461 +0200
393 from __future__ import print_function, division
396 -import mpi4py.MPI as mpi
398 + import mpi4py.MPI as mpi
400 + import openmpi.mpi4py.MPI as mpi