Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pyzfs/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np
from mpi4py import MPI
from pprint import pprint
import pkg_resources
from importlib.metadata import version
from .common.misc import parse_sys_argv
from .common.misc import parse_many_values
from .zfs.main import ZFSCalculation
Expand Down Expand Up @@ -49,12 +49,12 @@
def main():
if mpiroot:
try:
version = pkg_resources.require("PyZFS")[0].version
version_str = version("pyzfs")
except Exception:
version = ""
version_str = ""

print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
print("PyZFS code {}".format(version))
print("PyZFS code {}".format(version_str))
print(datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")

Expand Down
8 changes: 4 additions & 4 deletions pyzfs/zfs/main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from time import time
import numpy as np
import pkg_resources
from importlib.metadata import version
import os
import psutil
from mpi4py import MPI
Expand Down Expand Up @@ -246,13 +246,13 @@ def get_xml(self):

"""
try:
version = pkg_resources.require("PyZFS")[0].version
version_str = version("pyzfs")
except Exception:
version = ""
version_str = ""

root = etree.Element("root")
etree.SubElement(root, "code").text = "PyZFS"
etree.SubElement(root, "version").text = version
etree.SubElement(root, "version").text = version_str
etree.SubElement(root, "object").text = self.__class__.__name__
etree.SubElement(root, "DTensor", unit="MHz").text = np.array2string(self.D)
etree.SubElement(root, "D", unit="MHz").text = "{:.2f}".format(self.Dvalue)
Expand Down