Commit 88ed077d authored by csongor's avatar csongor
Browse files

WIP: move field class to new file

parent c3a33c67
Pipeline #3923 skipped
...@@ -38,9 +38,9 @@ from config import about,\ ...@@ -38,9 +38,9 @@ from config import about,\
from d2o import distributed_data_object, d2o_librarian from d2o import distributed_data_object, d2o_librarian
from nifty_cmaps import ncmap from nifty_cmaps import ncmap
from nifty_field import field
from nifty_core import space,\ from nifty_core import space,\
point_space,\ point_space
field
from nifty_random import random from nifty_random import random
from nifty_simple_math import * from nifty_simple_math import *
......
...@@ -42,8 +42,10 @@ from matplotlib.ticker import LogFormatter as lf ...@@ -42,8 +42,10 @@ from matplotlib.ticker import LogFormatter as lf
from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES
from nifty.nifty_core import space,\ from nifty.nifty_core import space,\
point_space,\ point_space
field
from nifty.nifty_field import field
from nifty.config import about,\ from nifty.config import about,\
nifty_configuration as gc,\ nifty_configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
import numpy as np import numpy as np
from numpy import pi from numpy import pi
from nifty.config import about from nifty.config import about
from nifty.nifty_core import field from nifty.nifty_field import field
from nifty.nifty_simple_math import sqrt, exp, log from nifty.nifty_simple_math import sqrt, exp, log
......
This diff is collapsed.
This diff is collapsed.
...@@ -12,8 +12,8 @@ from nifty.config import about,\ ...@@ -12,8 +12,8 @@ from nifty.config import about,\
nifty_configuration as gc,\ nifty_configuration as gc,\
dependency_injector as gdi dependency_injector as gdi
from nifty.nifty_core import point_space,\ from nifty.nifty_core import point_space
field from nifty.nifty_field import field
from nifty.rg import rg_space from nifty.rg import rg_space
from nifty.operators import operator from nifty.operators import operator
......
...@@ -40,7 +40,7 @@ from __future__ import division ...@@ -40,7 +40,7 @@ from __future__ import division
#from nifty_core import * #from nifty_core import *
import numpy as np import numpy as np
from nifty.config import notification, about from nifty.config import notification, about
from nifty.nifty_core import field from nifty.nifty_field import field
from nifty.nifty_simple_math import vdot from nifty.nifty_simple_math import vdot
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
from __future__ import division from __future__ import division
import numpy as np import numpy as np
from nifty.config import about from nifty.config import about
from nifty.nifty_field import field
from nifty.nifty_core import space, \ from nifty.nifty_core import space, \
point_space, \ point_space
field
from nifty_minimization import conjugate_gradient from nifty_minimization import conjugate_gradient
from nifty_probing import trace_prober,\ from nifty_probing import trace_prober,\
inverse_trace_prober,\ inverse_trace_prober,\
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
from __future__ import division from __future__ import division
from nifty.config import about from nifty.config import about
from nifty.nifty_core import space, \ from nifty.nifty_core import space
field from nifty.nifty_field import field
from nifty.nifty_utilities import direct_vdot from nifty.nifty_utilities import direct_vdot
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
import numpy as np import numpy as np
from nifty.config import about from nifty.config import about
from nifty.nifty_core import field from nifty.nifty_field import field
def power_backward_conversion_rg(k_space, p, mean=None, bare=True): def power_backward_conversion_rg(k_space, p, mean=None, bare=True):
......
...@@ -43,8 +43,9 @@ from matplotlib.ticker import LogFormatter as lf ...@@ -43,8 +43,9 @@ from matplotlib.ticker import LogFormatter as lf
from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES
from nifty.nifty_core import point_space,\ from nifty.nifty_core import point_space
field from nifty.nifty_field import field
import nifty_fft import nifty_fft
from nifty.config import about,\ from nifty.config import about,\
nifty_configuration as gc,\ nifty_configuration as gc,\
......
...@@ -14,8 +14,9 @@ from nifty import space,\ ...@@ -14,8 +14,9 @@ from nifty import space,\
rg_space,\ rg_space,\
lm_space,\ lm_space,\
hp_space,\ hp_space,\
gl_space,\ gl_space
field
from nifty.nifty_field import field
from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES
from nifty.rg.nifty_rg import RG_DISTRIBUTION_STRATEGIES,\ from nifty.rg.nifty_rg import RG_DISTRIBUTION_STRATEGIES,\
......
...@@ -9,17 +9,18 @@ import unittest ...@@ -9,17 +9,18 @@ import unittest
import itertools import itertools
import numpy as np import numpy as np
from nifty import space,\ from nifty.nifty_field import field
point_space,\
rg_space,\ from d2o import distributed_data_object
field,\
distributed_data_object
from nifty.nifty_paradict import space_paradict from nifty.nifty_paradict import space_paradict
from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES,\
space,\
point_space
from nifty.rg.nifty_rg import RG_DISTRIBUTION_STRATEGIES,\ from nifty.rg.nifty_rg import RG_DISTRIBUTION_STRATEGIES,\
gc as RG_GC gc as RG_GC,\
rg_space
from nifty.lm.nifty_lm import LM_DISTRIBUTION_STRATEGIES,\ from nifty.lm.nifty_lm import LM_DISTRIBUTION_STRATEGIES,\
GL_DISTRIBUTION_STRATEGIES,\ GL_DISTRIBUTION_STRATEGIES,\
HP_DISTRIBUTION_STRATEGIES HP_DISTRIBUTION_STRATEGIES
......
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