Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update parsec for their new apis #91

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ if [[ $USE_PARSEC -eq 1 ]]; then
mkdir -p "$PARSEC_DIR"
pushd "$PARSEC_DIR"
if [[ $TASKBENCH_USE_HWLOC -eq 1 ]]; then
../configure --prefix=$PWD --with-mpi --with-hwloc=$HWLOC_DIR --disable-debug
../configure --prefix=$PWD --with-mpi --with-hwloc=$HWLOC_DIR --disable-debug --with-cuda=no --disable-testing
else
../configure --prefix=$PWD --with-mpi --disable-debug --with-cuda=no
../configure --prefix=$PWD --with-mpi --disable-debug --with-cuda=no --disable-testing
fi
make -j$THREADS
make install
Expand Down
4 changes: 2 additions & 2 deletions get_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ export PARSEC_DIR="\$PARSEC_DL_DIR"/build

EOF
mkdir -p "$PARSEC_DL_DIR"
git clone https://bitbucket.org/icldistcomp/parsec.git "$PARSEC_DL_DIR"
git clone https://github.com/ICLDisco/parsec.git "$PARSEC_DL_DIR"
pushd "$PARSEC_DL_DIR"
git reset --hard 242498dd7ce3974c01db888d7e4d759a69e5bcdb
git reset --hard b4e71d696b9f64ad82bf0516c61bd3076b7f53c0
git apply ../../parsec/patch.diff
popd
fi
Expand Down
18 changes: 9 additions & 9 deletions parsec/benchmark.jdf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern "C" %{

%}

descA [ type = "parsec_tiled_matrix_dc_t*" ]
descA [ type = "parsec_tiled_matrix_t*" ]
graph [ type = "task_graph_t" ]
nb_fields [ type = "int" ]
time_steps [ type = "int" ]
Expand Down Expand Up @@ -88,7 +88,7 @@ END
extern "C" %{

parsec_taskpool_t*
parsec_benchmark_New(parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_benchmark_New(parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory)
{
parsec_taskpool_t* benchmark_taskpool;
Expand All @@ -97,24 +97,24 @@ parsec_benchmark_New(parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fie
taskpool = parsec_benchmark_new(A, graph, nb_fields, time_steps, graph_idx, extra_local_memory);
benchmark_taskpool = (parsec_taskpool_t*)taskpool;

parsec_matrix_add2arena(&(taskpool->arenas_datatypes[PARSEC_benchmark_DEFAULT_ARENA]),
parsec_datatype_float_t, matrix_UpperLower,
1, A->mb, A->nb, A->mb,
PARSEC_ARENA_ALIGNMENT_SSE, -1 );
parsec_add2arena(&(taskpool->arenas_datatypes[PARSEC_benchmark_DEFAULT_ADT_IDX]),
parsec_datatype_float_t, PARSEC_MATRIX_FULL,
1, A->mb, A->nb, A->mb,
PARSEC_ARENA_ALIGNMENT_SSE, -1 );

return benchmark_taskpool;
}

void parsec_benchmark_Destruct(parsec_taskpool_t *taskpool)
{
parsec_benchmark_taskpool_t *benchmark_taskpool = (parsec_benchmark_taskpool_t *)taskpool;
parsec_matrix_del2arena(&(benchmark_taskpool->arenas_datatypes[PARSEC_benchmark_DEFAULT_ARENA]));
parsec_del2arena(&(benchmark_taskpool->arenas_datatypes[PARSEC_benchmark_DEFAULT_ADT_IDX]));
parsec_taskpool_free(taskpool);
}

int parsec_benchmark(parsec_context_t *parsec,
parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory)
parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory)
{
parsec_taskpool_t *parsec_benchmark = NULL;

Expand Down
14 changes: 7 additions & 7 deletions parsec/benchmark_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,31 @@ extern int get_num_args_out(task_graph_t g, int t, int x, int out_first, int out
extern int nb_tasks_per_node[32];

extern int parsec_stencil_1d(parsec_context_t *parsec,
parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern int parsec_nearest_radix_5(parsec_context_t *parsec,
parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern int parsec_spread_radix5_period3(parsec_context_t *parsec,
parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern int parsec_benchmark(parsec_context_t *parsec,
parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern parsec_taskpool_t*
parsec_stencil_1d_New(parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_stencil_1d_New(parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern parsec_taskpool_t*
parsec_nearest_radix_5_New(parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_nearest_radix_5_New(parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern parsec_taskpool_t*
parsec_spread_radix5_period3_New(parsec_tiled_matrix_dc_t *A, task_graph_t graph, int nb_fields,
parsec_spread_radix5_period3_New(parsec_tiled_matrix_t *A, task_graph_t graph, int nb_fields,
int time_steps, int graph_idx, char **extra_local_memory);

extern void parsec_stencil_1d_Destruct(parsec_taskpool_t *taskpool);
Expand Down
Loading