Commit 1318ccc8 authored by theos's avatar theos
Browse files

Moved nifty source code into nifty subdirectory.

Adapted imports and setup.py to changes.
parent 71d68281
[DEFAULT]
mpi_module = MPI
mpi_init_checks = False
default_distribution_strategy = fftw
default_comm = COMM_WORLD
...@@ -39,11 +39,10 @@ from d2o import distributed_data_object, d2o_librarian ...@@ -39,11 +39,10 @@ from d2o import distributed_data_object, d2o_librarian
from nifty_cmaps import ncmap from nifty_cmaps import ncmap
from field import Field from field import Field
from space import Space
# this line exists for compatibility reasons # this line exists for compatibility reasons
# TODO: Remove this once the transition to field types is done. # TODO: Remove this once the transition to field types is done.
from space import Space as point_space from spaces.space import Space as point_space
from nifty_random import random from nifty_random import random
from nifty_simple_math import * from nifty_simple_math import *
...@@ -56,15 +55,7 @@ from operators import * ...@@ -56,15 +55,7 @@ from operators import *
from spaces import * from spaces import *
from demos import get_demo_dir from demos import get_demo_dir
from pickling import _pickle_method, _unpickle_method
#import pyximport; pyximport.install(pyimport = True) #import pyximport; pyximport.install(pyimport = True)
from transformations import TransformationFactory,\ from transformations import *
GLLMTransformation,\ \ No newline at end of file
HPLMTransformation,\
LMGLTransformation,\
LMHPTransformation,\
RGRGTransformation
...@@ -12,7 +12,7 @@ from nifty.config import about, \ ...@@ -12,7 +12,7 @@ from nifty.config import about, \
from nifty.field_types import FieldType,\ from nifty.field_types import FieldType,\
FieldArray FieldArray
from nifty.space import Space from nifty.spaces.space import Space
import nifty.nifty_utilities as utilities import nifty.nifty_utilities as utilities
from nifty_random import random from nifty_random import random
......
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