From 72b649b124940f196566026b3e288aa5eb06f741 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Wed, 12 Feb 2020 16:35:38 -0800
Subject: [PATCH] opportunistically load h5py
since it's not needed for most operations
---
gwinc/__init__.py | 1 -
gwinc/__main__.py | 7 ++++---
gwinc/test/__main__.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gwinc/__init__.py b/gwinc/__init__.py
index d528c5a4..eca881ab 100644
--- a/gwinc/__init__.py
+++ b/gwinc/__init__.py
@@ -7,7 +7,6 @@ import numpy as np
from .ifo import IFOS
from .struct import Struct
from .plot import plot_noise
-from .io import load_hdf5, save_hdf5
def _load_module(name_or_path):
diff --git a/gwinc/__main__.py b/gwinc/__main__.py
index 72573767..71fd7b5d 100644
--- a/gwinc/__main__.py
+++ b/gwinc/__main__.py
@@ -10,7 +10,6 @@ logging.basicConfig(format='%(message)s',
level=os.getenv('LOG_LEVEL', logging.INFO))
from . import IFOS, load_budget, plot_noise
-from . import io
##################################################
@@ -89,8 +88,9 @@ def main():
# initial arg processing
if os.path.splitext(os.path.basename(args.IFO))[1] in ['.hdf5', '.h5']:
+ from .io import load_hdf5
Budget = None
- freq, traces, attrs = io.load_hdf5(args.IFO)
+ freq, traces, attrs = load_hdf5(args.IFO)
ifo = getattr(attrs, 'IFO', None)
plot_style = attrs
@@ -201,10 +201,11 @@ def main():
# save noise traces to HDF5 file
if args.save and os.path.splitext(args.save)[1] in ['.hdf5', '.h5']:
+ from .io import save_hdf5
logging.info("saving budget traces {}...".format(args.save))
if ifo:
plot_style['IFO'] = ifo.to_yaml()
- io.save_hdf5(
+ save_hdf5(
path=args.save,
freq=freq,
traces=traces,
diff --git a/gwinc/test/__main__.py b/gwinc/test/__main__.py
index 83fc338f..6ccb7af7 100644
--- a/gwinc/test/__main__.py
+++ b/gwinc/test/__main__.py
@@ -15,7 +15,7 @@ logging.basicConfig(format='%(message)s',
level=os.getenv('LOG_LEVEL', logging.INFO))
from .. import IFOS, load_budget
-from .. import load_hdf5, save_hdf5
+from ..io import load_hdf5, save_hdf5
try:
import inspiral_range
--
GitLab