diff --git a/darshan-util/pydarshan/darshan/cli/file_stats.py b/darshan-util/pydarshan/darshan/cli/file_stats.py index 203ea3235..2593a2f89 100644 --- a/darshan-util/pydarshan/darshan/cli/file_stats.py +++ b/darshan-util/pydarshan/darshan/cli/file_stats.py @@ -292,7 +292,7 @@ def setup_parser(parser: argparse.ArgumentParser): "-m", nargs="?", default="POSIX", - choices=["POSIX", "MPI-IO", "STDIO"], + choices=["POSIX", "MPI-IO", "STDIO", "DFS"], help="specify the Darshan module to generate file stats for (default: %(default)s)", ) parser.add_argument( diff --git a/darshan-util/pydarshan/darshan/cli/job_stats.py b/darshan-util/pydarshan/darshan/cli/job_stats.py index 1c27c6886..cb72b45f7 100644 --- a/darshan-util/pydarshan/darshan/cli/job_stats.py +++ b/darshan-util/pydarshan/darshan/cli/job_stats.py @@ -140,7 +140,10 @@ def rich_print(df, mod, order_by): table.add_column("perf_by_slowest", f"[u i]{naturalsize(all_perf_by_slowest, binary=True, format='%.2f')}/s", **default_kwargs) table.add_column("time_by_slowest", f"[u i]{all_time_by_slowest:.2f} s", **default_kwargs) table.add_column("total_bytes", f"[u i]{naturalsize(all_total_bytes, binary=True, format='%.2f')}", **default_kwargs) - table.add_column("total_files", f"[u i]{all_total_files}", **default_kwargs) + if mod != "DAOS": + table.add_column("total_files", f"[u i]{all_total_files}", **default_kwargs) + else: + table.add_column("total_objects", f"[u i]{all_total_files}", **default_kwargs) for column in table.columns: if column.header == order_by: column.style = column.header_style = column.footer_style = "bold cyan" @@ -184,7 +187,7 @@ def setup_parser(parser: argparse.ArgumentParser): parser.add_argument( "--module", "-m", nargs='?', default='POSIX', - choices=['POSIX', 'MPI-IO', 'STDIO'], + choices=['POSIX', 'MPI-IO', 'STDIO', 'DFS', 'DAOS'], help="specify the Darshan module to generate job stats for (default: %(default)s)" ) parser.add_argument( diff --git a/darshan-util/pydarshan/docs/usage.rst b/darshan-util/pydarshan/docs/usage.rst index 3d0e8aa31..7967c5e11 100644 --- a/darshan-util/pydarshan/docs/usage.rst +++ b/darshan-util/pydarshan/docs/usage.rst @@ -55,7 +55,7 @@ ordered according to some I/O metric. Usage of the ``job_stats`` tool is described below. :: - usage: darshan job_stats [-h] [--log_paths_file LOG_PATHS_FILE] [--module [{POSIX,MPI-IO,STDIO}]] + usage: darshan job_stats [-h] [--log_paths_file LOG_PATHS_FILE] [--module [{POSIX,MPI-IO,STDIO,DFS,DAOS}]] [--order_by [{perf_by_slowest,time_by_slowest,total_bytes,total_files}]] [--limit [LIMIT]] [--csv] [--exclude_names EXCLUDE_NAMES] [--include_names INCLUDE_NAMES] [log_paths [log_paths ...]] @@ -69,7 +69,7 @@ Usage of the ``job_stats`` tool is described below. :: -h, --help show this help message and exit --log_paths_file LOG_PATHS_FILE specify the path to a manifest file listing Darshan log files - --module [{POSIX,MPI-IO,STDIO}], -m [{POSIX,MPI-IO,STDIO}] + --module [{POSIX,MPI-IO,STDIO,DFS,DAOS}], -m [{POSIX,MPI-IO,STDIO,DFS,DAOS}] specify the Darshan module to generate job stats for (default: POSIX) --order_by [{perf_by_slowest,time_by_slowest,total_bytes,total_files}], -o [{perf_by_slowest,time_by_slowest,total_bytes,total_files}] specify the I/O metric to order jobs by (default: total_bytes) @@ -89,7 +89,7 @@ or use a manifest file in cases where many logs are to be analyzed at once. Usage of the ``file_stats`` tool is described below. :: - usage: darshan file_stats [-h] [--log_paths_file LOG_PATHS_FILE] [--module [{POSIX,MPI-IO,STDIO}]] + usage: darshan file_stats [-h] [--log_paths_file LOG_PATHS_FILE] [--module [{POSIX,MPI-IO,STDIO,DFS}]] [--order_by [{bytes_read,bytes_written,reads,writes,total_jobs}]] [--limit [LIMIT]] [--csv] [--exclude_names EXCLUDE_NAMES] [--include_names INCLUDE_NAMES] [log_paths [log_paths ...]] @@ -103,7 +103,7 @@ Usage of the ``file_stats`` tool is described below. :: -h, --help show this help message and exit --log_paths_file LOG_PATHS_FILE specify the path to a manifest file listing Darshan log files - --module [{POSIX,MPI-IO,STDIO}], -m [{POSIX,MPI-IO,STDIO}] + --module [{POSIX,MPI-IO,STDIO,DFS}], -m [{POSIX,MPI-IO,STDIO,DFS}] specify the Darshan module to generate file stats for (default: POSIX) --order_by [{bytes_read,bytes_written,reads,writes,total_jobs}], -o [{bytes_read,bytes_written,reads,writes,total_jobs}] specify the I/O metric to order files by (default: bytes_read)