Skip to content
This repository was archived by the owner on Jul 31, 2024. It is now read-only.

Commit ef638e1

Browse files
jrmadsenjrmadsen
committed
Merge branch 'release-3.0.1'
2 parents b2a0c76 + 00c0d95 commit ef638e1

File tree

235 files changed

+1400
-821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+1400
-821
lines changed

‎.licenses/license.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎.licenses/license.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22
#
3-
# Copyright (c) 2019, The Regents of the University of California,
3+
# Copyright (c) 2020, The Regents of the University of California,
44
# through Lawrence Berkeley National Laboratory (subject to receipt of any
55
# required approvals from the U.S. Dept. of Energy). All rights reserved.
66
#

‎.spack/package.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
1+
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
22
# Spack Project Developers. See the top-level COPYRIGHT file for details.
33
#
44
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -19,6 +19,8 @@ class Timemory(CMakePackage):
1919
version('develop', branch='develop', submodules=True)
2020
version('3.0.0', commit='b36b1673b2c6b7ff3126d8261bef0f8f176c7beb',
2121
submodules=True)
22+
version('3.0.1', commit='a5bb58b5e4d44b71f699f536ad1b56722f213ce6',
23+
submodules=True)
2224

2325
variant('python', default=True, description='Enable Python support')
2426
variant('mpi', default=False, description='Enable MPI support')

‎.travis.yml

+35-27
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,18 @@ matrix:
2828
- papi-tools
2929
- libgoogle-perftools-dev
3030
- google-perftools
31-
- lcov
3231
- graphviz
3332
env:
34-
- MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--build-libs static'"
33+
- MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--papi --mpi --build-libs static'"
3534
# GCC 7
3635
- os: linux
37-
dist: xenial
36+
dist: bionic
3837
python: "3.6"
3938
addons:
4039
apt:
41-
sources:
42-
- ubuntu-toolchain-r-test
4340
packages:
44-
- gcc-7
45-
- g++-7
41+
- gcc
42+
- g++
4643
- build-essential
4744
- libmpich-dev
4845
- mpich
@@ -53,7 +50,7 @@ matrix:
5350
- lcov
5451
- graphviz
5552
env:
56-
- MATRIX_EVAL="CC=$(which gcc-7) && CXX=$(which g++-7) && BUILD_ARGS='--build-libs static --caliper'"
53+
- MATRIX_EVAL="CC=$(which gcc) && CXX=$(which g++) && COVERAGE=1 && BUILD_TYPE=Debug && BUILD_ARGS='--build-libs static --papi'"
5754
#
5855
# GCC 8
5956
- os: linux
@@ -73,10 +70,9 @@ matrix:
7370
- papi-tools
7471
- libgoogle-perftools-dev
7572
- google-perftools
76-
- lcov
7773
- graphviz
7874
env:
79-
- MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs static'"
75+
- MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs static --mpi --papi'"
8076
# Clang 5.0
8177
- os: linux
8278
dist: xenial
@@ -96,10 +92,9 @@ matrix:
9692
- papi-tools
9793
- libgoogle-perftools-dev
9894
- google-perftools
99-
- lcov
10095
- graphviz
10196
env:
102-
- MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && BUILD_ARGS='--build-libs static'"
97+
- MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && BUILD_ARGS='--build-libs static --mpi --papi'"
10398
# Clang 7
10499
- os: linux
105100
dist: bionic
@@ -116,10 +111,9 @@ matrix:
116111
- papi-tools
117112
- libgoogle-perftools-dev
118113
- google-perftools
119-
- lcov
120114
- graphviz
121115
env:
122-
- MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs static --caliper'"
116+
- MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs static --caliper --mpi --papi'"
123117
# ------------------------------------------------------------------------ #
124118
#
125119
# Python 3.7
@@ -143,10 +137,30 @@ matrix:
143137
- papi-tools
144138
- libgoogle-perftools-dev
145139
- google-perftools
146-
- lcov
147140
- graphviz
148141
env:
149-
- MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--build-libs shared --gotcha'"
142+
- MATRIX_EVAL="CC=$(which gcc-6) && CXX=$(which g++-6) && BUILD_TYPE=MinSizeRel && BUILD_ARGS='--build-libs shared --mpi --papi --gotcha'"
143+
# GCC 7
144+
- os: linux
145+
dist: bionic
146+
python: "3.7"
147+
addons:
148+
apt:
149+
sources:
150+
- ubuntu-toolchain-r-test
151+
packages:
152+
- gcc-7
153+
- g++-7
154+
- build-essential
155+
- libmpich-dev
156+
- mpich
157+
- libpapi-dev
158+
- papi-tools
159+
- libgoogle-perftools-dev
160+
- google-perftools
161+
- graphviz
162+
env:
163+
- MATRIX_EVAL="CC=$(which gcc-7) && CXX=$(which g++-7) && BUILD_ARGS='--build-libs static --mpi --papi --caliper'"
150164
#
151165
# GCC 8
152166
- os: linux
@@ -166,10 +180,9 @@ matrix:
166180
- papi-tools
167181
- libgoogle-perftools-dev
168182
- google-perftools
169-
- lcov
170183
- graphviz
171184
env:
172-
- MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs shared'"
185+
- MATRIX_EVAL="CC=$(which gcc-8) && CXX=$(which g++-8) && BUILD_ARGS='--build-libs shared --mpi --papi'"
173186
# Clang 5.0
174187
- os: linux
175188
dist: xenial
@@ -189,10 +202,9 @@ matrix:
189202
- papi-tools
190203
- libgoogle-perftools-dev
191204
- google-perftools
192-
- lcov
193205
- graphviz
194206
env:
195-
- MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && COVERAGE=1 && BUILD_ARGS='--build-libs shared'"
207+
- MATRIX_EVAL="CC=$(which clang-5.0) && CXX=$(which clang++-5.0) && BUILD_ARGS='--build-libs shared --mpi --papi'"
196208
# Clang 7
197209
- os: linux
198210
dist: bionic
@@ -209,19 +221,16 @@ matrix:
209221
- papi-tools
210222
- libgoogle-perftools-dev
211223
- google-perftools
212-
- lcov
213224
- graphviz
214225
env:
215-
- MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs shared --gotcha --caliper'"
226+
- MATRIX_EVAL="CC=$(which clang-7) && CXX=$(which clang++-7) && BUILD_ARGS='--build-libs shared --gotcha --caliper --mpi --papi'"
216227

217228
# ------------------------------------------------------------------------ #
218229

219230
before_install:
220231
- eval "${MATRIX_EVAL}"
221232
- export CC=${CC}
222233
- export CXX=${CXX}
223-
- export TIMEMORY_VERBOSE=4
224-
- export TIMEMORY_OUTPUT_TOTAL=1
225234
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
226235
- bash miniconda.sh -b -p ${HOME}/miniconda
227236
- export PATH="${HOME}/miniconda/bin:${PATH}"
@@ -232,10 +241,8 @@ install:
232241
- env
233242
- conda create -c defaults -c conda-forge -n pyctest python=${TRAVIS_PYTHON_VERSION} pyctest scikit-build cmake numpy matplotlib pillow gperftools
234243
- source activate pyctest
235-
# - 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
236-
- export ARGS="-SF --pyctest-model=Continuous --pyctest-site=Travis --no-mpi ${BUILD_ARGS}"
244+
- export ARGS="-SF --pyctest-model=Continuous --pyctest-site=Travis --python ${BUILD_ARGS}"
237245
- if [ -z "${BUILD_TYPE}" ]; then BUILD_TYPE=RelWithDebInfo ; fi
238-
- if [ -z "${USE_MPI}" ]; then ARGS="${ARGS} --no-mpi"; fi
239246
- if [ -n "${COVERAGE}" ]; then ARGS="${ARGS} --coverage"; else ARGS="${ARGS} --profile=cpu"; fi
240247
- travis_wait 75 python ./pyctest-runner.py ${ARGS} --pyctest-build-type=${BUILD_TYPE} -- -VV
241248

@@ -248,6 +255,7 @@ after_success:
248255
- eval "${MATRIX_EVAL}"
249256
- SUBMIT_COVERAGE=0
250257
- if [ -n "${COVERAGE}" ]; then SUBMIT_COVERAGE=1; fi
258+
- if [ -z "$(which lcov)" ]; then SUBMIT_COVERAGE=0; fi
251259
# Create lcov report: capture coverage info, filter, debugging, and upload
252260
- if [ "${SUBMIT_COVERAGE}" -gt 0 ]; then lcov --directory . --capture --output-file coverage.info ; fi
253261
- if [ "${SUBMIT_COVERAGE}" -gt 0 ]; then lcov --remove coverage.info '/usr/*' "${HOME}"'/.cache/*' '*/external/*' --output-file coverage.info; fi

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.0.1

‎cmake/Scripts/submit-coverage.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
echo "Executing ${BASH_SOURCE[0]}..."
4+
DIR=$1
5+
6+
if [ -z "${DIR}" ]; then echo "No directory provided!"; exit 1; fi
7+
if [ ! -d "${DIR}" ]; then DIR=$(realpath ${DIR}); fi
8+
if [ -z "${DIR}" ]; then echo "No directory provided!"; exit 1; fi
9+
10+
set -e
11+
12+
echo "Directory: ${DIR}..."
13+
cd ${DIR}
14+
15+
echo "Generating coverage..."
16+
lcov --directory . --capture --output-file coverage.info
17+
echo "Removing coverage..."
18+
lcov --remove coverage.info '/usr/*' "${HOME}"'/.cache/*' '*/external/*' --output-file coverage.info
19+
echo "Listing coverage..."
20+
lcov --list coverage.info
21+
echo "Submitting coverage..."
22+
bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

‎docs/conf.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def install(package):
2424
# -- Project information -----------------------------------------------------
2525

2626

27-
project = 'TiMemory'
27+
project = 'timemory'
2828
copyright = '2019, Jonathan R. Madsen'
2929
author = 'Jonathan R. Madsen'
3030

@@ -41,8 +41,6 @@ def install(package):
4141

4242
if not os.path.exists(_bindir):
4343
os.makedirs(_bindir)
44-
45-
if not os.path.exists(_doxdir):
4644
os.chdir(_bindir)
4745
sp.run(["cmake",
4846
"-DTIMEMORY_BUILD_DOCS=ON", "-DENABLE_DOXYGEN_HTML_DOCS=ON",

‎examples/ex-caliper/ex_caliper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-cpu-roofline/ex_cpu_roofline.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-cxx-basic/ex_cxx_basic.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-cxx-overhead/ex_cxx_overhead.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-cxx-tuple/ex_cxx_tuple.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-ert/ex_ert.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-gotcha/ex_gotcha.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-gotcha/ex_gotcha_lib.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-gotcha/ex_gotcha_lib.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-gpu-roofline/ex_gpu_roofline.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-likwid/ex_likwid.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-minimal/ex_minimal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-minimal/ex_minimal.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-minimal/ex_minimal_library.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-minimal/ex_minimal_library.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-minimal/ex_minimal_library_overload.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-minimal/ex_minimal_library_overload.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-optional/ex_optional.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

‎examples/ex-optional/ex_optional.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2019, The Regents of the University of California,
3+
// Copyright (c) 2020, The Regents of the University of California,
44
// through Lawrence Berkeley National Laboratory (subject to receipt of any
55
// required approvals from the U.S. Dept. of Energy). All rights reserved.
66
//

0 commit comments

Comments
 (0)