Skip to content

Commit

Permalink
Merge pull request #17 from ireed/pull-requests
Browse files Browse the repository at this point in the history 
SHMEM_HEAP_TYPE constant is undefined, which causes compile error. Ch…
  • Loading branch information
@mike-dubman
mike-dubman authored Aug 28, 2017
2 parents 490c41a + b67c5b2 commit 8be85e9
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 23 deletions.
1 change: 0 additions & 1 deletion verifier/analysis/osh_analysis_tc1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "osh_log.h"

#include "shmem.h"
#include "mpi.h"

#include "osh_analysis.h"

Expand Down
1 change: 0 additions & 1 deletion verifier/analysis/osh_analysis_tc2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "osh_log.h"

#include "shmem.h"
#include "mpi.h"

#include "osh_analysis.h"

Expand Down
1 change: 0 additions & 1 deletion verifier/analysis/osh_analysis_tc3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "osh_log.h"

#include "shmem.h"
#include "mpi.h"

#include "osh_analysis.h"

Expand Down
1 change: 0 additions & 1 deletion verifier/analysis/osh_analysis_tc4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "osh_log.h"

#include "shmem.h"
#include "mpi.h"

#include "osh_analysis.h"

Expand Down
1 change: 0 additions & 1 deletion verifier/analysis/osh_analysis_tc5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "osh_log.h"

#include "shmem.h"
#include "mpi.h"

#include "osh_analysis.h"

Expand Down
2 changes: 1 addition & 1 deletion verifier/basic/osh_basic_tc3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static int memheap_type(void)
if (memheap_type != MEMHEAP_ALLOC_UNKNOWN)
return memheap_type;

p = getenv(SHMEM_HEAP_TYPE);
p = getenv("SHMEM_HEAP_TYPE");
if (p)
{
log_debug(OSH_TC, "heap allocator is %s\n", p);
Expand Down
2 changes: 1 addition & 1 deletion verifier/cmn/osh_cmn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ unsigned long long memheap_size (void) {
int idx;
unsigned long long size;

p = getenv(SHMEM_HEAP_SIZE);
p = getenv("SHMEM_HEAP_SIZE");
if (!p) {
return (SIZE_IN_MEGA_BYTES (DEFAULT_SYMMETRIC_HEAP_SIZE));
}
Expand Down
2 changes: 1 addition & 1 deletion verifier/coll/osh_coll_tc10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static int test_item7(void);

#define WAIT_COUNT 5
#define TYPE_VALUE int64_t
#define FUNC_VALUE shmem_broadcast
#define FUNC_VALUE shmem_broadcast64
#define SIZE_VALUE sizeof(TYPE_VALUE)
#define MAX_VALUE (((unsigned long long)1 << ( 8 * SIZE_VALUE - 1)) - 1)
#define BASE_VALUE 8
Expand Down
6 changes: 3 additions & 3 deletions verifier/coll/osh_coll_tc11.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int osh_coll_tc11(const TE_NODE *node, int argc, const char *argv[])

if (rc == TC_PASS)
{
pSync = shmalloc(sizeof(*pSync) * _SHMEM_ALLTOALL_SYNC_SIZE);
pSync = shmalloc(sizeof(*pSync) * SHMEM_ALLTOALL_SYNC_SIZE);
if (!pSync)
{
rc = TC_SETUP_FAIL;
Expand Down Expand Up @@ -101,7 +101,7 @@ static int test_item1(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down Expand Up @@ -154,7 +154,7 @@ static int test_item2(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down
14 changes: 7 additions & 7 deletions verifier/coll/osh_coll_tc12.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ int osh_coll_tc12(const TE_NODE *node, int argc, const char *argv[])

if (rc == TC_PASS)
{
pSync = shmalloc(sizeof(*pSync) * _SHMEM_ALLTOALL_SYNC_SIZE);
pSync = shmalloc(sizeof(*pSync) * SHMEM_ALLTOALL_SYNC_SIZE);
if (!pSync)
{
rc = TC_SETUP_FAIL;
Expand Down Expand Up @@ -135,7 +135,7 @@ static int test_item1(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down Expand Up @@ -190,7 +190,7 @@ static int test_item2(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down Expand Up @@ -244,7 +244,7 @@ static int test_item3(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down Expand Up @@ -299,7 +299,7 @@ static int test_item4(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down Expand Up @@ -353,7 +353,7 @@ static int test_item5(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down Expand Up @@ -408,7 +408,7 @@ static int test_item6(void)
}

/* This guarantees that PE set initial value before peer change one */
for ( i = 0; i < _SHMEM_ALLTOALL_SYNC_SIZE; i++ )
for ( i = 0; i < SHMEM_ALLTOALL_SYNC_SIZE; i++ )
{
pSync[i] = _SHMEM_SYNC_VALUE;
}
Expand Down
8 changes: 4 additions & 4 deletions verifier/lock/osh_lock_tc4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static int mca_atomic_basic_init(int enable_progress_threads,
{
int rc = OSHMEM_SUCCESS;
void* ptr = NULL;
int num_pe = num_pes();
int num_pe = _num_pes();

UNREFERENCED_PARAMETER(enable_progress_threads);
UNREFERENCED_PARAMETER(enable_threads);
Expand Down Expand Up @@ -117,7 +117,7 @@ static void atomic_basic_lock(int pe)
{
int index = -1;
int me = shmem_my_pe();
int num_pe = num_pes();
int num_pe = _num_pes();
char lock_required = ATOMIC_LOCK_WAITING;
char lock_active = ATOMIC_LOCK_ACTIVE;
int root_pe = pe;
Expand Down Expand Up @@ -174,7 +174,7 @@ static void atomic_basic_unlock(int pe)
{
int index = -1;
int me = shmem_my_pe();
int num_pe = num_pes();
int num_pe = _num_pes();
char lock_idle = ATOMIC_LOCK_IDLE;
int root_pe = pe;

Expand Down Expand Up @@ -235,7 +235,7 @@ int osh_lock_tc4(const TE_NODE *node, int argc, const char *argv[])
static int test_item1()
{
int me = shmem_my_pe();
int num_pe = num_pes();
int num_pe = _num_pes();
int res = TC_PASS;
int writer = 0;
const int number_of_iterations = 2; //num_pe - 1;
Expand Down
1 change: 0 additions & 1 deletion verifier/mix/osh_mix_tc1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "osh_log.h"

#include "shmem.h"
#include "mpi.h"

#include "osh_mix.h"

Expand Down

0 comments on commit 8be85e9

Please sign in to comment.