Merge pull request #26 from laristra/bb_merge

Version 2.2.0 tagged for GitHub release

README.md

@@ -141,8 +141,8 @@ Execute the following from the portage root directory:
 INTEL_VERSION=18.0.3
 MPI_VERSION=2.1.5
 JALI_VERSION=1.0.4
-TANGRAM_VERSION=0.9.4
-XMOF2D_VERSION=0.9.4
+TANGRAM_VERSION=0.9.7
+XMOF2D_VERSION=0.9.5
 BOOST_VERSION=1.68.0
 
 BUILD_PREFIX=/usr/projects/ngc/private
@@ -157,7 +157,7 @@ cmake \
     -D ENABLE_APP_TESTS=True \
     -D ENABLE_MPI=True \
     -D Jali_DIR:FILEPATH=${BUILD_PREFIX}/jali/${JALI_VERSION}-intel-${INTEL_VERSION}-openmpi-${MPI_VERSION}/lib \
-    -D TANGRAM_DIR:FILEPATH=${BUILD_PREFIX}/tangram/${TANGRAM_VERSION}-intel-${INTEL_VERSION}-openmpi-${MPI_VERSION} \
+    -D TANGRAM_DIR:FILEPATH=${BUILD_PREFIX}/tangram/${TANGRAM_VERSION}-boost-intel-${INTEL_VERSION}-openmpi-${MPI_VERSION} \
     -D XMOF2D_DIR:FILEPATH=${BUILD_PREFIX}/xmof2d/${XMOF2D_VERSION}-intel-${INTEL_VERSION}/share/cmake \
     -D LAPACKE_DIR=${BUILD_PREFIX}/lapack/3.8.0-patched-intel-${INTEL_VERSION} \
     ..
@@ -176,8 +176,8 @@ Execute the following from the portage root directory:
 . /usr/share/lmod/lmod/init/sh
 module load intel/18.0.5 openmpi/2.1.2 cmake
 JALI_INSTALL_PREFIX=/usr/projects/ngc/private/jali/1.0.4-intel-18.0.5-openmpi-2.1.2
-TANGRAM_INSTALL_PREFIX=/usr/projects/ngc/private/tangram/0.9.4-intel-18.0.5-openmpi-2.1.2
-XMOF2D_INSTALL_PREFIX=/usr/projects/ngc/private/xmof2d/0.9.4-intel-18.0.5
+TANGRAM_INSTALL_PREFIX=/usr/projects/ngc/private/tangram/0.9.7-intel-18.0.5-openmpi-2.1.2
+XMOF2D_INSTALL_PREFIX=/usr/projects/ngc/private/xmof2d/0.9.5-intel-18.0.5
 LAPACKE_DIR=/usr/projects/ngc/private/lapack/3.8.0-patched-intel-18.0.5
 mkdir build
 cd build
@@ -205,8 +205,8 @@ Thrust and TCMalloc in your build.  The cmake command for this is:
 . /usr/share/lmod/lmod/init/sh
 module load intel/18.0.5 openmpi/2.1.2 cmake
 JALI_INSTALL_PREFIX=/usr/projects/ngc/private/jali/1.0.4-intel-18.0.5-openmpi-2.1.2
-TANGRAM_INSTALL_PREFIX=/usr/projects/ngc/private/tangram/0.9.4-intel-18.0.5-openmpi-2.1.2
-XMOF2D_INSTALL_PREFIX=/usr/projects/ngc/private/xmof2d/0.9.4-intel-18.0.5
+TANGRAM_INSTALL_PREFIX=/usr/projects/ngc/private/tangram/0.9.7-thrust-intel-18.0.5-openmpi-2.1.2
+XMOF2D_INSTALL_PREFIX=/usr/projects/ngc/private/xmof2d/0.9.5-intel-18.0.5
 LAPACKE_DIR=/usr/projects/ngc/private/lapack/3.8.0-patched-intel-18.0.5
 mkdir build-thrust
 cd build-thrust
@@ -239,8 +239,8 @@ export MODULEPATH=""
 . /opt/local/packages/Modules/default/init/sh
 module load intel/18.0.1 openmpi/2.1.2 cmake
 JALI_INSTALL_PREFIX=/usr/local/codes/ngc/private/jali/1.0.4-intel-18.0.1-openmpi-2.1.2
-TANGRAM_INSTALL_PREFIX=/usr/local/codes/ngc/private/tangram/0.9.4-intel-18.0.1-openmpi-2.1.2
-XMOF2D_INSTALL_PREFIX=/usr/local/codes/ngc/private/xmof2d/0.9.4-intel-18.0.1
+TANGRAM_INSTALL_PREFIX=/usr/local/codes/ngc/private/tangram/0.9.7-intel-18.0.1-openmpi-2.1.2
+XMOF2D_INSTALL_PREFIX=/usr/local/codes/ngc/private/xmof2d/0.9.5-intel-18.0.1
 LAPACKE_DIR=/usr/local/codes/ngc/private/lapack/3.8.0-patched-intel-18.0.1/
 LAPACKE_INCLUDE_DIR=$LAPACKE_DIR/include
 LAPACKE_LIBRARY_DIR=$LAPACKE_DIR
@@ -273,8 +273,8 @@ export MODULEPATH=""
 module load gcc/6.4.0 openmpi/2.1.2 cmake
 FLECSI_INSTALL_PREFIX=/usr/local/codes/ngc/private/flecsi/374b56b-gcc-6.4.0
 FLECSISP_INSTALL_PREFIX=/usr/local/codes/ngc/private/flecsi-sp/e78c594-gcc-6.4.0
-TANGRAM_INSTALL_PREFIX=/usr/local/codes/ngc/private/tangram/0.9.4-gcc-6.4.0-openmpi-2.1.2
-XMOF2D_INSTALL_PREFIX=/usr/local/codes/ngc/private/xmof2d/0.9.4-gcc-6.4.0
+TANGRAM_INSTALL_PREFIX=/usr/local/codes/ngc/private/tangram/0.9.7-gcc-6.4.0-openmpi-2.1.2
+XMOF2D_INSTALL_PREFIX=/usr/local/codes/ngc/private/xmof2d/0.9.5-gcc-6.4.0
 LAPACKE_DIR=/usr/local/codes/ngc/private/lapack/3.8.0-patched-gcc-6.4.0
 LAPACKE_INCLUDE_DIR=$LAPACKE_DIR/include
 LAPACKE_LIBRARY_DIR=$LAPACKE_DIR

app/CMakeLists.txt

@@ -7,15 +7,21 @@ Please see the license file at the root of this repository, or at:
 include_directories(include)  # contains user_field.h for expression parsing
 
 add_subdirectory(apptest_cmp)
+add_subdirectory(multidef)
 add_subdirectory(distributed_cmp)
 add_subdirectory(simple_mesh_app)
 add_subdirectory(swarmapp)
 add_subdirectory(msmapp)
+
+option(ENABLE_APP_TIMINGS "Enable timing in apps" ON)
+
 if (Jali_DIR OR ENABLE_FleCSI)
   add_subdirectory(portageapp)
 endif (Jali_DIR OR ENABLE_FleCSI)
+
 if (Jali_DIR)
   add_subdirectory(timingapp)
+  add_subdirectory(part-by-part)
 endif (Jali_DIR)
 if(TANGRAM_FOUND AND XMOF2D_FOUND)
   add_subdirectory(ir_linetest_app)