docker mpi

equinor · Jan 23, 2024 · 1c9eec7 · 1c9eec7
1 parent 6fbf345
commit 1c9eec7
Show file tree

Hide file tree

Showing 27 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,4 +3,4 @@ FROM dolfinx/dolfinx:v0.6.0
 LABEL org.opencontainers.image.source https://github.com/equinor/warmth
 WORKDIR /home/warmth
 
-ENTRYPOINT pip install . pytest==7.4.2 pytest-cov==4.1.0 && pytest --cov-report=term-missing --cov=warmth tests | tee pytest-coverage.txt 
+ENTRYPOINT pip install . pytest==7.4.2 pytest-cov==4.1.0 pytest-mpi==0.6 && mpirun -n 2 python3 -m pytest --with-mpi --cov-report=term-missing --cov=warmth tests | tee pytest-coverage.txt 
diff --git a/tests/benchmark/hypothetical/0.gri b/tests/benchmark/hypothetical/0.gri
diff --git a/tests/benchmark/hypothetical/30.gri b/tests/benchmark/hypothetical/30.gri
diff --git a/tests/benchmark/hypothetical/50.gri b/tests/benchmark/hypothetical/50.gri
diff --git a/tests/benchmark/hypothetical/60.gri b/tests/benchmark/hypothetical/60.gri
diff --git a/tests/benchmark/results-hypothetical/all shale/Top of 30MA - Temperature - at 0 Ma.gri b/tests/benchmark/results-hypothetical/all shale/Top of 30MA - Temperature - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/all shale/Top of 50Ma- Temperature - at 0 Ma.gri b/tests/benchmark/results-hypothetical/all shale/Top of 50Ma- Temperature - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/layercake_all_sand/30Ma - Temperature - 0 Ma.gri b/tests/benchmark/results-hypothetical/layercake_all_sand/30Ma - Temperature - 0 Ma.gri
diff --git a/...k/results-hypothetical/layercake_all_sand/30Ma - Vertical Thermal Conductivity - 0 Ma.gri b/...k/results-hypothetical/layercake_all_sand/30Ma - Vertical Thermal Conductivity - 0 Ma.gri
diff --git a/.../benchmark/results-hypothetical/layercake_all_sand/Base of model - Temperature - 0 Ma.gri b/.../benchmark/results-hypothetical/layercake_all_sand/Base of model - Temperature - 0 Ma.gri
diff --git a/...-hypothetical/layercake_all_sand/Base of model - Vertical Thermal Conductivity - 0 Ma.gri b/...-hypothetical/layercake_all_sand/Base of model - Vertical Thermal Conductivity - 0 Ma.gri
diff --git a/...s/benchmark/results-hypothetical/layercake_all_sand/Top of model - Temperature - 0 Ma.gri b/...s/benchmark/results-hypothetical/layercake_all_sand/Top of model - Temperature - 0 Ma.gri
diff --git a/...s-hypothetical/layercake_all_sand/Top of model - Vertical Thermal Conductivity - 0 Ma.gri b/...s-hypothetical/layercake_all_sand/Top of model - Vertical Thermal Conductivity - 0 Ma.gri
diff --git a/.../results-hypothetical/layercake_all_sand_isotropic/Base of Model - Temperature - 0 Ma.gri b/.../results-hypothetical/layercake_all_sand_isotropic/Base of Model - Temperature - 0 Ma.gri
diff --git a/...ical/layercake_all_sand_isotropic/Base of mode - Vertical Thermal Conductivity - 0 Ma.gri b/...ical/layercake_all_sand_isotropic/Base of mode - Vertical Thermal Conductivity - 0 Ma.gri
diff --git a/...hetical/layercake_all_sand_isotropic/Top of 30 - Vertical Thermal Conductivity - 0 Ma.gri b/...hetical/layercake_all_sand_isotropic/Top of 30 - Vertical Thermal Conductivity - 0 Ma.gri
diff --git a/...k/results-hypothetical/layercake_all_sand_isotropic/Top of 30 Ma - Temperature - 0 Ma.gri b/...k/results-hypothetical/layercake_all_sand_isotropic/Top of 30 Ma - Temperature - 0 Ma.gri
diff --git a/...tical/layercake_all_sand_isotropic/Top of Model- Vertical Thermal Conductivity - 0 Ma.gri b/...tical/layercake_all_sand_isotropic/Top of Model- Vertical Thermal Conductivity - 0 Ma.gri
diff --git a/...rk/results-hypothetical/layercake_all_sand_isotropic/Top of model- Temperature - 0 Ma.gri b/...rk/results-hypothetical/layercake_all_sand_isotropic/Top of model- Temperature - 0 Ma.gri
diff --git a/.../benchmark/results-hypothetical/sand_with_salt/Base of model - Conductivity - at 0 Ma.gri b/.../benchmark/results-hypothetical/sand_with_salt/Base of model - Conductivity - at 0 Ma.gri
diff --git a/...s/benchmark/results-hypothetical/sand_with_salt/Base of model - Temperature - at 0 Ma.gri b/...s/benchmark/results-hypothetical/sand_with_salt/Base of model - Temperature - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/sand_with_salt/Top of 30MA - Conductivity - at 0 Ma.gri b/tests/benchmark/results-hypothetical/sand_with_salt/Top of 30MA - Conductivity - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/sand_with_salt/Top of 30MA - Temperature - at 0 Ma.gri b/tests/benchmark/results-hypothetical/sand_with_salt/Top of 30MA - Temperature - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/sand_with_salt/Top of 50MA - Temperature - at 0 Ma.gri b/tests/benchmark/results-hypothetical/sand_with_salt/Top of 50MA - Temperature - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/with salt/Top of 30MA - Temperature - at 0 Ma.gri b/tests/benchmark/results-hypothetical/with salt/Top of 30MA - Temperature - at 0 Ma.gri
diff --git a/tests/benchmark/results-hypothetical/with salt/Top of 50MA - Temperature - at 0 Ma.gri b/tests/benchmark/results-hypothetical/with salt/Top of 50MA - Temperature - at 0 Ma.gri
diff --git a/tests/warmth3d/test_3d.py b/tests/warmth3d/test_3d.py
@@ -1,3 +1,4 @@
+import pytest
 import warmth
 from pathlib import Path
 from warmth.mesh_model import run_3d
@@ -7,6 +8,7 @@
 import pickle
 import time
 
+@pytest.mark.mpi
 def test_3d_compare():
     comm = MPI.COMM_WORLD
     inc = 1000
@@ -52,7 +54,7 @@ def test_3d_compare():
         model.parameters.bflux = False 
         model.parameters.tetha = 0
         model.parameters.alphav = 0
-
+        print(f"Using MPI? {comm.size>1}")
         model.simulator.run(save=True, purge=True, parallel=True, use_mpi=(comm.size>1))
 
         runtime_1D_sim = time.time() - st