Skip to content

Commit

Permalink
remove distinction between AOS/AOS_MGPU
Browse files Browse the repository at this point in the history
It doesn't seem to really -do- anything and I'm not sure why I did it
that way in the first place.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
  • Loading branch information
tycho committed Mar 6, 2019
1 parent 8119b69 commit 98d9f2e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 2 additions & 4 deletions src/nbody.cu
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static const algorithm_def_t s_algorithms[] = {
{ "GPU_AOS", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_GPU_AOS } },
{ "GPU_Shared", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_GPU_Shared } },
{ "GPU_Const", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_GPU_AOS_const } },
{ "MultiGPU", ALGORITHM_AOS_MGPU, { .aos = ComputeGravitation_multiGPU } },
{ "MultiGPU", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_multiGPU } },
{ "GPU_Shuffle", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_GPU_Shuffle } },
// { "GPU_SOA_tiled", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_GPU_SOA_tiled } },
// { "GPU_AOS_tiled", ALGORITHM_AOS_GPU, { .aos = ComputeGravitation_GPU_AOS_tiled } },
Expand All @@ -120,8 +120,7 @@ static const algorithm_def_t s_algorithms[] = {

static inline bool isGPUAlgorithm(const algorithm_def_t *algorithm)
{
return (algorithm->type == ALGORITHM_AOS_GPU ||
algorithm->type == ALGORITHM_AOS_MGPU);
return (algorithm->type == ALGORITHM_AOS_GPU);
}

static int maxAlgorithmIdx(void)
Expand Down Expand Up @@ -280,7 +279,6 @@ ComputeGravitation(
g_N );
bSOA = 1;
break;
case ALGORITHM_AOS_MGPU:
case ALGORITHM_AOS:
*ms = algorithm->aos(
g_hostAOS_Force,
Expand Down
1 change: 0 additions & 1 deletion src/nbody.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ typedef enum {
ALGORITHM_SOA,
ALGORITHM_AOS,
ALGORITHM_AOS_GPU,
ALGORITHM_AOS_MGPU,
} algorithm_t;

// There are two different function prototypes for ComputeGravitation,
Expand Down

0 comments on commit 98d9f2e

Please sign in to comment.