Merge branch 'release-3.0.1'

NERSC · Jan 2, 2020 · ef638e1 · ef638e1
2 parents b2a0c76 + 00c0d95
commit ef638e1
Show file tree

Hide file tree

Showing 235 changed files with 1,400 additions and 821 deletions.
diff --git a/.licenses/license.cpp b/.licenses/license.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/.licenses/license.py b/.licenses/license.py
@@ -1,6 +1,6 @@
 # MIT License
 # 
-# Copyright (c) 2019, The Regents of the University of California, 
+# Copyright (c) 2020, The Regents of the University of California, 
 # through Lawrence Berkeley National Laboratory (subject to receipt of any
 # required approvals from the U.S. Dept. of Energy).  All rights reserved.
 # 

diff --git a/.spack/package.py b/.spack/package.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,8 @@ class Timemory(CMakePackage):
     version('develop', branch='develop', submodules=True)
     version('3.0.0', commit='b36b1673b2c6b7ff3126d8261bef0f8f176c7beb',
             submodules=True)
+    version('3.0.1', commit='a5bb58b5e4d44b71f699f536ad1b56722f213ce6',
+            submodules=True)
 
     variant('python', default=True, description='Enable Python support')
     variant('mpi', default=False, description='Enable MPI support')

diff --git a/.travis.yml b/.travis.yml
@@ -28,21 +28,18 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--build-libs static'"
+        - MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--papi --mpi --build-libs static'"
     # GCC 7
     - os: linux
-      dist: xenial
+      dist: bionic
       python: "3.6"
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
-            - gcc-7
-            - g++-7
+            - gcc
+            - g++
             - build-essential
             - libmpich-dev
             - mpich
@@ -53,7 +50,7 @@ matrix:
             - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which gcc-7) && CXX=$(which g++-7) && BUILD_ARGS='--build-libs static --caliper'"
+        - MATRIX_EVAL="CC=$(which gcc) && CXX=$(which g++) && COVERAGE=1 && BUILD_TYPE=Debug && BUILD_ARGS='--build-libs static --papi'"
     #
     # GCC 8
     - os: linux
@@ -73,10 +70,9 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs static'"
+        - MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs static --mpi --papi'"
     # Clang 5.0
     - os: linux
       dist: xenial
@@ -96,10 +92,9 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && BUILD_ARGS='--build-libs static'"
+        - MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && BUILD_ARGS='--build-libs static --mpi --papi'"
     # Clang 7
     - os: linux
       dist: bionic
@@ -116,10 +111,9 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs static --caliper'"
+        - MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs static --caliper --mpi --papi'"
     # ------------------------------------------------------------------------ #
     #
     #   Python 3.7
@@ -143,10 +137,30 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--build-libs shared --gotcha'"
+        - MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--build-libs shared --mpi --papi --gotcha'"
+    # GCC 7
+    - os: linux
+      dist: bionic
+      python: "3.7"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-7
+            - g++-7
+            - build-essential
+            - libmpich-dev
+            - mpich
+            - libpapi-dev
+            - papi-tools
+            - libgoogle-perftools-dev
+            - google-perftools
+            - graphviz
+      env:
+        - MATRIX_EVAL="CC=$(which gcc-7) && CXX=$(which g++-7) && BUILD_ARGS='--build-libs static --mpi --papi --caliper'"
     #
     # GCC 8
     - os: linux
@@ -166,10 +180,9 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs shared'"
+        - MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs shared --mpi --papi'"
     # Clang 5.0
     - os: linux
       dist: xenial
@@ -189,10 +202,9 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && COVERAGE=1 && BUILD_ARGS='--build-libs shared'"
+        - MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && BUILD_ARGS='--build-libs shared --mpi --papi'"
     # Clang 7
     - os: linux
       dist: bionic
@@ -209,19 +221,16 @@ matrix:
             - papi-tools
             - libgoogle-perftools-dev
             - google-perftools
-            - lcov
             - graphviz
       env:
-        - MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs shared --gotcha --caliper'"
+        - MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs shared --gotcha --caliper --mpi --papi'"
 
     # ------------------------------------------------------------------------ #
 
 before_install:
   - eval "${MATRIX_EVAL}"
   - export CC=${CC}
   - export CXX=${CXX}
-  - export TIMEMORY_VERBOSE=4
-  - export TIMEMORY_OUTPUT_TOTAL=1
   - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
   - bash miniconda.sh -b -p ${HOME}/miniconda
   - export PATH="${HOME}/miniconda/bin:${PATH}"
@@ -232,10 +241,8 @@ install:
   - env
   - conda create -c defaults -c conda-forge -n pyctest python=${TRAVIS_PYTHON_VERSION} pyctest scikit-build cmake numpy matplotlib pillow gperftools
   - source activate pyctest
-  # - python setup.py install --build-type=Debug -- -DTIMEMORY_BUILD_C=OFF -DTIMEMORY_BUILD_TOOLS=OFF -DBUILD_STATIC_LIBS=OFF -DTIMEMORY_USE_CALIPER=ON -DTIMEMORY_USE_GOTCHA=ON -- -j2
-  - export ARGS="-SF --pyctest-model=Continuous --pyctest-site=Travis --no-mpi ${BUILD_ARGS}"
+  - export ARGS="-SF --pyctest-model=Continuous --pyctest-site=Travis --python ${BUILD_ARGS}"
   - if [ -z "${BUILD_TYPE}" ]; then BUILD_TYPE=RelWithDebInfo ; fi
-  - if [ -z "${USE_MPI}" ]; then ARGS="${ARGS} --no-mpi"; fi
   - if [ -n "${COVERAGE}" ]; then ARGS="${ARGS} --coverage"; else ARGS="${ARGS} --profile=cpu"; fi
   - travis_wait 75 python ./pyctest-runner.py ${ARGS} --pyctest-build-type=${BUILD_TYPE} -- -VV
 
@@ -248,6 +255,7 @@ after_success:
   - eval "${MATRIX_EVAL}"
   - SUBMIT_COVERAGE=0
   - if [ -n "${COVERAGE}" ]; then SUBMIT_COVERAGE=1; fi
+  - if [ -z "$(which lcov)" ]; then SUBMIT_COVERAGE=0; fi
   # Create lcov report: capture coverage info, filter, debugging, and upload
   - if [ "${SUBMIT_COVERAGE}" -gt 0 ]; then lcov --directory . --capture --output-file coverage.info ; fi
   - if [ "${SUBMIT_COVERAGE}" -gt 0 ]; then lcov --remove coverage.info '/usr/*' "${HOME}"'/.cache/*' '*/external/*' --output-file coverage.info; fi

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.0
+3.0.1
diff --git a/cmake/Scripts/submit-coverage.sh b/cmake/Scripts/submit-coverage.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "Executing ${BASH_SOURCE[0]}..."
+DIR=$1
+
+if [ -z "${DIR}" ]; then echo "No directory provided!"; exit 1; fi
+if [ ! -d "${DIR}" ]; then DIR=$(realpath ${DIR}); fi
+if [ -z "${DIR}" ]; then echo "No directory provided!"; exit 1; fi
+
+set -e
+
+echo "Directory: ${DIR}..."
+cd ${DIR}
+
+echo "Generating coverage..."
+lcov --directory . --capture --output-file coverage.info
+echo "Removing coverage..."
+lcov --remove coverage.info '/usr/*' "${HOME}"'/.cache/*' '*/external/*' --output-file coverage.info
+echo "Listing coverage..."
+lcov --list coverage.info
+echo "Submitting coverage..."
+bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,7 +24,7 @@ def install(package):
 # -- Project information -----------------------------------------------------
 
 
-project = 'TiMemory'
+project = 'timemory'
 copyright = '2019, Jonathan R. Madsen'
 author = 'Jonathan R. Madsen'
 
@@ -41,8 +41,6 @@ def install(package):
 
 if not os.path.exists(_bindir):
     os.makedirs(_bindir)
-
-if not os.path.exists(_doxdir):
     os.chdir(_bindir)
     sp.run(["cmake",
             "-DTIMEMORY_BUILD_DOCS=ON", "-DENABLE_DOXYGEN_HTML_DOCS=ON",

diff --git a/examples/ex-caliper/ex_caliper.cpp b/examples/ex-caliper/ex_caliper.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-cpu-roofline/ex_cpu_roofline.cpp b/examples/ex-cpu-roofline/ex_cpu_roofline.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-cxx-basic/ex_cxx_basic.cpp b/examples/ex-cxx-basic/ex_cxx_basic.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-cxx-overhead/ex_cxx_overhead.cpp b/examples/ex-cxx-overhead/ex_cxx_overhead.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-cxx-tuple/ex_cxx_tuple.cpp b/examples/ex-cxx-tuple/ex_cxx_tuple.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-ert/ex_ert.cpp b/examples/ex-ert/ex_ert.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-gotcha/ex_gotcha.cpp b/examples/ex-gotcha/ex_gotcha.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-gotcha/ex_gotcha_lib.cpp b/examples/ex-gotcha/ex_gotcha_lib.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-gotcha/ex_gotcha_lib.hpp b/examples/ex-gotcha/ex_gotcha_lib.hpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-gpu-roofline/ex_gpu_roofline.cpp b/examples/ex-gpu-roofline/ex_gpu_roofline.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-likwid/ex_likwid.cpp b/examples/ex-likwid/ex_likwid.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-minimal/ex_minimal.c b/examples/ex-minimal/ex_minimal.c
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-minimal/ex_minimal.cpp b/examples/ex-minimal/ex_minimal.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-minimal/ex_minimal_library.c b/examples/ex-minimal/ex_minimal_library.c
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-minimal/ex_minimal_library.cpp b/examples/ex-minimal/ex_minimal_library.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-minimal/ex_minimal_library_overload.c b/examples/ex-minimal/ex_minimal_library_overload.c
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-minimal/ex_minimal_library_overload.cpp b/examples/ex-minimal/ex_minimal_library_overload.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-optional/ex_optional.cpp b/examples/ex-optional/ex_optional.cpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //

diff --git a/examples/ex-optional/ex_optional.hpp b/examples/ex-optional/ex_optional.hpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2019, The Regents of the University of California,
+// Copyright (c) 2020, The Regents of the University of California,
 // through Lawrence Berkeley National Laboratory (subject to receipt of any
 // required approvals from the U.S. Dept. of Energy).  All rights reserved.
 //