From 9bf073c21f1d3e41b0ed3ca12ce7b6a57d508bd6 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 6 Jun 2011 14:35:57 -0400 Subject: [PATCH] Second half of rename. --- andreas/p2m-gen.py | 16 ++++++++-------- setup.py | 4 ++-- sumpy/expansion.py | 4 ++-- sumpy/m2p.py | 8 ++++---- sumpy/p2m.py | 8 ++++---- sumpy/p2p.py | 4 ++-- sumpy/symbolic/__init__.py | 2 +- sumpy/symbolic/codegen.py | 4 ++-- test/test_kernels.py | 14 +++++++------- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/andreas/p2m-gen.py b/andreas/p2m-gen.py index 8acc3890..f6ab3cb8 100644 --- a/andreas/p2m-gen.py +++ b/andreas/p2m-gen.py @@ -9,7 +9,7 @@ import numpy as np def test_make_p2m_sym(): dimensions = 3 - from exafmm.symbolic import make_coulomb_kernel_in + from sumpy.symbolic import make_coulomb_kernel_in texp = TaylorExpansion( make_coulomb_kernel_in("b", dimensions), order=2, dimensions=dimensions) @@ -32,8 +32,8 @@ def test_make_p2m_sym(): subst_map = gen_c_source_subst_map(dimensions) - from exafmm.symbolic.codegen import generate_cl_statements_from_assignments - from exafmm.symbolic import vector_subs, make_sym_vector + from sumpy.symbolic.codegen import generate_cl_statements_from_assignments + from sumpy.symbolic import vector_subs, make_sym_vector # {{{ generate P2M @@ -65,8 +65,8 @@ def test_make_p2m_sym(): new_var = (make_sym_vector("t", dimensions) - make_sym_vector("c", dimensions)) - from exafmm.symbolic import vector_subs - from exafmm.symbolic.codegen import generate_cl_statements_from_assignments + from sumpy.symbolic import vector_subs + from sumpy.symbolic.codegen import generate_cl_statements_from_assignments vars_and_exprs = generate_cl_statements_from_assignments( [("contrib%d" % i, vector_subs(basis_i, old_var, new_var)) @@ -83,13 +83,13 @@ def test_make_p2m_sym(): def test_make_m2p(): dimensions = 3 - from exafmm.symbolic import make_coulomb_kernel_in - from exafmm.expansion import TaylorExpansion + from sumpy.symbolic import make_coulomb_kernel_in + from sumpy.expansion import TaylorExpansion texp = TaylorExpansion( make_coulomb_kernel_in("b", dimensions), order=2, dimensions=dimensions) - from exafmm.m2p import make_m2p_source + from sumpy.m2p import make_m2p_source print make_m2p_source(np.float32, texp, [lambda expr: expr, lambda expr: sp.diff(expr, sp.Symbol("t0")) diff --git a/setup.py b/setup.py index 659511b4..c793e73c 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ except ImportError: # 2.x from distutils.command.build_py import build_py -setup(name="exafmm", +setup(name="sumpy", version="2011.1", description="Fast summation in Python", long_description=""" @@ -37,7 +37,7 @@ setup(name="exafmm", author="Rio Yokota, Andreas Kloeckner, Matthew Knepley", author_email="yokota@bu.edu", license = "MIT", - packages=["exafmm"], + packages=["sumpy"], # 2to3 invocation cmdclass={'build_py': build_py}) diff --git a/sumpy/expansion.py b/sumpy/expansion.py index 7e31d9e7..5528c2f0 100644 --- a/sumpy/expansion.py +++ b/sumpy/expansion.py @@ -48,10 +48,10 @@ class TaylorExpansion(Expansion): for mi in self.multi_indices] # given in terms of a variable - from exafmm.symbolic import make_sym_vector + from sumpy.symbolic import make_sym_vector a = make_sym_vector("a", 3) - from exafmm.tools import mi_power, mi_factorial + from sumpy.tools import mi_power, mi_factorial self.coefficients = [ mi_power(a, mi)/mi_factorial(mi) for mi in self.multi_indices] diff --git a/sumpy/m2p.py b/sumpy/m2p.py index 26835f1a..964e004d 100644 --- a/sumpy/m2p.py +++ b/sumpy/m2p.py @@ -7,7 +7,7 @@ from pytools import memoize_method import pyopencl as cl import pyopencl.array as cl_array -from exafmm.kernel_common import ( +from sumpy.kernel_common import ( COMMON_PREAMBLE, FMMParameters) @@ -146,8 +146,8 @@ class M2PKernel(object): par_cell_cnt, ctr_coeff_cnt_size): dimensions = self.expansion.dimensions - from exafmm.symbolic.codegen import generate_cl_statements_from_assignments - from exafmm.symbolic import vector_subs, make_sym_vector + from sumpy.symbolic.codegen import generate_cl_statements_from_assignments + from sumpy.symbolic import vector_subs, make_sym_vector old_var = make_sym_vector("b", dimensions) new_var = (make_sym_vector("t", dimensions) @@ -164,7 +164,7 @@ class M2PKernel(object): for output_idx, output_map in enumerate(self.output_maps) ] - from exafmm.symbolic.codegen import gen_c_source_subst_map + from sumpy.symbolic.codegen import gen_c_source_subst_map subst_map = gen_c_source_subst_map(dimensions) vars_and_exprs = generate_cl_statements_from_assignments( diff --git a/sumpy/p2m.py b/sumpy/p2m.py index 2b1da47d..f0213d5d 100644 --- a/sumpy/p2m.py +++ b/sumpy/p2m.py @@ -7,7 +7,7 @@ from pytools import memoize_method import pyopencl as cl import pyopencl.array as cl_array -from exafmm.kernel_common import ( +from sumpy.kernel_common import ( COMMON_PREAMBLE, FMMParameters) @@ -96,8 +96,8 @@ class P2MKernel(object): def get_kernel(self, geometry_dtype, coeff_dtype, coeff_cnt_padded): dimensions = self.expansion.dimensions - from exafmm.symbolic.codegen import generate_cl_statements_from_assignments - from exafmm.symbolic import vector_subs, make_sym_vector + from sumpy.symbolic.codegen import generate_cl_statements_from_assignments + from sumpy.symbolic import vector_subs, make_sym_vector old_var = make_sym_vector("a", dimensions) new_var = (make_sym_vector("c", dimensions) @@ -114,7 +114,7 @@ class P2MKernel(object): for output_idx, output_map in enumerate(self.output_maps) ] - from exafmm.symbolic.codegen import gen_c_source_subst_map + from sumpy.symbolic.codegen import gen_c_source_subst_map subst_map = gen_c_source_subst_map(dimensions) vars_and_exprs = generate_cl_statements_from_assignments( diff --git a/sumpy/p2p.py b/sumpy/p2p.py index c05b94c8..ee6a916b 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -7,7 +7,7 @@ import pyopencl as cl import pyopencl.array as cl_array from pytools import memoize_method -from exafmm.kernel_common import COMMON_PREAMBLE +from sumpy.kernel_common import COMMON_PREAMBLE @@ -162,7 +162,7 @@ class P2PKernel(object): @memoize_method def get_kernel(self, geometry_dtype, output_dtype, wg_size): - from exafmm.symbolic.codegen import ( + from sumpy.symbolic.codegen import ( generate_cl_statements_from_assignments, gen_c_source_subst_map) vars_and_exprs = generate_cl_statements_from_assignments( diff --git a/sumpy/symbolic/__init__.py b/sumpy/symbolic/__init__.py index 285ec5e6..6376a158 100644 --- a/sumpy/symbolic/__init__.py +++ b/sumpy/symbolic/__init__.py @@ -170,7 +170,7 @@ def eliminate_common_subexpressions(exprs, sym_gen): def make_coulomb_kernel_in(var_name, dimensions): - from exafmm.symbolic import make_sym_vector + from sumpy.symbolic import make_sym_vector dist = make_sym_vector(var_name, dimensions) if dimensions == 2: diff --git a/sumpy/symbolic/codegen.py b/sumpy/symbolic/codegen.py index dded42c4..a30523ca 100644 --- a/sumpy/symbolic/codegen.py +++ b/sumpy/symbolic/codegen.py @@ -1,7 +1,7 @@ from __future__ import division import sympy as sp from sympy.printing.codeprinter import CodePrinter as BaseCodePrinter -from exafmm.symbolic import IdentityMapper +from sumpy.symbolic import IdentityMapper @@ -101,7 +101,7 @@ def generate_cl_statements_from_assignments(assignments, subst_map={}): # {{{ perform CSE - from exafmm.symbolic import eliminate_common_subexpressions + from sumpy.symbolic import eliminate_common_subexpressions cses, exprs = eliminate_common_subexpressions( [expr for var_name, expr in assignments], diff --git a/test/test_kernels.py b/test/test_kernels.py index c8a616a3..2c875f23 100644 --- a/test/test_kernels.py +++ b/test/test_kernels.py @@ -36,17 +36,17 @@ def test_p2p(ctx_getter): dimensions = 3 n = 5000 - from exafmm.symbolic import make_coulomb_kernel_ts + from sumpy.symbolic import make_coulomb_kernel_ts coulomb_knl = make_coulomb_kernel_ts(dimensions) exprs = [coulomb_knl, coulomb_knl.diff(sp.Symbol("t0"))] - from exafmm.p2p import P2PKernel + from sumpy.p2p import P2PKernel knl = P2PKernel(ctx, dimensions, exprs, exclude_self=False) targets = np.random.rand(dimensions, n).astype(np.float32) sources = np.random.rand(dimensions, n).astype(np.float32) - from exafmm.tools import vector_to_device + from sumpy.tools import vector_to_device targets_dev = vector_to_device(queue, targets) sources_dev = vector_to_device(queue, sources) strengths_dev = cl_array.empty(queue, n, dtype=np.float32) @@ -80,13 +80,13 @@ def test_m2p(ctx_getter): dimensions = 3 n = 5000 - from exafmm.symbolic import make_coulomb_kernel_in - from exafmm.expansion import TaylorExpansion + from sumpy.symbolic import make_coulomb_kernel_in + from sumpy.expansion import TaylorExpansion texp = TaylorExpansion( make_coulomb_kernel_in("b", dimensions), order=2, dimensions=dimensions) - from exafmm.m2p import M2PKernel + from sumpy.m2p import M2PKernel knl = M2PKernel(ctx, texp, output_maps=[ lambda expr: expr, @@ -94,7 +94,7 @@ def test_m2p(ctx_getter): targets = np.random.rand(dimensions, n).astype(np.float32) - from exafmm.tools import vector_to_device + from sumpy.tools import vector_to_device targets_dev = vector_to_device(queue, targets) knl(targets_dev, None, None, targets_dev[0], None, None) -- GitLab