diff --git a/gprMax/pml_updates/__init__.py b/gprMax/cuda/__init__.py similarity index 100% rename from gprMax/pml_updates/__init__.py rename to gprMax/cuda/__init__.py diff --git a/gprMax/fields_updates_gpu.py b/gprMax/cuda/fields_updates.py similarity index 100% rename from gprMax/fields_updates_gpu.py rename to gprMax/cuda/fields_updates.py diff --git a/gprMax/pml_updates/pml_updates_electric_HORIPML_gpu.py b/gprMax/cuda/pml_updates_electric_HORIPML.py similarity index 100% rename from gprMax/pml_updates/pml_updates_electric_HORIPML_gpu.py rename to gprMax/cuda/pml_updates_electric_HORIPML.py diff --git a/gprMax/pml_updates/pml_updates_electric_MRIPML_gpu.py b/gprMax/cuda/pml_updates_electric_MRIPML.py similarity index 100% rename from gprMax/pml_updates/pml_updates_electric_MRIPML_gpu.py rename to gprMax/cuda/pml_updates_electric_MRIPML.py diff --git a/gprMax/pml_updates/pml_updates_magnetic_HORIPML_gpu.py b/gprMax/cuda/pml_updates_magnetic_HORIPML.py similarity index 100% rename from gprMax/pml_updates/pml_updates_magnetic_HORIPML_gpu.py rename to gprMax/cuda/pml_updates_magnetic_HORIPML.py diff --git a/gprMax/pml_updates/pml_updates_magnetic_MRIPML_gpu.py b/gprMax/cuda/pml_updates_magnetic_MRIPML.py similarity index 100% rename from gprMax/pml_updates/pml_updates_magnetic_MRIPML_gpu.py rename to gprMax/cuda/pml_updates_magnetic_MRIPML.py diff --git a/gprMax/snapshots_gpu.py b/gprMax/cuda/snapshots.py similarity index 100% rename from gprMax/snapshots_gpu.py rename to gprMax/cuda/snapshots.py diff --git a/gprMax/source_updates_gpu.py b/gprMax/cuda/source_updates.py similarity index 100% rename from gprMax/source_updates_gpu.py rename to gprMax/cuda/source_updates.py diff --git a/gprMax/cython/__init__.py b/gprMax/cython/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/gprMax/fields_updates_ext.pyx b/gprMax/cython/fields_updates.pyx similarity index 100% rename from gprMax/fields_updates_ext.pyx rename to gprMax/cython/fields_updates.pyx diff --git a/gprMax/fractals_generate_ext.pyx b/gprMax/cython/fractals_generate.pyx similarity index 100% rename from gprMax/fractals_generate_ext.pyx rename to gprMax/cython/fractals_generate.pyx diff --git a/gprMax/geometry_outputs_ext.pyx b/gprMax/cython/geometry_outputs.pyx similarity index 100% rename from gprMax/geometry_outputs_ext.pyx rename to gprMax/cython/geometry_outputs.pyx diff --git a/gprMax/geometry_primitives_ext.pyx b/gprMax/cython/geometry_primitives.pyx similarity index 98% rename from gprMax/geometry_primitives_ext.pyx rename to gprMax/cython/geometry_primitives.pyx index 1f8c5b23..d6e65532 100644 --- a/gprMax/geometry_primitives_ext.pyx +++ b/gprMax/cython/geometry_primitives.pyx @@ -20,16 +20,16 @@ import numpy as np cimport numpy as np from gprMax.utilities import round_value -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Ex -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Ey -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Ez -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Hx -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Hy -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Hz -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_E -from gprMax.yee_cell_setget_rigid_ext cimport unset_rigid_E -from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_H -from gprMax.yee_cell_setget_rigid_ext cimport unset_rigid_H +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Ex +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Ey +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Ez +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Hx +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Hy +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Hz +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_E +from gprMax.cython.yee_cell_setget_rigid cimport unset_rigid_E +from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_H +from gprMax.cython.yee_cell_setget_rigid cimport unset_rigid_H np.seterr(divide='raise') diff --git a/gprMax/pml_updates/pml_updates_electric_HORIPML_ext.pyx b/gprMax/cython/pml_updates_electric_HORIPML.pyx similarity index 100% rename from gprMax/pml_updates/pml_updates_electric_HORIPML_ext.pyx rename to gprMax/cython/pml_updates_electric_HORIPML.pyx diff --git a/gprMax/pml_updates/pml_updates_electric_MRIPML_ext.pyx b/gprMax/cython/pml_updates_electric_MRIPML.pyx similarity index 100% rename from gprMax/pml_updates/pml_updates_electric_MRIPML_ext.pyx rename to gprMax/cython/pml_updates_electric_MRIPML.pyx diff --git a/gprMax/pml_updates/pml_updates_magnetic_HORIPML_ext.pyx b/gprMax/cython/pml_updates_magnetic_HORIPML.pyx similarity index 100% rename from gprMax/pml_updates/pml_updates_magnetic_HORIPML_ext.pyx rename to gprMax/cython/pml_updates_magnetic_HORIPML.pyx diff --git a/gprMax/pml_updates/pml_updates_magnetic_MRIPML_ext.pyx b/gprMax/cython/pml_updates_magnetic_MRIPML.pyx similarity index 100% rename from gprMax/pml_updates/pml_updates_magnetic_MRIPML_ext.pyx rename to gprMax/cython/pml_updates_magnetic_MRIPML.pyx diff --git a/gprMax/snapshots_ext.pyx b/gprMax/cython/snapshots.pyx similarity index 100% rename from gprMax/snapshots_ext.pyx rename to gprMax/cython/snapshots.pyx diff --git a/gprMax/yee_cell_build_ext.pyx b/gprMax/cython/yee_cell_build.pyx similarity index 96% rename from gprMax/yee_cell_build_ext.pyx rename to gprMax/cython/yee_cell_build.pyx index cbff1aa3..39202e41 100644 --- a/gprMax/yee_cell_build_ext.pyx +++ b/gprMax/cython/yee_cell_build.pyx @@ -20,12 +20,12 @@ import numpy as np cimport numpy as np from gprMax.materials import Material -from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Ex -from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Ey -from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Ez -from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Hx -from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Hy -from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Hz +from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Ex +from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Ey +from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Ez +from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Hx +from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Hy +from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Hz cpdef void create_electric_average(int i, int j, int k, int numID1, int numID2, int numID3, int numID4, int componentID, G): diff --git a/gprMax/yee_cell_setget_rigid_ext.pxd b/gprMax/cython/yee_cell_setget_rigid.pxd similarity index 100% rename from gprMax/yee_cell_setget_rigid_ext.pxd rename to gprMax/cython/yee_cell_setget_rigid.pxd diff --git a/gprMax/yee_cell_setget_rigid_ext.pyx b/gprMax/cython/yee_cell_setget_rigid.pyx similarity index 100% rename from gprMax/yee_cell_setget_rigid_ext.pyx rename to gprMax/cython/yee_cell_setget_rigid.pyx diff --git a/gprMax/fractals.py b/gprMax/fractals.py index 70397bba..d18e3b57 100644 --- a/gprMax/fractals.py +++ b/gprMax/fractals.py @@ -22,8 +22,8 @@ from scipy import fftpack from gprMax.config import floattype from gprMax.config import complextype from gprMax.config import hostinfo -from gprMax.fractals_generate_ext import generate_fractal2D -from gprMax.fractals_generate_ext import generate_fractal3D +from gprMax.cython.fractals_generate import generate_fractal2D +from gprMax.cython.fractals_generate import generate_fractal3D from gprMax.utilities import round_value np.seterr(divide='raise') diff --git a/gprMax/geometry_outputs.py b/gprMax/geometry_outputs.py index 21269f67..3cefab80 100644 --- a/gprMax/geometry_outputs.py +++ b/gprMax/geometry_outputs.py @@ -24,8 +24,8 @@ import numpy as np from struct import pack from gprMax._version import __version__ -from gprMax.geometry_outputs_ext import define_normal_geometry -from gprMax.geometry_outputs_ext import define_fine_geometry +from gprMax.cython.geometry_outputs import define_normal_geometry +from gprMax.cython.geometry_outputs import define_fine_geometry from gprMax.utilities import round_value diff --git a/gprMax/input_cmds_geometry.py b/gprMax/input_cmds_geometry.py index 00c42d7d..9c5103cc 100644 --- a/gprMax/input_cmds_geometry.py +++ b/gprMax/input_cmds_geometry.py @@ -32,19 +32,19 @@ from gprMax.exceptions import CmdInputError from gprMax.fractals import FractalSurface from gprMax.fractals import FractalVolume from gprMax.fractals import Grass -from gprMax.geometry_primitives_ext import build_edge_x -from gprMax.geometry_primitives_ext import build_edge_y -from gprMax.geometry_primitives_ext import build_edge_z -from gprMax.geometry_primitives_ext import build_face_yz -from gprMax.geometry_primitives_ext import build_face_xz -from gprMax.geometry_primitives_ext import build_face_xy -from gprMax.geometry_primitives_ext import build_triangle -from gprMax.geometry_primitives_ext import build_box -from gprMax.geometry_primitives_ext import build_cylinder -from gprMax.geometry_primitives_ext import build_cylindrical_sector -from gprMax.geometry_primitives_ext import build_sphere -from gprMax.geometry_primitives_ext import build_voxels_from_array -from gprMax.geometry_primitives_ext import build_voxels_from_array_mask +from gprMax.cython.geometry_primitives import build_edge_x +from gprMax.cython.geometry_primitives import build_edge_y +from gprMax.cython.geometry_primitives import build_edge_z +from gprMax.cython.geometry_primitives import build_face_yz +from gprMax.cython.geometry_primitives import build_face_xz +from gprMax.cython.geometry_primitives import build_face_xy +from gprMax.cython.geometry_primitives import build_triangle +from gprMax.cython.geometry_primitives import build_box +from gprMax.cython.geometry_primitives import build_cylinder +from gprMax.cython.geometry_primitives import build_cylindrical_sector +from gprMax.cython.geometry_primitives import build_sphere +from gprMax.cython.geometry_primitives import build_voxels_from_array +from gprMax.cython.geometry_primitives import build_voxels_from_array_mask from gprMax.materials import Material from gprMax.utilities import round_value from gprMax.utilities import get_terminal_width diff --git a/gprMax/model_build_run.py b/gprMax/model_build_run.py index ee99c9f3..980c3054 100644 --- a/gprMax/model_build_run.py +++ b/gprMax/model_build_run.py @@ -47,13 +47,13 @@ from gprMax.fields_outputs import store_outputs from gprMax.fields_outputs import kernel_template_store_outputs from gprMax.fields_outputs import write_hdf5_outputfile -from gprMax.fields_updates_ext import update_electric -from gprMax.fields_updates_ext import update_magnetic -from gprMax.fields_updates_ext import update_electric_dispersive_multipole_A -from gprMax.fields_updates_ext import update_electric_dispersive_multipole_B -from gprMax.fields_updates_ext import update_electric_dispersive_1pole_A -from gprMax.fields_updates_ext import update_electric_dispersive_1pole_B -from gprMax.fields_updates_gpu import kernels_template_fields +from gprMax.cython.fields_updates import update_electric +from gprMax.cython.fields_updates import update_magnetic +from gprMax.cython.fields_updates import update_electric_dispersive_multipole_A +from gprMax.cython.fields_updates import update_electric_dispersive_multipole_B +from gprMax.cython.fields_updates import update_electric_dispersive_1pole_A +from gprMax.cython.fields_updates import update_electric_dispersive_1pole_B +from gprMax.cuda.fields_updates import kernels_template_fields from gprMax.grid import FDTDGrid from gprMax.grid import dispersion_analysis @@ -74,16 +74,16 @@ from gprMax.receivers import gpu_get_rx_array from gprMax.snapshots import Snapshot from gprMax.snapshots import gpu_initialise_snapshot_array from gprMax.snapshots import gpu_get_snapshot_array -from gprMax.snapshots_gpu import kernel_template_store_snapshot +from gprMax.cuda.snapshots import kernel_template_store_snapshot from gprMax.sources import gpu_initialise_src_arrays -from gprMax.source_updates_gpu import kernels_template_sources +from gprMax.cuda.source_updates import kernels_template_sources from gprMax.utilities import get_terminal_width from gprMax.utilities import human_size from gprMax.utilities import open_path_file from gprMax.utilities import round32 from gprMax.utilities import timer -from gprMax.yee_cell_build_ext import build_electric_components -from gprMax.yee_cell_build_ext import build_magnetic_components +from gprMax.cython.yee_cell_build import build_electric_components +from gprMax.cython.yee_cell_build import build_magnetic_components def run_model(args, currentmodelrun, modelend, numbermodelruns, inputfile, usernamespace): diff --git a/gprMax/pml.py b/gprMax/pml.py index 76bbd643..9c05693b 100644 --- a/gprMax/pml.py +++ b/gprMax/pml.py @@ -281,7 +281,7 @@ class PML(object): G (class): Grid class instance - holds essential parameters describing the model. """ - pmlmodule = 'gprMax.pml_updates.pml_updates_electric_' + G.pmlformulation + '_ext' + pmlmodule = 'gprMax.cython.pml_updates_electric_' + G.pmlformulation func = getattr(import_module(pmlmodule), 'order' + str(len(self.CFS)) + '_' + self.direction) func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf, hostinfo['ompthreads'], G.updatecoeffsE, G.ID, G.Ex, G.Ey, G.Ez, G.Hx, G.Hy, G.Hz, self.EPhi1, self.EPhi2, self.ERA, self.ERB, self.ERE, self.ERF, self.d) @@ -292,7 +292,7 @@ class PML(object): G (class): Grid class instance - holds essential parameters describing the model. """ - pmlmodule = 'gprMax.pml_updates.pml_updates_magnetic_' + G.pmlformulation + '_ext' + pmlmodule = 'gprMax.cython.pml_updates_magnetic_' + G.pmlformulation func = getattr(import_module(pmlmodule), 'order' + str(len(self.CFS)) + '_' + self.direction) func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf, hostinfo['ompthreads'], G.updatecoeffsH, G.ID, G.Ex, G.Ey, G.Ez, G.Hx, G.Hy, G.Hz, self.HPhi1, self.HPhi2, self.HRA, self.HRB, self.HRE, self.HRF, self.d) diff --git a/gprMax/snapshots.py b/gprMax/snapshots.py index b7a99712..d669eb39 100644 --- a/gprMax/snapshots.py +++ b/gprMax/snapshots.py @@ -24,7 +24,7 @@ import numpy as np from gprMax.config import floattype from gprMax.config import snapsgpu2cpu -from gprMax.snapshots_ext import calculate_snapshot_fields +from gprMax.cython.snapshots import calculate_snapshot_fields from gprMax.utilities import round_value diff --git a/setup.py b/setup.py index e659c8b3..cefc22c0 100644 --- a/setup.py +++ b/setup.py @@ -51,8 +51,8 @@ with open('README.rst','r') as fd: long_description = fd.read() # Python version -if sys.version_info[:2] < (3, 4): - sys.exit('\nExited: Requires Python 3.4 or newer!\n') +if sys.version_info[:2] < (3, 6): + sys.exit('\nExited: Requires Python 3.6 or newer!\n') # Process 'build' command line argument if 'build' in sys.argv: