smaller test base

devitocodes · Nov 9, 2018 · 4900013 · 4900013
1 parent d4fd3d2
commit 4900013
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 66 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ matrix:
           packages:
             - gcc-5
             - g++-5
-      env: DEVITO_ARCH=gcc-5 DEVITO_OPENMP=0 RUN_EXAMPLES=True INSTALL_TYPE=conda MPI_INSTALL=1
+      env: DEVITO_ARCH=gcc-5 DEVITO_OPENMP=0 RUN_EXAMPLES=True INSTALL_TYPE=conda MPI_INSTALL=0
     - os: linux
       python: "3.6"
       addons:
@@ -40,16 +40,6 @@ matrix:
             - gcc-4.9
             - g++-4.9
       env: DEVITO_ARCH=gcc-4.9 DEVITO_OPENMP=1 OMP_NUM_THREADS=2 RUN_EXAMPLES=True INSTALL_TYPE=conda MPI_INSTALL=1
-    - os: linux
-      python: "3.6"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test     # For gcc 4.9, 5 and 7
-          packages:
-            - gcc-4.9
-            - g++-4.9
-      env: DEVITO_ARCH=gcc-4.9 DEVITO_OPENMP=1 OMP_NUM_THREADS=2 RUN_EXAMPLES=True INSTALL_TYPE=conda MPI_INSTALL=0
     - os: linux
       python: "3.6"
       addons:
@@ -87,7 +77,9 @@ before_install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - sudo apt-get install -y -q mpich libmpich-dev
+  - if [[ "$MPI_INSTALL" == '1' ]]; then
+      sudo apt-get install -y -q mpich libmpich-dev;
+    fi
 
 install:
   # Install devito with conda
@@ -97,9 +89,9 @@ install:
       pip install -e .;
       conda list;
     fi
-  - if [[ "$MPI_INSTALL" == '1' ]]; then
-      pip install -r mpi_requirements.txt;
-    fi
+
+  # Install mpi4py if mpi is installed
+  - if [[ $INSTALL_TYPE == 'conda' ]] && [[ $MPI_INSTALL == '1' ]]; then pip install -r mpi_requirements.txt; fi
 
   # Install devito with pip
   - if [[ $INSTALL_TYPE == 'pip_setup' ]]; then python setup.py install; fi

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -19,7 +19,7 @@ pipeline {
                      environment {
                          HOME="${WORKSPACE}"
                          DEVITO_OPENMP=0
-						 INSTALL_MPI=0
+                         INSTALL_MPI=1
                          PYTHONPATH="${WORKSPACE}/lib/python3.6/site-packages/"
                      }
                      steps {
@@ -28,51 +28,14 @@ pipeline {
                          runPipTests()
                      }
                 }
-                // For each combination of parameters required, build and test
-                stage('Build and test gcc-4.9 container with MPI') {
-                     agent { dockerfile { label 'azure-linux-8core'
-                                          filename 'Dockerfile.jenkins'
-                                          additionalBuildArgs "--build-arg gccvers=4.9" } }
-                     environment {
-                         HOME="${WORKSPACE}"
-                         DEVITO_OPENMP=0
-						 INSTALL_MPI=1
-                         PYTHONPATH="${WORKSPACE}/lib/python3.6/site-packages/"
-                     }
-                     steps {
-                         cleanWorkspace()
-                         pipInstallDevito()
-                         runPipTests()
-                     }
-                }
-                stage('Build and test gcc-4.9 OpenMP container') {
-                     agent { dockerfile { label 'azure-linux-8core'
-                                          filename 'Dockerfile.jenkins'
-                                          additionalBuildArgs "--build-arg gccvers=4.9" } }
-                     environment {
-                         HOME="${WORKSPACE}"
-                         DEVITO_OPENMP=1
-						 INSTALL_MPI=1
-                         OMP_NUM_THREADS=2
-                     }
-                     steps {
-                         cleanWorkspace()
-                         condaInstallDevito()
-						 condaInstallMPI()
-                         runCondaTests()
-                         runExamples()
-                         runCodecov()
-                         buildDocs()
-                     }
-                }
                 stage('Build and test gcc-4.9 OpenMP container no MPI') {
                      agent { dockerfile { label 'azure-linux-8core'
                                           filename 'Dockerfile.jenkins'
                                           additionalBuildArgs "--build-arg gccvers=4.9" } }
                      environment {
                          HOME="${WORKSPACE}"
                          DEVITO_OPENMP=1
-						 INSTALL_MPI=0
+                         INSTALL_MPI=0
                          OMP_NUM_THREADS=2
                      }
                      steps {
@@ -91,7 +54,7 @@ pipeline {
                      environment {
                          HOME="${WORKSPACE}"
                          DEVITO_OPENMP=0
-						 INSTALL_MPI=1
+                         INSTALL_MPI=1
                      }
                      steps {
                          cleanWorkspace()
@@ -111,7 +74,7 @@ pipeline {
                          HOME="${WORKSPACE}"
                          DEVITO_BACKEND="yask"
                          DEVITO_OPENMP="0"
-						 INSTALL_MPI="1"
+                         INSTALL_MPI="1"
                          YC_CXX="g++-7"
                      }
                      steps {
@@ -131,7 +94,7 @@ pipeline {
                      environment {
                          HOME="${WORKSPACE}"
                          DEVITO_OPENMP=0
-						 INSTALL_MPI=1
+                         INSTALL_MPI=1
                      }
                      steps {
                          cleanWorkspace()

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
     else:
         reqs += [ir]
 
-if os.environ.get('INSTALL_MPI') == '1':
+if os.system('which mpicc') == '0':
     reqs += ['mpi4py']
 
 setup(name='devito',

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -287,19 +287,18 @@ def wrapper(*args, **kwargs):
     return dec
 
 
-# Support to run MPI tests
-# This is partly extracted from:
-# `https://github.com/firedrakeproject/firedrake/blob/master/tests/conftest.py`
-
-mpi_exec = 'mpiexec'
-mpi_distro = sniff_mpi_distro(mpi_exec)
-
-
 def parallel(item):
     """Run a test in parallel.
 
     :parameter item: The test item to run.
     """
+    # Support to run MPI tests
+    # This is partly extracted from:
+    # `https://github.com/firedrakeproject/firedrake/blob/master/tests/conftest.py`
+
+    mpi_exec = 'mpiexec'
+    mpi_distro = sniff_mpi_distro(mpi_exec)
+
     marker = item.get_closest_marker("parallel")
     nprocs = as_tuple(marker.kwargs.get("nprocs", 2))
     for i in nprocs: