From 4632a431319bea69799126bd5dd6c18a044b5179 Mon Sep 17 00:00:00 2001
From: Sven Marcus <s.marcus@outlook.de>
Date: Tue, 13 Apr 2021 12:53:42 +0200
Subject: [PATCH] Move tests, introduce test container def

---
 .../poiseuille/PoiseuilleTestContainer.def    | 61 +++++++++++++++++++
 Python/SlurmTests/poiseuille/slurm.job        | 13 ++--
 Python/{ => tests}/test_acousticscaling.py    |  0
 Python/{ => tests}/test_boundaryconditions.py |  0
 Python/{ => tests}/test_geometry.py           |  0
 Python/{ => tests}/test_kernel.py             |  0
 6 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 Python/SlurmTests/poiseuille/PoiseuilleTestContainer.def
 rename Python/{ => tests}/test_acousticscaling.py (100%)
 rename Python/{ => tests}/test_boundaryconditions.py (100%)
 rename Python/{ => tests}/test_geometry.py (100%)
 rename Python/{ => tests}/test_kernel.py (100%)

diff --git a/Python/SlurmTests/poiseuille/PoiseuilleTestContainer.def b/Python/SlurmTests/poiseuille/PoiseuilleTestContainer.def
new file mode 100644
index 000000000..4866726d6
--- /dev/null
+++ b/Python/SlurmTests/poiseuille/PoiseuilleTestContainer.def
@@ -0,0 +1,61 @@
+BootStrap: docker
+From: ubuntu:20.04
+
+%files
+    3rdParty 3rdParty
+    apps apps
+    CMake CMake
+    Python Python
+    src src
+    CMakeLists.txt CMakeLists.txt
+    cpu.cmake cpu.cmake
+    gpu.cmake gpu.cmake
+    setup.py setup.py
+    pyproject.toml pyproject.toml
+
+
+%post
+    export DEBIAN_FRONTEND=noninteractive
+    apt-get update &&          \
+    apt-get install -y         \
+    build-essential            \
+    cmake=3.16.3-1ubuntu1      \
+    python3                    \
+    python3-dev                \
+    python3-pip                \
+    mpich                      \
+    libomp-dev
+
+    pip3 install setuptools wheel
+
+    export PYTHONPATH=Python
+    python3 /setup.py install
+
+%environment
+    export PYTHONPATH=/Python
+
+%appenv poiseuille01
+    export PYTHONPATH=Python
+    export PYFLUIDS_SCALE_LEVEL=0
+
+%apprun poisueille01
+    python3 /Python/SlurmTests/poiseuille/simulation_runner.py
+
+
+%appenv poiseuille02
+    export PYTHONPATH=Python
+    export PYFLUIDS_SCALE_LEVEL=1
+
+%apprun poisueille02
+    python3 /Python/SlurmTests/poiseuille/simulation_runner.py
+
+
+%appenv poiseuille03
+    export PYTHONPATH=Python
+    export PYFLUIDS_SCALE_LEVEL=2
+
+%apprun poisueille03
+    python3 /Python/SlurmTests/poiseuille/simulation_runner.py
+
+%apprun evaluate
+    python3 /Python/SlurmTests/poiseuille/evaluator.py
\ No newline at end of file
diff --git a/Python/SlurmTests/poiseuille/slurm.job b/Python/SlurmTests/poiseuille/slurm.job
index 1d7072123..409749fda 100644
--- a/Python/SlurmTests/poiseuille/slurm.job
+++ b/Python/SlurmTests/poiseuille/slurm.job
@@ -13,13 +13,8 @@ source .bashrc
 echo "PyFluids Poiseuille Test Case"
 echo "Number of tasks: ${SLURM_NTASKS}"
 
-export PYFLUIDS_SCALE_LEVEL=0
-mpiexec -np "$SLURM_NTASKS" singularity exec SingularityImages/VirtualFluidsMPICH.sif python3 /VirtualFluids_dev/Python/poiseuille/simulation_runner.py
+mpiexec -np "$SLURM_NTASKS" singularity run --app PoiseuilleTestContainer.sif --app poiseuille01
+mpiexec -np "$SLURM_NTASKS" singularity run --app PoiseuilleTestContainer.sif --app poiseuille02
+mpiexec -np "$SLURM_NTASKS" singularity run --app PoiseuilleTestContainer.sif --app poiseuille03
 
-export PYFLUIDS_SCALE_LEVEL=1
-mpiexec -np "$SLURM_NTASKS" singularity exec SingularityImages/VirtualFluidsMPICH.sif python3 /VirtualFluids_dev/Python/poiseuille/simulation_runner.py
-
-export PYFLUIDS_SCALE_LEVEL=2
-mpiexec -np "$SLURM_NTASKS" singularity exec SingularityImages/VirtualFluidsMPICH.sif python3 /VirtualFluids_dev/Python/poiseuille/simulation_runner.py
-
-singularity exec SingularityImages/VirtualFluidsMPICH.sif python3 /VirtualFluids_dev/Python/poiseuille/SlurmTests/poiseuille/evaluator.py
+singularity run --app PoiseuilleTestContainer.sif evaluate
diff --git a/Python/test_acousticscaling.py b/Python/tests/test_acousticscaling.py
similarity index 100%
rename from Python/test_acousticscaling.py
rename to Python/tests/test_acousticscaling.py
diff --git a/Python/test_boundaryconditions.py b/Python/tests/test_boundaryconditions.py
similarity index 100%
rename from Python/test_boundaryconditions.py
rename to Python/tests/test_boundaryconditions.py
diff --git a/Python/test_geometry.py b/Python/tests/test_geometry.py
similarity index 100%
rename from Python/test_geometry.py
rename to Python/tests/test_geometry.py
diff --git a/Python/test_kernel.py b/Python/tests/test_kernel.py
similarity index 100%
rename from Python/test_kernel.py
rename to Python/tests/test_kernel.py
-- 
GitLab