Skip to content

Commit

Permalink
move recursive tasks tests and examples
Browse files Browse the repository at this point in the history
  • Loading branch information
nfurmento committed Jan 28, 2025
1 parent 163b9d3 commit 565ac88
Show file tree
Hide file tree
Showing 37 changed files with 181 additions and 104 deletions.
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4598,7 +4598,7 @@ AC_CONFIG_COMMANDS([executable-scripts], [
; do
test -e $x || ( mkdir -p $(dirname $x) && ln -sf $ac_abs_top_srcdir/$x $(dirname $x) )
done
for x in tools julia/examples starpufft/tests examples examples/stencil mpi/tests mpi/examples socl/examples starpupy/examples starpu_openmp_llvm/examples \
for x in tools julia/examples starpufft/tests examples examples/stencil mpi/tests mpi/examples socl/examples starpupy/examples starpu_openmp_llvm/examples tests/recursive_tasks \
; do
test -e $x/loader.c || ln -sf $ac_abs_top_srcdir/tests/loader.c $x
done
Expand Down Expand Up @@ -4691,6 +4691,7 @@ AC_OUTPUT([
examples/Makefile
examples/stencil/Makefile
tests/Makefile
tests/recursive_tasks/Makefile
tests/model-checking/Makefile
tests/model-checking/starpu-mc.sh
mpi/Makefile
Expand Down
11 changes: 11 additions & 0 deletions examples/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -1619,6 +1619,17 @@ subgraphs_plan_SOURCES = \
subgraphs/codelets.c


############################
# recursive tasks examples #
############################

if !STARPU_SIMGRID
if STARPU_RECURSIVE_TASKS
STARPU_EXAMPLES += \
recursive_tasks/vector
endif
endif

# - link over source file to build our own object
fortran90/starpu_mod.f90:
@$(MKDIR_P) $(dir $@)
Expand Down
File renamed without changes.
110 changes: 7 additions & 103 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
include $(top_srcdir)/make/starpu-tests.mk
include $(top_srcdir)/make/starpu-loader.mk

SUBDIRS =

AM_CFLAGS += $(APP_CFLAGS)
AM_CXXFLAGS += $(APP_CXXFLAGS)
AM_FFLAGS += $(APP_FFLAGS)
Expand Down Expand Up @@ -90,8 +92,7 @@ EXTRA_DIST = \
maxfpga/Task2.maxj \
maxfpga/Task3.maxj \
datawizard/interfaces/test_interfaces.sh \
traces/fxt.sh \
recursive_tasks/basic/basic.h
traces/fxt.sh

CLEANFILES = \
*.gcno *.gcda *.linkinfo core starpu_idle_microsec.log *.mod *.png *.output tasks.rec perfs.rec */perfs.rec */*/perfs.rec perfs2.rec fortran90/starpu_mod.f90 bandwidth-*.dat bandwidth.gp bandwidth.eps bandwidth.svg *.csv *.md *.Rmd *.pdf *.html
Expand All @@ -100,7 +101,6 @@ clean-local:
-rm -rf overlap/overlap.traces datawizard/locality.traces traces/fxt.traces

BUILT_SOURCES =
SUBDIRS =

examplebindir = $(libdir)/starpu/examples

Expand Down Expand Up @@ -1237,6 +1237,10 @@ endif
sched_policies_execute_all_tasks_LDFLAGS = $(AM_LDFLAGS) -lm
sched_policies_execute_all_tasks_CFLAGS = $(AM_LDFLAGS) $(FXT_CFLAGS)

if STARPU_RECURSIVE_TASKS
SUBDIRS += recursive_tasks
endif

# Fortran90 tests

# - link over source file to build our own object
Expand Down Expand Up @@ -1273,104 +1277,4 @@ slic_%.o: %.max
CLEANFILES += */*.max */*.class max_fpga/*.h
endif

###################
# Recursive tasks #
###################

if !STARPU_SIMGRID
if STARPU_RECURSIVE_TASKS
myPROGRAMS += \
recursive_tasks/basic/b \
recursive_tasks/basic/bb \
recursive_tasks/basic/btb \
recursive_tasks/basic/btb_func \
recursive_tasks/basic/bbt \
recursive_tasks/basic/brob \
recursive_tasks/basic/btt \
recursive_tasks/basic/bbtt \
recursive_tasks/basic/tbbt \
recursive_tasks/basic/tbtbt \
recursive_tasks/basic/brt \
recursive_tasks/basic/brbtt \
recursive_tasks/basic/sync \
recursive_tasks/basic/gemm_dag \
recursive_tasks/basic/b2t \
recursive_tasks/basic/brec \
recursive_tasks/basic/brec_level \
recursive_tasks/basic/read \
recursive_tasks/basic/tbrbtt \
recursive_tasks/basic/P2bUt \
recursive_tasks/basic/Nbrbt \
recursive_tasks/basic/brbrbt \
recursive_tasks/basic/b-nbt \
recursive_tasks/basic/tbtbt-3data \
recursive_tasks/basic/turnRW \
recursive_tasks/basic/unpartitionRO \
recursive_tasks/basic/flush \
recursive_tasks/basic/brbtbrb \
recursive_tasks/vector/vector
endif
endif

recursive_tasks_basic_b_SOURCES = recursive_tasks/basic/b.c
recursive_tasks_basic_bb_SOURCES = recursive_tasks/basic/bb.c
recursive_tasks_basic_btb_SOURCES = recursive_tasks/basic/btb.c
recursive_tasks_basic_btb_func_SOURCES = recursive_tasks/basic/btb_func.c
recursive_tasks_basic_bbt_SOURCES = recursive_tasks/basic/bbt.c
recursive_tasks_basic_brob_SOURCES = recursive_tasks/basic/brob.c
recursive_tasks_basic_btt_SOURCES = recursive_tasks/basic/btt.c
recursive_tasks_basic_bbtt_SOURCES = recursive_tasks/basic/bbtt.c
recursive_tasks_basic_tbbt_SOURCES = recursive_tasks/basic/tbbt.c
recursive_tasks_basic_tbtbt_SOURCES = recursive_tasks/basic/tbtbt.c
recursive_tasks_basic_brt_SOURCES = recursive_tasks/basic/brt.c
recursive_tasks_basic_brbtt_SOURCES = recursive_tasks/basic/brbtt.c
recursive_tasks_basic_gemm_dag_SOURCES = recursive_tasks/basic/gemm_dag.c
recursive_tasks_basic_b2t_SOURCES = recursive_tasks/basic/b2t.c
recursive_tasks_basic_brec_SOURCES = recursive_tasks/basic/brec.c
recursive_tasks_basic_brec_level_SOURCES = recursive_tasks/basic/brec_level.c
recursive_tasks_basic_read_SOURCES = recursive_tasks/basic/read.c
recursive_tasks_basic_tbrbtt_SOURCES = recursive_tasks/basic/tbrbtt.c
recursive_tasks_basic_P2bUt_SOURCES = recursive_tasks/basic/P2bUt.c
recursive_tasks_basic_Nbrbt_SOURCES = recursive_tasks/basic/Nbrbt.c
recursive_tasks_basic_brbrbt_SOURCES = recursive_tasks/basic/brbrbt.c
recursive_tasks_basic_b_nbt_SOURCES = recursive_tasks/basic/b-nbt.c
recursive_tasks_basic_tbtbt_3data_SOURCES = recursive_tasks/basic/tbtbt-3data.c
recursive_tasks_basic_turnRW_SOURCES = recursive_tasks/basic/turnRW.c
recursive_tasks_basic_unpartitionRO_SOURCES = recursive_tasks/basic/unpartitionRO.c
recursive_tasks_basic_flush_SOURCES = recursive_tasks/basic/flush.c
recursive_tasks_basic_brbtbrb_SOURCES = recursive_tasks/basic/brbtbrb.c
recursive_tasks_vector_vector_SOURCES = recursive_tasks/vector/vector.c

if STARPU_RECURSIVE_TASKS
if STARPU_USE_CUDA
myPROGRAMS += \
recursive_tasks/basic/b_on_cuda
recursive_tasks_basic_b_on_cuda_SOURCES = recursive_tasks/basic/b_on_cuda.c
recursive_tasks_basic_b_on_cuda_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_b_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_bb_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_btb_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_btb_func_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_brob_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_btt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_brbrbt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_tbtbt_3data_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_brbtbrb_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_read_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_b_nbt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_brt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_b2t_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_bbt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_flush_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_unpartitionRO_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_turnRW_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_P2bUt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_tbbt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_tbrbtt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_brbtt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_bbtt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_Nbrbt_SOURCES += recursive_tasks/basic/basic.cu
recursive_tasks_basic_tbtbt_SOURCES += recursive_tasks/basic/basic.cu
endif
endif

161 changes: 161 additions & 0 deletions tests/recursive_tasks/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
# StarPU --- Runtime system for heterogeneous multicore architectures.
#
# Copyright (C) 2009-2025 University of Bordeaux, CNRS (LaBRI UMR 5800), Inria
#
# StarPU is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or (at
# your option) any later version.
#
# StarPU is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# See the GNU Lesser General Public License in COPYING.LGPL for more details.
#
include $(top_srcdir)/make/starpu-tests.mk
include $(top_srcdir)/make/starpu-loader.mk

AM_CFLAGS += $(APP_CFLAGS)
AM_CXXFLAGS += $(APP_CXXFLAGS)
AM_FFLAGS += $(APP_FFLAGS)
AM_FCFLAGS += $(APP_FCFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_builddir)/src -I$(top_srcdir)/src/ $(STARPU_H_CPPFLAGS)
AM_LDFLAGS = @STARPU_EXPORT_DYNAMIC@
LIBS += $(top_builddir)/src/@LIBSTARPU_LINK@ $(STARPU_EXPORTED_LIBS)
LIBS += $(HWLOC_LIBS)
LIBS += $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUDA_LDFLAGS) $(STARPU_HIP_LDFLAGS)
LIBS += $(STARPU_MAX_FPGA_LDFLAGS)

EXTRA_DIST = \
basic.h

CLEANFILES = \
*.gcno *.gcda *.linkinfo core starpu_idle_microsec.log *.mod *.png *.output tasks.rec perfs.rec */perfs.rec */*/perfs.rec perfs2.rec fortran90/starpu_mod.f90 bandwidth-*.dat bandwidth.gp bandwidth.eps bandwidth.svg *.csv *.md *.Rmd *.pdf *.html

BUILT_SOURCES =
SUBDIRS =

examplebindir = $(libdir)/starpu/examples

if STARPU_USE_OPENCL
nobase_STARPU_OPENCL_DATA_DATA =
endif

#####################################
# What to install and what to check #
#####################################

TESTS = $(myPROGRAMS)

myPROGRAMS =

if STARPU_HAVE_WINDOWS
check_PROGRAMS = $(myPROGRAMS)
else
check_PROGRAMS = $(LOADER) $(myPROGRAMS)
endif
noinst_PROGRAMS += $(myPROGRAMS)

###################
# Recursive tasks #
###################

if !STARPU_SIMGRID
if STARPU_RECURSIVE_TASKS
myPROGRAMS += \
b \
bb \
btb \
btb_func \
bbt \
brob \
btt \
bbtt \
tbbt \
tbtbt \
brt \
brbtt \
gemm_dag \
b2t \
brec \
brec_level \
read \
tbrbtt \
P2bUt \
Nbrbt \
brbrbt \
b-nbt \
tbtbt-3data \
turnRW \
unpartitionRO \
flush \
brbtbrb
endif
endif

b_SOURCES = b.c
bb_SOURCES = bb.c
bb_strongdeps_SOURCES = bb_strongdeps.c
btb_SOURCES = btb.c
btb_func_SOURCES = btb_func.c
bbt_SOURCES = bbt.c
brob_SOURCES = brob.c
btt_SOURCES = btt.c
bbtt_SOURCES = bbtt.c
tbbt_SOURCES = tbbt.c
tbtbt_SOURCES = tbtbt.c
brt_SOURCES = brt.c
brbtt_SOURCES = brbtt.c
gemm_dag_SOURCES = gemm_dag.c
b2t_SOURCES = b2t.c
brec_SOURCES = brec.c
brec_level_SOURCES = brec_level.c
read_SOURCES = read.c
tbrbtt_SOURCES = tbrbtt.c
P2bUt_SOURCES = P2bUt.c
Nbrbt_SOURCES = Nbrbt.c
brbrbt_SOURCES = brbrbt.c
b_nbt_SOURCES = b-nbt.c
tbtbt_3data_SOURCES = tbtbt-3data.c
turnRW_SOURCES = turnRW.c
unpartitionRO_SOURCES = unpartitionRO.c
flush_SOURCES = flush.c
brbtbrb_SOURCES = brbtbrb.c

if STARPU_RECURSIVE_TASKS
if STARPU_USE_CUDA
myPROGRAMS += \
b_on_cuda
b_on_cuda_SOURCES = b_on_cuda.c
b_on_cuda_SOURCES += basic.cu
b_SOURCES += basic.cu
bb_SOURCES += basic.cu
bb_strongdeps_SOURCES += basic.cu
btb_SOURCES += basic.cu
btb_func_SOURCES += basic.cu
brob_SOURCES += basic.cu
btt_SOURCES += basic.cu
brbrbt_SOURCES += basic.cu
tbtbt_3data_SOURCES += basic.cu
brbtbrb_SOURCES += basic.cu
brec_SOURCES += basic.cu
brec_level_SOURCES += basic.cu
read_SOURCES += basic.cu
b_nbt_SOURCES += basic.cu
brt_SOURCES += basic.cu
b2t_SOURCES += basic.cu
bbt_SOURCES += basic.cu
flush_SOURCES += basic.cu
unpartitionRO_SOURCES += basic.cu
turnRW_SOURCES += basic.cu
P2bUt_SOURCES += basic.cu
tbbt_SOURCES += basic.cu
tbrbtt_SOURCES += basic.cu
brbtt_SOURCES += basic.cu
bbtt_SOURCES += basic.cu
Nbrbt_SOURCES += basic.cu
tbtbt_SOURCES += basic.cu
endif
endif

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 565ac88

Please sign in to comment.