add hybrid test configuration

su2code · May 15, 2020 · faf1382 · faf1382
1 parent 67a1051
commit faf1382
Show file tree

Hide file tree

Showing 3 changed files with 771 additions and 6 deletions.
diff --git a/.clang-format b/.clang-format
@@ -2,7 +2,3 @@ BasedOnStyle: Google
 PointerAlignment: Left
 DerivePointerAlignment: false
 ColumnLimit: 120
-#BinPackArguments: false
-BinPackParameters: false
-ExperimentalAutoDetectBinPacking: false
-AllowAllParametersOfDeclarationOnNextLine: false
diff --git a/.travis.yml b/.travis.yml
@@ -37,11 +37,15 @@ env:
         - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
+        # Hybrid-parallel build and test
+        - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Dwith-omp=true -Denable-openblas=true -Denable-tecio=false"
+          TEST_SCRIPT=hybrid_regression.py
+
         # Serial build and test for AD
         - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Dwith-mpi=disabled -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
-        # Parallel build and test for AD:
+        # Parallel build and test for AD
         - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
@@ -51,7 +55,7 @@ before_install:
     - sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
     # Install the necessary packages using apt-get with sudo
     - sudo apt-get update -qq
-    - sudo apt-get install -qq build-essential python3-numpy python3-scipy libopenmpi-dev openmpi-bin swig python3-mpi4py  
+    - sudo apt-get install -qq build-essential python3-numpy python3-scipy libopenmpi-dev openmpi-bin swig python3-mpi4py libopenblas-dev
     # to avoid interference with MPI
     - test -n $CC  && unset CC
     - test -n $CXX && unset CXX