Skip to content

Commit

Permalink
r.series: implement parallelization with OpenMP (#1776)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronsms committed Apr 26, 2022
1 parent 9f0a3ae commit 5190da3
Show file tree
Hide file tree
Showing 9 changed files with 569 additions and 114 deletions.
3 changes: 2 additions & 1 deletion raster/r.series/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ MODULE_TOPDIR = ../..

PGM = r.series

LIBES = $(STATSLIB) $(RASTERLIB) $(GISLIB)
LIBES = $(STATSLIB) $(RASTERLIB) $(GISLIB) $(OMPLIB)
DEPENDENCIES = $(STATSDEP) $(RASTERDEP) $(GISDEP)
EXTRA_CFLAGS = $(OMPCFLAGS)

include $(MODULE_TOPDIR)/include/Make/Module.make

Expand Down
56 changes: 56 additions & 0 deletions raster/r.series/benchmark/benchmark_r_series.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
"""Benchmarking of r.series
@author Aaron Saw Min Sern
"""

from grass.exceptions import CalledModuleError
from grass.pygrass.modules import Module
from subprocess import DEVNULL

import grass.benchmark as bm


def main():
results = []

# Users can add more or modify existing reference maps
benchmark(7071, "r.series_50M", results)
benchmark(14142, "r.series_200M", results)
benchmark(10000, "r.series_100M", results)
benchmark(20000, "r.series_400M", results)

bm.nprocs_plot(results, filename="r_series_benchmark_size.svg")


def benchmark(size, label, results):
reference = "r_series_reference_map"
output = "benchmark_r_series"

generate_map(rows=size, cols=size, fname=reference)
module = Module(
"r.series",
input=[reference] * 8,
output=output,
method="sum",
run_=False,
stdout_=DEVNULL,
overwrite=True,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))
Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
Module("g.remove", quiet=True, flags="f", type="raster", name=output)


def generate_map(rows, cols, fname):
Module("g.region", flags="p", s=0, n=rows, w=0, e=cols, res=1)
# Generate using r.random.surface if r.surf.fractal fails
try:
print("Generating reference map using r.surf.fractal...")
Module("r.surf.fractal", output=fname)
except CalledModuleError:
print("r.surf.fractal fails, using r.random.surface instead...")
Module("r.random.surface", output=fname)


if __name__ == "__main__":
main()
60 changes: 60 additions & 0 deletions raster/r.series/benchmark/benchmark_r_series_memory.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
"""Benchmarking of r.series
@author Aaron Saw Min Sern
@author Anna Petrasova
"""

from grass.exceptions import CalledModuleError
from grass.pygrass.modules import Module
from subprocess import DEVNULL

import grass.benchmark as bm


def main():
results = []

reference = "r_series_reference_map"
generate_map(rows=10000, cols=10000, fname=reference)
# Users can add more or modify existing reference maps
benchmark(0, "r.series_0MB", results, reference)
benchmark(5, "r.series_5MB", results, reference)
benchmark(10, "r.series_10MB", results, reference)
benchmark(100, "r.series_100MB", results, reference)
benchmark(300, "r.series_300MB", results, reference)

Module("g.remove", quiet=True, flags="f", type="raster", name=reference)
bm.nprocs_plot(results, filename="r_series_benchmark_memory.svg")


def benchmark(memory, label, results, reference):
output = "benchmark_r_series"

module = Module(
"r.series",
input=[reference] * 8,
output=output,
method="sum",
run_=False,
stdout_=DEVNULL,
overwrite=True,
memory=memory,
)
results.append(bm.benchmark_nprocs(module, label=label, max_nprocs=16, repeat=3))

Module("g.remove", quiet=True, flags="f", type="raster", name=output)


def generate_map(rows, cols, fname):
Module("g.region", flags="p", s=0, n=rows, w=0, e=cols, res=1)
# Generate using r.random.surface if r.surf.fractal fails
try:
print("Generating reference map using r.surf.fractal...")
Module("r.surf.fractal", output=fname)
except CalledModuleError:
print("r.surf.fractal fails, using r.random.surface instead...")
Module("r.random.surface", output=fname)


if __name__ == "__main__":
main()

0 comments on commit 5190da3

Please sign in to comment.