diff --git a/grudge/symbolic/compiler.py b/grudge/symbolic/compiler.py index 85eb4514254575bcd6c2543472b87168f9d38124..a1671c1ea553adb80a64d1fcc34c999a4dbd3247 100644 --- a/grudge/symbolic/compiler.py +++ b/grudge/symbolic/compiler.py @@ -517,7 +517,7 @@ class Code: mapper_method = getattr(exec_mapper, insn.mapper_method) if log_quantities is not None: if isinstance(insn, RankDataSwapAssign): - from pytools.log import time_and_count_function + from logpyle import time_and_count_function mapper_method = time_and_count_function( mapper_method, log_quantities["rank_data_swap_timer"], diff --git a/requirements.txt b/requirements.txt index 650f0b79b2790757e681c1cf02d807da1e94feb5..0b012db622ab67efb99714d1328e4b7ccf46ff35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ git+https://github.com/inducer/modepy.git#egg=modepy git+https://github.com/inducer/meshmode.git#egg=meshmode git+https://github.com/inducer/pyvisfile.git#egg=pyvisfile git+https://github.com/inducer/pymetis.git#egg=pymetis +git+https://github.com/illinois-ceesd/logpyle.git#egg=logpyle diff --git a/test/test_mpi_communication.py b/test/test_mpi_communication.py index 4ed9fdb2e0d58c7bfc3df069abea34ad097174b6..fcd939160a3f73c0661996e45713ccad90af4f0e 100644 --- a/test/test_mpi_communication.py +++ b/test/test_mpi_communication.py @@ -162,7 +162,7 @@ def mpi_communication_entrypoint(): # Fails because: "found faces without boundary conditions" # op.check_bc_coverage(local_mesh) - from pytools.log import LogManager, \ + from logpyle import LogManager, \ add_general_quantities, \ add_run_info, \ IntervalTimer, EventCounter diff --git a/unported-examples/advection/advection.py b/unported-examples/advection/advection.py index a665ed34b44ead31e1b00b7caf12efb87fc71cae..80cfa0a99fa95ee5bdbc9e636906d3ae784064ea 100644 --- a/unported-examples/advection/advection.py +++ b/unported-examples/advection/advection.py @@ -108,7 +108,7 @@ def main(write_output=True, flux_type_arg="upwind"): print("%d elements" % len(discr.mesh.elements)) # diagnostics setup ------------------------------------------------------- - from pytools.log import LogManager, \ + from logpyle import LogManager, \ add_general_quantities, \ add_simulation_quantities, \ add_run_info diff --git a/unported-examples/benchmark_grudge/benchmark_mpi.py b/unported-examples/benchmark_grudge/benchmark_mpi.py index 38612322fc88ae75c05b7ec600eb63e9cbe28458..2d47b6a32231f591e92ae6319607e9efb7b00997 100644 --- a/unported-examples/benchmark_grudge/benchmark_mpi.py +++ b/unported-examples/benchmark_grudge/benchmark_mpi.py @@ -63,7 +63,7 @@ def simple_wave_entrypoint(dim=2, num_elems=256, order=4, num_steps=30, fields = join_fields(vol_discr.zeros(queue), [vol_discr.zeros(queue) for i in range(vol_discr.dim)]) - from pytools.log import LogManager, \ + from logpyle import LogManager, \ add_general_quantities, \ add_run_info, \ IntervalTimer, EventCounter diff --git a/unported-examples/burgers/burgers.py b/unported-examples/burgers/burgers.py index 14aef115be849e80b110cad98b9f15f46cb70294..532e32869a9f5aa8fdb2065368aaab0deb92599a 100644 --- a/unported-examples/burgers/burgers.py +++ b/unported-examples/burgers/burgers.py @@ -152,7 +152,7 @@ def main(write_output=True, flux_type_arg="upwind", u = discr.interpolate_volume_function(lambda x, el: case.u0(x[0])) # diagnostics setup ------------------------------------------------------- - from pytools.log import LogManager, \ + from logpyle import LogManager, \ add_general_quantities, \ add_simulation_quantities, \ add_run_info diff --git a/unported-examples/gas_dynamics/box-in-box.py b/unported-examples/gas_dynamics/box-in-box.py index 2f757ae1c03e9bfb63241b83defd95a9af36abff..a6b9aaf7bbd232ed8286045d0e54289b447d3d90 100644 --- a/unported-examples/gas_dynamics/box-in-box.py +++ b/unported-examples/gas_dynamics/box-in-box.py @@ -159,7 +159,7 @@ def main(): stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info logmgr = LogManager("navierstokes-%d.dat" % order, "w", rcon.communicator) @@ -171,7 +171,7 @@ def main(): logmgr.add_watches(["step.max", "t_sim.max", "t_step.max"]) - from pytools.log import LogQuantity + from logpyle import LogQuantity class ChangeSinceLastStep(LogQuantity): """Records the change of a variable between a time step and the previous diff --git a/unported-examples/gas_dynamics/euler/sine-wave.py b/unported-examples/gas_dynamics/euler/sine-wave.py index 4337bbd56847b613311005cd3cd35bb909d15030..e5fb0bca2cdfb21e722a2f3904059fec922b084c 100644 --- a/unported-examples/gas_dynamics/euler/sine-wave.py +++ b/unported-examples/gas_dynamics/euler/sine-wave.py @@ -117,7 +117,7 @@ def main(final_time=1, write_output=False): stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info if write_output: diff --git a/unported-examples/gas_dynamics/euler/sod-2d.py b/unported-examples/gas_dynamics/euler/sod-2d.py index 1c4896e66b209fd1eca312e9447db672e8383fec..5e6ca49c100b0dfa4bcfcc274363be6e7c0b8c0d 100644 --- a/unported-examples/gas_dynamics/euler/sod-2d.py +++ b/unported-examples/gas_dynamics/euler/sod-2d.py @@ -107,7 +107,7 @@ def main(): #stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info logmgr = LogManager("euler-%d.dat" % order, "w", rcon.communicator) diff --git a/unported-examples/gas_dynamics/euler/vortex-adaptive-grid.py b/unported-examples/gas_dynamics/euler/vortex-adaptive-grid.py index a282ca14cbad60198951ac46cf0ff3f957e34721..6faeafad6cca4b369bcfe37577532365db6a5af3 100644 --- a/unported-examples/gas_dynamics/euler/vortex-adaptive-grid.py +++ b/unported-examples/gas_dynamics/euler/vortex-adaptive-grid.py @@ -131,7 +131,7 @@ def main(write_output=True): #stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info if write_output: diff --git a/unported-examples/gas_dynamics/euler/vortex-sources.py b/unported-examples/gas_dynamics/euler/vortex-sources.py index 47bb7ee1fec74558e7866f3f678e7afa1e7e5d46..a0f466f8a4dc87793514f3f6ac8428f8337d49e4 100644 --- a/unported-examples/gas_dynamics/euler/vortex-sources.py +++ b/unported-examples/gas_dynamics/euler/vortex-sources.py @@ -228,7 +228,7 @@ def main(write_output=True): stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info if write_output: diff --git a/unported-examples/gas_dynamics/euler/vortex.py b/unported-examples/gas_dynamics/euler/vortex.py index c94ba2e8d0cf245090c0832185a23d1925d43a65..2129f88272f5421dd576e211a1d57ed8bc09ca35 100644 --- a/unported-examples/gas_dynamics/euler/vortex.py +++ b/unported-examples/gas_dynamics/euler/vortex.py @@ -110,7 +110,7 @@ def main(write_output=True): #stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info if write_output: diff --git a/unported-examples/gas_dynamics/naca.py b/unported-examples/gas_dynamics/naca.py index 85976cf54d8a23235f2059c6f2b0424486b01d40..0c200c04bbda31b76ac7548de55f614546fd5054 100644 --- a/unported-examples/gas_dynamics/naca.py +++ b/unported-examples/gas_dynamics/naca.py @@ -181,7 +181,7 @@ def main(): #stepper = LSRK4TimeStepper(dtype=discr.default_scalar_type) # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info logmgr = LogManager("cns-naca-%d.dat" % order, "w", rcon.communicator) @@ -192,7 +192,7 @@ def main(): discr.add_instrumentation(logmgr) stepper.add_instrumentation(logmgr) - from pytools.log import LogQuantity + from logpyle import LogQuantity class ChangeSinceLastStep(LogQuantity): """Records the change of a variable between a time step and the previous one""" diff --git a/unported-examples/gas_dynamics/navierstokes/shearflow.py b/unported-examples/gas_dynamics/navierstokes/shearflow.py index 8cae369e924496238f4364887db5a54ba4a1a732..6c762e1239045cefc8fc6b711f6c3bef423d4eb6 100644 --- a/unported-examples/gas_dynamics/navierstokes/shearflow.py +++ b/unported-examples/gas_dynamics/navierstokes/shearflow.py @@ -132,7 +132,7 @@ def main(): stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info logmgr = LogManager("navierstokes-cpu-%d-%d.dat" % (order, refine), diff --git a/unported-examples/gas_dynamics/square.py b/unported-examples/gas_dynamics/square.py index 2dd5ce2c7047941cc9be5c560770c67ccdc1045f..632cfb7293ba83d2c54cef97df3c1d449a1baf16 100644 --- a/unported-examples/gas_dynamics/square.py +++ b/unported-examples/gas_dynamics/square.py @@ -180,7 +180,7 @@ def main(): #stepper = Dumka3TimeStepper(3, rtol=1e-7) # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info logmgr = LogManager("cns-square-sp-%d.dat" % order, "w", rcon.communicator) @@ -190,7 +190,7 @@ def main(): discr.add_instrumentation(logmgr) stepper.add_instrumentation(logmgr) - from pytools.log import LogQuantity + from logpyle import LogQuantity class ChangeSinceLastStep(LogQuantity): """Records the change of a variable between a time step and the previous one""" diff --git a/unported-examples/gas_dynamics/wing.py b/unported-examples/gas_dynamics/wing.py index 618b3a9775c31160a587309ffa43072f23fb1bda..2017d0f4d83a8c7e28cce3dca121968cf7965c3e 100644 --- a/unported-examples/gas_dynamics/wing.py +++ b/unported-examples/gas_dynamics/wing.py @@ -178,7 +178,7 @@ def main(): stepper = RK4TimeStepper() # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info logmgr = LogManager("navierstokes-%d.dat" % order, "w", rcon.communicator) diff --git a/unported-examples/heat/heat.py b/unported-examples/heat/heat.py index 2d25d62d7ff6e74c3d144ff5949daa10ff635dbb..0aa8fa92f308e171b1030c2210e6765058a47b6c 100644 --- a/unported-examples/heat/heat.py +++ b/unported-examples/heat/heat.py @@ -102,7 +102,7 @@ def main(write_output=True) : u = discr.interpolate_volume_function(u0) # diagnostics setup ------------------------------------------------------- - from pytools.log import LogManager, \ + from logpyle import LogManager, \ add_general_quantities, \ add_simulation_quantities, \ add_run_info diff --git a/unported-examples/maxwell/maxwell-2d.py b/unported-examples/maxwell/maxwell-2d.py index 4a869e1b72ea56237e640b32bbb755e7289c0d24..802f391cdeb6516a8d0bd502a3f72c990134f049 100644 --- a/unported-examples/maxwell/maxwell-2d.py +++ b/unported-examples/maxwell/maxwell-2d.py @@ -90,7 +90,7 @@ def main(write_output=True): t = 0 # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info if write_output: @@ -105,7 +105,7 @@ def main(write_output=True): discr.add_instrumentation(logmgr) stepper.add_instrumentation(logmgr) - from pytools.log import IntervalTimer + from logpyle import IntervalTimer vis_timer = IntervalTimer("t_vis", "Time spent visualizing") logmgr.add_quantity(vis_timer) diff --git a/unported-examples/maxwell/maxwell-pml.py b/unported-examples/maxwell/maxwell-pml.py index 6e23bff692d895ba9cfc9ca5af4fe947e9c240e1..2af61e4ae288cde9f6eb159a1fdb57754fe41bb9 100644 --- a/unported-examples/maxwell/maxwell-pml.py +++ b/unported-examples/maxwell/maxwell-pml.py @@ -146,7 +146,7 @@ def main(write_output=True): print("#elements=", len(mesh.elements)) # diagnostics setup --------------------------------------------------- - from pytools.log import LogManager, add_general_quantities, \ + from logpyle import LogManager, add_general_quantities, \ add_simulation_quantities, add_run_info if write_output: @@ -161,7 +161,7 @@ def main(write_output=True): discr.add_instrumentation(logmgr) stepper.add_instrumentation(logmgr) - from pytools.log import IntervalTimer + from logpyle import IntervalTimer vis_timer = IntervalTimer("t_vis", "Time spent visualizing") logmgr.add_quantity(vis_timer) diff --git a/unported-examples/wave/wiggly.py b/unported-examples/wave/wiggly.py index 11c0121214982b70fb891b443dfec267ce5defb6..db383255fd8a1cb47958d05d33218298202d61eb 100644 --- a/unported-examples/wave/wiggly.py +++ b/unported-examples/wave/wiggly.py @@ -85,7 +85,7 @@ def main(write_output=True, [discr.volume_zeros(dtype=dtype) for i in range(discr.dimensions)]) # diagnostics setup ------------------------------------------------------- - from pytools.log import LogManager, \ + from logpyle import LogManager, \ add_general_quantities, \ add_simulation_quantities, \ add_run_info