Commit 2cf1f9fa authored by Theo Steininger's avatar Theo Steininger

Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/D2O

parents afb5e2c2 a24e8622
Pipeline #18188 passed with stage
in 59 minutes and 2 seconds
......@@ -29,4 +29,4 @@ from .strategies import STRATEGIES
from .factory_methods import *
import random
from . import random
from __future__ import division
from __future__ import absolute_import
# D2O
# Copyright (C) 2016 Theo Steininger
#
......@@ -18,11 +16,13 @@ from __future__ import absolute_import
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
import numpy as np
from keepers import Versionable,\
Loggable
from d2o.config import configuration as gc,\
from .config import configuration as gc,\
dependency_injector as gdi
from .d2o_librarian import d2o_librarian
......
from __future__ import absolute_import
# D2O
# Copyright (C) 2016 Theo Steininger
#
......@@ -27,8 +26,8 @@ import numpy as np
from keepers import Loggable
from d2o.config import configuration as gc,\
dependency_injector as gdi
from .config import configuration as gc,\
dependency_injector as gdi
from .distributed_data_object import distributed_data_object
......
......@@ -20,8 +20,8 @@ from builtins import map
from builtins import object
import numpy as np
from d2o.config import configuration as gc,\
dependency_injector as gdi
from .config import configuration as gc,\
dependency_injector as gdi
MPI = gdi[gc['mpi_module']]
......
# -*- coding: utf-8 -*-
from __future__ import absolute_import
import numpy as np
from d2o.config import configuration as gc
from .config import configuration as gc
from .distributed_data_object import distributed_data_object
......
......@@ -2,8 +2,8 @@
import numpy as np
from d2o.config import configuration as gc,\
dependency_injector as gdi
from .config import configuration as gc,\
dependency_injector as gdi
MPI = gdi[gc['mpi_module']]
comm = getattr(MPI, gc['default_comm'])
......
......@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from d2o.config import dependency_injector as gdi
from .config import dependency_injector as gdi
pyfftw = gdi.get('pyfftw')
......
......@@ -18,8 +18,8 @@
import numpy as np
from d2o.config import configuration as gc,\
dependency_injector as gdi
from .config import configuration as gc,\
dependency_injector as gdi
MPI = gdi[gc['mpi_module']]
......
from __future__ import division
from __future__ import print_function
# D2O
# Copyright (C) 2016 Theo Steininger
#
......@@ -18,6 +16,9 @@ from __future__ import print_function
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division
from __future__ import print_function
from builtins import str
from builtins import range
......
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