Commit 9f9eb7f9 authored by Shane Snyder's avatar Shane Snyder
Browse files

AutoPerf modules not supported in generic read_all routines for PyDarshan

parent b0da9f03
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 PyDarshan-3.3.0.2
================= =================
* Initial public release * Initial public release
...@@ -3,7 +3,7 @@ PyDarshan provides direct log access for reading binary Darshan logs. ...@@ -3,7 +3,7 @@ PyDarshan provides direct log access for reading binary Darshan logs.
PyDarshan also provides a suite of analysis utilities. PyDarshan also provides a suite of analysis utilities.
""" """
__version__ = '3.3.0.2' __version__ = '3.3.0.3'
__darshanutil_version__ = '3.3.0' __darshanutil_version__ = '3.3.0'
import logging import logging
......
...@@ -523,7 +523,12 @@ class DarshanReport(object): ...@@ -523,7 +523,12 @@ class DarshanReport(object):
self.read_all_generic_records(dtype=dtype) self.read_all_generic_records(dtype=dtype)
self.read_all_dxt_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 return
...@@ -578,7 +583,7 @@ class DarshanReport(object): ...@@ -578,7 +583,7 @@ class DarshanReport(object):
None None
""" """
unsupported = ['DXT_POSIX', 'DXT_MPIIO', 'LUSTRE'] unsupported = ['DXT_POSIX', 'DXT_MPIIO', 'LUSTRE', 'APMPI', 'APXC']
if mod in unsupported: if mod in unsupported:
if warnings: if warnings:
...@@ -645,7 +650,7 @@ class DarshanReport(object): ...@@ -645,7 +650,7 @@ class DarshanReport(object):
pass 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. Reads all APMPI records for provided module.
...@@ -659,7 +664,7 @@ class DarshanReport(object): ...@@ -659,7 +664,7 @@ class DarshanReport(object):
""" """
if mod not in self.data['modules']: if mod not in self.data['modules']:
if warnings: 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 return
...@@ -696,7 +701,7 @@ class DarshanReport(object): ...@@ -696,7 +701,7 @@ class DarshanReport(object):
pass 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. Reads all APXC records for provided module.
...@@ -710,7 +715,7 @@ class DarshanReport(object): ...@@ -710,7 +715,7 @@ class DarshanReport(object):
""" """
if mod not in self.data['modules']: if mod not in self.data['modules']:
if warnings: 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 return
supported = ['APXC'] supported = ['APXC']
...@@ -760,7 +765,7 @@ class DarshanReport(object): ...@@ -760,7 +765,7 @@ class DarshanReport(object):
""" """
if mod not in self.data['modules']: if mod not in self.data['modules']:
if warnings: 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 return
......
[bumpversion] [bumpversion]
current_version = 3.3.0.2 current_version = 3.3.0.3
commit = False commit = False
tag = False tag = False
......
...@@ -76,6 +76,6 @@ setup( ...@@ -76,6 +76,6 @@ setup(
test_suite="tests", test_suite="tests",
tests_require=test_requirements, tests_require=test_requirements,
url='https://www.mcs.anl.gov/research/projects/darshan/', url='https://www.mcs.anl.gov/research/projects/darshan/',
version='3.3.0.2', version='3.3.0.3',
zip_safe=False, zip_safe=False,
) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment