Merge develop

commit 8cba583
Author: Ajay Panyala <ajay.panyala@gmail.com>
Date:   Tue Nov 3 09:30:52 2020 -0800

    commit 038dff2
    Author: Andy May <ajmay81@gmail.com>
    Date:   Tue Nov 3 17:30:06 2020 +0000

        Fix #181 (#182)

commit 3f3d6bd
Merge: 7196299 e1b7128
Author: Edoardo Aprà <edoardo.apra@gmail.com>
Date:   Tue Nov 3 09:06:59 2020 -0800

    Merge pull request #180 from edoapra/develop

    fix for travis failure in Ubuntu SICM stage

commit e1b7128
Merge: 246e215 d416c25
Author: edoapra <edoardo.apra@gmail.com>
Date:   Mon Nov 2 12:58:19 2020 -0800

    Merge remote-tracking branch 'upstream/develop' into develop

commit 246e215
Author: edoapra <edoardo.apra@gmail.com>
Date:   Mon Nov 2 10:20:05 2020 -0800

    jemalloc needs xsltproc

tools/ga-config.in

@@ -268,8 +268,7 @@ fi
 
 f77="@F77@"
 cc="@CC@"
-cppflags="@SCALAPACK_CPPFLAGS@ @LAPACK_CPPFLAGS@ @BLAS_CPPFLAGS@ @GA_MP_CPPFLAGS@ @ARMCI_NETWORK_CPPFLAGS@ @SICM_CPPF\
-LAGS@ -I@includedir@"
+cppflags="@SCALAPACK_CPPFLAGS@ @LAPACK_CPPFLAGS@ @BLAS_CPPFLAGS@ @GA_MP_CPPFLAGS@ @ARMCI_NETWORK_CPPFLAGS@ @SICM_CPPFLAGS@ -I@includedir@"
 network_cppflags="@ARMCI_NETWORK_CPPFLAGS@"
 cflags="@GA_COPT@"
 fflags="@GA_FOPT@ @FFLAG_INT@"

tools/ga-config.in.m4sh

@@ -11,9 +11,7 @@ dep_libs=`$prefix/bin/armci-config --libs`
 
 f77="@F77@"
 cc="@CC@"
-cppflags="@SCALAPACK_CPPFLAGS@ @LAPACK_CPPFLAGS@ @BLAS_CPPFLAGS@ @GA_MP_CPPFLAGS@ @ARMCI_NETWORK_CPPFLAGS@  @SICM_CPPFLAGS@ -I@prefix@/include"
-cppflags="@SCALAPACK_CPPFLAGS@ @LAPACK_CPPFLAGS@ @BLAS_CPPFLAGS@ @GA_MP_CPPFLAGS@ @ARMCI_NETWORK_CPPFLAGS@ @SICM_CPPF\
-LAGS@ -I@includedir@"
+cppflags="@SCALAPACK_CPPFLAGS@ @LAPACK_CPPFLAGS@ @BLAS_CPPFLAGS@ @GA_MP_CPPFLAGS@ @ARMCI_NETWORK_CPPFLAGS@ @SICM_CPPFLAGS@ -I@includedir@"
 network_cppflags="@ARMCI_NETWORK_CPPFLAGS@"
 cflags="@GA_COPT@"
 fflags="@GA_FOPT@ @FFLAG_INT@"

travis/install-sicm.sh

@@ -12,7 +12,7 @@ set -x
 # install dependencies
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo apt-get update -qq
-sudo apt-get install -qq libhwloc-dev libiomp-dev libnuma-dev libpfm4-dev llvm-3.9-dev numactl
+sudo apt-get install -qq libhwloc-dev libiomp-dev libnuma-dev libpfm4-dev llvm-3.9-dev numactl xsltproc
 
 # set install directory to current location to not cache jemalloc/SICM
 TRAVIS_ROOT="$1"