Resolving comparison warnings in p2p vector tests

David M. Ozog · David M. Ozog · commit 56ec2de79686 · 2020-02-24T15:55:13.000-05:00
Signed-off-by: David M. Ozog &lt;david.m.ozog@intel.com&gt;
diff --git a/test/shmemx/c11_test_shmemx_test_vector.c b/test/shmemx/c11_test_shmemx_test_vector.c
@@ -14,7 +14,7 @@
         int *status = calloc(npes, sizeof(int));                                                                     \
         TYPE *cmp_values = malloc(npes * sizeof(TYPE));                                                              \
                                                                                                                      \
-        size_t i = 0;                                                                                                \
+        int i = 0;                                                                                                   \
         int expected_sum = 0;                                                                                        \
         int total_sum = 0;                                                                                           \
                                                                                                                      \
@@ -46,7 +46,7 @@
         int *status = calloc(npes, sizeof(int));                                                                     \
         TYPE *cmp_values = malloc(npes * sizeof(TYPE));                                                              \
                                                                                                                      \
-        size_t i = 0;                                                                                                \
+        int i = 0;                                                                                                   \
         int expected_sum = 0;                                                                                        \
         int total_sum = 0;                                                                                           \
                                                                                                                      \
@@ -57,9 +57,9 @@
                                                                                                                      \
         expected_sum = (npes-1) * npes / 2;                                                                          \
                                                                                                                      \
-        size_t ncompleted = 0;                                                                                       \
+        int ncompleted = 0;                                                                                          \
         while(ncompleted < npes){                                                                                    \
-            int ndone = shmemx_test_any_vector(ivars, npes, status, SHMEM_CMP_EQ, cmp_values);                       \
+            size_t ndone = shmemx_test_any_vector(ivars, npes, status, SHMEM_CMP_EQ, cmp_values);                    \
             if (ndone != SIZE_MAX){                                                                                  \
                 status[ndone] = 1;                                                                                   \
                 total_sum += ivars[ndone];                                                                           \
@@ -83,7 +83,7 @@
                                                                                                                      \
         size_t *indices  = malloc(npes * sizeof(size_t));                                                            \
                                                                                                                      \
-        size_t i = 0;                                                                                                \
+        int i = 0;                                                                                                   \
         int expected_sum = 0;                                                                                        \
         int total_sum = 0;                                                                                           \
                                                                                                                      \
@@ -94,13 +94,13 @@
                                                                                                                      \
         expected_sum = (npes-1) * npes / 2;                                                                          \
                                                                                                                      \
-        size_t ncompleted = 0;                                                                                       \
+        int ncompleted = 0;                                                                                          \
         while(ncompleted < npes){                                                                                    \
-            int ndone = shmemx_test_some_vector(ivars, npes, indices, status, SHMEM_CMP_EQ, cmp_values);             \
+            size_t ndone = shmemx_test_some_vector(ivars, npes, indices, status, SHMEM_CMP_EQ, cmp_values);          \
             if(ndone != 0){                                                                                          \
-                for(i = 0; i < ndone; i++){                                                                          \
-                    total_sum += ivars[indices[i]];                                                                  \
-                    status[indices[i]] = 1;                                                                          \
+                for(size_t j = 0; j < ndone; j++){                                                                   \
+                    total_sum += ivars[indices[j]];                                                                  \
+                    status[indices[j]] = 1;                                                                          \
                 }                                                                                                    \
                 ncompleted += ndone;                                                                                 \
             }                                                                                                        \
diff --git a/test/shmemx/c11_test_shmemx_wait_until_vector.c b/test/shmemx/c11_test_shmemx_wait_until_vector.c
@@ -14,7 +14,7 @@
         int *status = calloc(npes, sizeof(int));                                                                     \
         TYPE *cmp_values = malloc(npes * sizeof(TYPE));                                                              \
                                                                                                                      \
-        size_t i = 0;                                                                                                \
+        int i = 0;                                                                                                   \
         int expected_sum = 0;                                                                                        \
         int total_sum = 0;                                                                                           \
                                                                                                                      \
@@ -43,7 +43,7 @@
         int *status = calloc(npes, sizeof(int));                                                                     \
         TYPE *cmp_values = malloc(npes * sizeof(TYPE));                                                              \
                                                                                                                      \
-        size_t i = 0;                                                                                                \
+        int i = 0;                                                                                                   \
         int expected_sum = 0;                                                                                        \
         int total_sum = 0;                                                                                           \
                                                                                                                      \
@@ -54,7 +54,7 @@
                                                                                                                      \
         expected_sum = (npes-1) * npes / 2;                                                                          \
                                                                                                                      \
-        size_t ncompleted = 0;                                                                                       \
+        int ncompleted = 0;                                                                                          \
         while(ncompleted < npes){                                                                                    \
             int ndone = shmemx_wait_until_any_vector(ivars, npes, status, SHMEM_CMP_EQ, cmp_values);                 \
             status[ndone] = 1;                                                                                       \
@@ -78,7 +78,7 @@
                                                                                                                      \
         size_t *indices  = malloc(npes * sizeof(size_t));                                                            \
                                                                                                                      \
-        size_t i = 0;                                                                                                \
+        int i = 0;                                                                                                   \
         int expected_sum = 0;                                                                                        \
         int total_sum = 0;                                                                                           \
                                                                                                                      \
@@ -89,7 +89,7 @@
                                                                                                                      \
         expected_sum = (npes-1) * npes / 2;                                                                          \
                                                                                                                      \
-        size_t ncompleted = 0;                                                                                       \
+        int ncompleted = 0;                                                                                          \
         while(ncompleted < npes){                                                                                    \
             int ndone = shmemx_wait_until_some_vector(ivars, npes, indices, status, SHMEM_CMP_EQ, cmp_values);       \
             for(i = 0; i < ndone; i++){                                                                              \

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`int *status = calloc(npes, sizeof(int)); \`
`15`	`15`	`TYPE cmp_values = malloc(npes sizeof(TYPE)); \`
`16`	`16`	`\`
`17`		`- size_t i = 0; \`
	`17`	`+ int i = 0; \`
`18`	`18`	`int expected_sum = 0; \`
`19`	`19`	`int total_sum = 0; \`
`20`	`20`	`\`
`@@ -46,7 +46,7 @@`
`46`	`46`	`int *status = calloc(npes, sizeof(int)); \`
`47`	`47`	`TYPE cmp_values = malloc(npes sizeof(TYPE)); \`
`48`	`48`	`\`
`49`		`- size_t i = 0; \`
	`49`	`+ int i = 0; \`
`50`	`50`	`int expected_sum = 0; \`
`51`	`51`	`int total_sum = 0; \`
`52`	`52`	`\`
`@@ -57,9 +57,9 @@`
`57`	`57`	`\`
`58`	`58`	`expected_sum = (npes-1) * npes / 2; \`
`59`	`59`	`\`
`60`		`- size_t ncompleted = 0; \`
	`60`	`+ int ncompleted = 0; \`
`61`	`61`	`while(ncompleted < npes){ \`
`62`		`- int ndone = shmemx_test_any_vector(ivars, npes, status, SHMEM_CMP_EQ, cmp_values); \`
	`62`	`+ size_t ndone = shmemx_test_any_vector(ivars, npes, status, SHMEM_CMP_EQ, cmp_values); \`
`63`	`63`	`if (ndone != SIZE_MAX){ \`
`64`	`64`	`status[ndone] = 1; \`
`65`	`65`	`total_sum += ivars[ndone]; \`
`@@ -83,7 +83,7 @@`
`83`	`83`	`\`
`84`	`84`	`size_t indices = malloc(npes sizeof(size_t)); \`
`85`	`85`	`\`
`86`		`- size_t i = 0; \`
	`86`	`+ int i = 0; \`
`87`	`87`	`int expected_sum = 0; \`
`88`	`88`	`int total_sum = 0; \`
`89`	`89`	`\`
`@@ -94,13 +94,13 @@`
`94`	`94`	`\`
`95`	`95`	`expected_sum = (npes-1) * npes / 2; \`
`96`	`96`	`\`
`97`		`- size_t ncompleted = 0; \`
	`97`	`+ int ncompleted = 0; \`
`98`	`98`	`while(ncompleted < npes){ \`
`99`		`- int ndone = shmemx_test_some_vector(ivars, npes, indices, status, SHMEM_CMP_EQ, cmp_values); \`
	`99`	`+ size_t ndone = shmemx_test_some_vector(ivars, npes, indices, status, SHMEM_CMP_EQ, cmp_values); \`
`100`	`100`	`if(ndone != 0){ \`
`101`		`- for(i = 0; i < ndone; i++){ \`
`102`		`- total_sum += ivars[indices[i]]; \`
`103`		`- status[indices[i]] = 1; \`
	`101`	`+ for(size_t j = 0; j < ndone; j++){ \`
	`102`	`+ total_sum += ivars[indices[j]]; \`
	`103`	`+ status[indices[j]] = 1; \`
`104`	`104`	`} \`
`105`	`105`	`ncompleted += ndone; \`
`106`	`106`	`} \`