Skip to content

Commit

Permalink
Merge pull request #1309 from pyiron/fast_import
Browse files Browse the repository at this point in the history
Accelerate import of pyiron_base by 18%
  • Loading branch information
jan-janssen authored Feb 5, 2024
2 parents b7232ed + dd1bc84 commit 83d9481
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
7 changes: 0 additions & 7 deletions pyiron_base/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from pyiron_base.storage.has_stored_traits import HasStoredTraits
from pyiron_base.storage.inputlist import InputList
from pyiron_base.storage.parameters import GenericParameters
from pyiron_base.storage.filedata import load_file, FileDataTemplate, FileData
from pyiron_base.utils.deprecate import Deprecator, deprecate, deprecate_soon
from pyiron_base.utils.error import ImportAlarm
from pyiron_base.jobs.job.extension.executable import Executable
Expand Down Expand Up @@ -50,12 +49,6 @@

Project.register_tools("base", BaseTools)

# optional API of the pyiron_base module
try:
from pyiron_base.project.gui import ProjectGUI
except (ImportError, TypeError, AttributeError):
pass

# Internal init
from ._version import get_versions
from pyiron_base.utils.jedi import fix_ipython_autocomplete
Expand Down
3 changes: 2 additions & 1 deletion pyiron_base/project/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
get_job_status,
)
from pyiron_base.storage.hdfio import ProjectHDFio
from pyiron_base.storage.filedata import load_file
from pyiron_base.utils.deprecate import deprecate
from pyiron_base.interfaces.has_groups import HasGroups
from pyiron_base.jobs.flex.factory import create_job_factory
Expand Down Expand Up @@ -1695,6 +1694,8 @@ def _get_item_helper(self, item, convert_to_object=True):
return ProjectHDFio(project=self, file_name=file_name)
if item in self.list_files():
file_name = posixpath.join(self.path, "{}".format(item))
from pyiron_base.storage.filedata import load_file

return load_file(file_name, project=self)
if item in self.list_dirs():
with self.open(item) as new_item:
Expand Down

0 comments on commit 83d9481

Please sign in to comment.