Merge branch 'develop' into notebook_interface

Author: ptooley

.gitignore

@@ -1,3 +1,4 @@
+pypop/version
 __pycache__
 *.egg-info
 *.pkl

MANIFEST.in

@@ -1,4 +1,6 @@
+include pypop/version
 recursive-include pypop/examples *
 recursive-include pypop/cfgs *
 recursive-include pypop/cutters *
 recursive-include pypop/filters *
+global-exclude */.ipynb_checkpoints/*

pypop/__init__.py

@@ -9,3 +9,11 @@
 from . import metrics
 from . import prv
 from . import config
+
+from .version import get_version
+
+__all__ = ['__version__']
+
+__version__ = get_version()
+
+

pypop/cfgs/serial_useful_computation.cfg

@@ -109,8 +109,8 @@ window_pixel_size 1
 window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 2 60000018 60000023
-window_filter_module evt_type_label 2 "Executed OpenMP parallel function" "Executed OpenMP task function"
+window_filter_module evt_type 3 60000005 60000018 60000023
+window_filter_module evt_type_label 3 "OpenMP barrier" "Executed OpenMP parallel function" "Executed OpenMP task function"
 window_synchronize 1
 
 ################################################################################

pypop/metrics/metricset.py

@@ -110,7 +110,7 @@ def _choose_ref_key(stats_dict):
             stats_dict.items(),
             key=lambda x: "{:05}_{:05}".format(
                 sum(x[1].metadata.threads_per_process),
-                x[1].metadata.threads_per_process[0],
+                max(x[1].metadata.threads_per_process),
             ),
         )[0]
 

pypop/version.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+from warnings import warn
+from pkg_resources import resource_filename
+from subprocess import run, PIPE
+
+_k_unknown_ver = "Unknown"
+
+def get_git_verstring():
+    git_result = run(
+        ['git', 'describe', '--tags', '--dirty', '--long'],
+        stdout=PIPE,
+        stderr=PIPE,
+    )
+    if git_result.returncode != 0:
+      return _k_unknown_ver
+
+    ver_string = git_result.stdout.decode().strip()
+    ver_tokens = ver_string.split('-')
+
+    dirty = None
+    if ver_tokens[-1] == "dirty":
+      dirty = ver_tokens.pop()
+
+    sha = ver_tokens.pop()
+    commitcount = ver_tokens.pop()
+    tag = '-'.join(ver_tokens)
+
+    if commitcount == '0':
+      return "-".join([tag, dirty]) if dirty else tag
+
+    return ver_string
+
+
+def get_version():
+
+  gitver = get_git_verstring()
+  if gitver != _k_unknown_ver:
+    return gitver
+  
+  try:
+    with open(resource_filename(__name__, 'version'), 'rt') as fh:
+      fileversion = fh.readlines().strip()
+      return fileversion
+  except FileNotFoundError:
+    pass
+    
+  return _k_unknown_ver

setup.py

@@ -3,15 +3,17 @@
 # Copyright (c) 2019, The Numerical Algorithms Group, Ltd. All rights reserved.
 
 from setuptools import setup, find_packages
+from versionate import versionate
 
 setup(
     name="pypop",
-    version="0.2.0rc8",
+    version=versionate(),
     url="https://github.com/numericalalgorithmsgroup/pypop.git",
     author="Numerical Algorithms Group",
     author_email="phil.tooley@nag.co.uk",
     description="Python notebook support for POP metrics and reports",
     packages=find_packages(),
+    python_requires=">=3.6",
     install_requires=[
         "numpy",
         "matplotlib >= 2",

versionate.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+from sys import hexversion
+from warnings import warn
+from subprocess import check_output, CalledProcessError, PIPE
+
+_k_unknown_ver = "Unknown"
+
+
+def get_git_verstring(silent=True):
+    try:
+        git_result = check_output(
+            ['git', 'describe', '--tags', '--dirty', '--long'],
+            stderr=PIPE,
+        )
+    except CalledProcessError as err:
+        if not silent:
+            warn("Git failed with error: {}".format(str(err.stderr)))
+        return _k_unknown_ver
+
+    ver_string = git_result.decode().strip()
+    ver_tokens = ver_string.split('-')
+
+    dirty = None
+    if ver_tokens[-1] == "dirty":
+      dirty = ver_tokens.pop()
+
+    sha = ver_tokens.pop()
+    commitcount = ver_tokens.pop()
+    tag = '-'.join(ver_tokens)
+
+    if commitcount == '0':
+      return "+".join([tag, dirty]) if dirty else tag
+
+    localver = "+".join([tag,sha])
+
+    return ".".join([localver, dirty]) if dirty else localver
+
+
+def versionate():
+
+  ver_string = get_git_verstring()
+
+  with open('pypop/version', 'wt') as fh:
+    fh.write(ver_string)
+
+  return ver_string
+
+
+if __name__ == "__main__":
+    print(get_git_verstring())