[Darshan-commits] [Git][darshan/darshan][master] 2 commits: AutoPerf modules not supported in generic read_all routines for PyDarshan

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
9f9eb7f9 by Shane Snyder at 2021-05-06T17:02:40-05:00
AutoPerf modules not supported in generic read_all routines for PyDarshan

- - - - -
48636ea5 by Shane Snyder at 2021-05-06T17:02:40-05:00
Merge branch 'snyder/pydarshan-report-read-all-autoperf' into 'master'

AutoPerf modules not supported in generic read_all routines for PyDarshan

See merge request darshan/darshan!110
- - - - -


5 changed files:

- darshan-util/pydarshan/CHANGELOG.rst
- darshan-util/pydarshan/darshan/__init__.py
- darshan-util/pydarshan/darshan/report.py
- darshan-util/pydarshan/setup.cfg
- darshan-util/pydarshan/setup.py


Changes:

=====================================
darshan-util/pydarshan/CHANGELOG.rst
=====================================
@@ -1,3 +1,8 @@
+PyDarshan-3.3.0.3
+=================
+* fixed bug resulting in errors when reading logs with AutoPerf data
+  accessed using the Darshan Report interface with option 'read_all=True'
+
 PyDarshan-3.3.0.2
 =================
 * Initial public release


=====================================
darshan-util/pydarshan/darshan/__init__.py
=====================================
@@ -3,7 +3,7 @@ PyDarshan provides direct log access for reading binary Darshan logs.
 PyDarshan also provides a suite of analysis utilities.
 """
 
-__version__ = '3.3.0.2'
+__version__ = '3.3.0.3'
 __darshanutil_version__ = '3.3.0'
 
 import logging


=====================================
darshan-util/pydarshan/darshan/report.py
=====================================
@@ -523,7 +523,12 @@ class DarshanReport(object):
 
         self.read_all_generic_records(dtype=dtype)
         self.read_all_dxt_records(dtype=dtype)
-        self.mod_read_all_lustre_records(dtype=dtype)
+        if "LUSTRE" in self.data['modules']:
+            self.mod_read_all_lustre_records(dtype=dtype)
+        if "APMPI" in self.data['modules']:
+            self.mod_read_all_apmpi_records(dtype=dtype)
+        if "APXC" in self.data['modules']:
+            self.mod_read_all_apxc_records(dtype=dtype)
         
         return
 
@@ -578,7 +583,7 @@ class DarshanReport(object):
             None
 
         """
-        unsupported =  ['DXT_POSIX', 'DXT_MPIIO', 'LUSTRE']
+        unsupported =  ['DXT_POSIX', 'DXT_MPIIO', 'LUSTRE', 'APMPI', 'APXC']
 
         if mod in unsupported:
             if warnings:
@@ -645,7 +650,7 @@ class DarshanReport(object):
 
         pass
 
-    def mod_read_all_apmpi_records(self, mod, dtype=None, warnings=True):
+    def mod_read_all_apmpi_records(self, mod="APMPI", dtype=None, warnings=True):
         """ 
         Reads all APMPI records for provided module.
 
@@ -659,7 +664,7 @@ class DarshanReport(object):
         """
         if mod not in self.data['modules']:
             if warnings:
-                logger.warning(f"Skipping. Log does not contain data for mod: {mod}")
+                logger.warning(f" Skipping. Log does not contain data for mod: {mod}")
             return
 
 
@@ -696,7 +701,7 @@ class DarshanReport(object):
 
         pass
 
-    def mod_read_all_apxc_records(self, mod, dtype=None, warnings=True):
+    def mod_read_all_apxc_records(self, mod="APXC", dtype=None, warnings=True):
         """ 
         Reads all APXC records for provided module.
 
@@ -710,7 +715,7 @@ class DarshanReport(object):
         """
         if mod not in self.data['modules']:
             if warnings:
-                logger.warning(f"Skipping. Log does not contain data for mod: {mod}")
+                logger.warning(f" Skipping. Log does not contain data for mod: {mod}")
             return
 
         supported =  ['APXC'] 
@@ -760,7 +765,7 @@ class DarshanReport(object):
         """
         if mod not in self.data['modules']:
             if warnings:
-                logger.warning(f"Skipping. Log does not contain data for mod: {mod}")
+                logger.warning(f" Skipping. Log does not contain data for mod: {mod}")
             return
 
 


=====================================
darshan-util/pydarshan/setup.cfg
=====================================
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.3.0.2
+current_version = 3.3.0.3
 commit = False
 tag = False
 


=====================================
darshan-util/pydarshan/setup.py
=====================================
@@ -76,6 +76,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url='https://www.mcs.anl.gov/research/projects/darshan/',
-    version='3.3.0.2',
+    version='3.3.0.3',
     zip_safe=False,
 )



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/-/compare/b0da9f03d102bd445102390ccf8b08a82186d4f2...48636ea5d4d0d5816d27de4a18dd4890a2649177

-- 
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/-/compare/b0da9f03d102bd445102390ccf8b08a82186d4f2...48636ea5d4d0d5816d27de4a18dd4890a2649177
You're receiving this email because of your account on xgitlab.cels.anl.gov.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20210506/54ca33ac/attachment-0001.html>