From dcd2f340677967a7f842296f409e089055c10532 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 16 Aug 2018 19:36:07 -0500 Subject: [PATCH 1/3] Point requirements.txt to test for changes to TimingResult. (This shouldn't require any actual changes.) --- .test-conda-env-py3-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index 45c20c1f..59bb1da9 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,3 @@ -git+https://gitlab.tiker.net/inducer/boxtree +git+https://gitlab.tiker.net/inducer/boxtree@move-constant-one-wrangler-to-tools git+https://github.com/inducer/pymbolic git+https://github.com/inducer/loopy diff --git a/requirements.txt b/requirements.txt index 8e48bc1c..2417d372 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ sympy==1.1.1 git+https://github.com/inducer/pymbolic git+https://github.com/inducer/islpy git+https://github.com/inducer/pyopencl -git+https://gitlab.tiker.net/inducer/boxtree +git+https://gitlab.tiker.net/inducer/boxtree@move-constant-one-wrangler-to-tools git+https://github.com/inducer/loopy git+https://github.com/inducer/pyfmmlib -- GitLab From 12a3b92803121e1a6ba033b52449ad3c54979fe0 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 16 Aug 2018 19:46:02 -0500 Subject: [PATCH 2/3] Update documentation. --- sumpy/fmm.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sumpy/fmm.py b/sumpy/fmm.py index 17d52eed..bd1c51d9 100644 --- a/sumpy/fmm.py +++ b/sumpy/fmm.py @@ -55,6 +55,10 @@ class SumpyExpansionWranglerCodeContainer(object): necessarily must have a :class:`pyopencl.CommandQueue`, but this queue is allowed to be more ephemeral than the code, the code's lifetime is decoupled by storing it in this object. + + Timing results returned by this wrangler contain the values *wall_elapsed* + which measures elapsed wall time. This requires a command queue with + profiling enabled. """ def __init__(self, cl_context, @@ -171,7 +175,7 @@ class SumpyTimingFuture(object): "Timing data will not be collected.", category=UnableToCollectTimingData, stacklevel=3) - return TimingResult(wall_elapsed=None, process_elapsed=None) + return TimingResult(wall_elapsed=None) pyopencl.wait_for_events(self.events) @@ -181,7 +185,7 @@ class SumpyTimingFuture(object): (event.profile.end - event.profile.start) * _SECONDS_PER_NANOSECOND) - return TimingResult(wall_elapsed=result, process_elapsed=None) + return TimingResult(wall_elapsed=result) def done(self): return all( -- GitLab From f8362024c1efa79fc348843de93ad6cea72ba63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 16 Aug 2018 22:57:32 -0400 Subject: [PATCH 3/3] Point req*.txt files back at boxtree master --- .test-conda-env-py3-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index 59bb1da9..45c20c1f 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,3 @@ -git+https://gitlab.tiker.net/inducer/boxtree@move-constant-one-wrangler-to-tools +git+https://gitlab.tiker.net/inducer/boxtree git+https://github.com/inducer/pymbolic git+https://github.com/inducer/loopy diff --git a/requirements.txt b/requirements.txt index 2417d372..8e48bc1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ sympy==1.1.1 git+https://github.com/inducer/pymbolic git+https://github.com/inducer/islpy git+https://github.com/inducer/pyopencl -git+https://gitlab.tiker.net/inducer/boxtree@move-constant-one-wrangler-to-tools +git+https://gitlab.tiker.net/inducer/boxtree git+https://github.com/inducer/loopy git+https://github.com/inducer/pyfmmlib -- GitLab