star-gf

commit 582e690656d7822feec144774fa5eb15cd4d39d1
parent b830acdce3151c9bd344e0587899ff4f9caf0511
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed,  1 Jun 2016 16:17:13 +0200

Fix the compilation on the CL compiler

Diffstat:
M
cmake/CMakeLists.txt
 | 
1
+
M
src/test_sgf_cube.c
 | 
4
++--
M
src/test_sgf_tetrahedron.c
 | 
5
+++--

3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -82,6 +82,7 @@ if(NOT NO_TEST)
   new_test(test_sgf_device)
   new_test(test_sgf_cube)
   new_test(test_sgf_tetrahedron)
+  rcmake_copy_runtime_libraries(test_sgf_tetrahedron)
 
   set_target_properties(test_sgf_cube PROPERTIES COMPILE_FLAGS ${OpenMP_C_FLAGS})
   set_target_properties(test_sgf_tetrahedron PROPERTIES COMPILE_FLAGS ${OpenMP_C_FLAGS})
diff --git a/src/test_sgf_cube.c b/src/test_sgf_cube.c
@@ -94,7 +94,7 @@ main(int argc, char** argv)
   struct sgf_estimator* estimator;
   struct ssp_rng_proxy* proxy;
   struct ssp_rng** rngs = NULL;
-  size_t iprim;
+  int iprim;
   unsigned i;
   unsigned nbuckets;
   (void)argc, (void)argv;
@@ -247,7 +247,7 @@ main(int argc, char** argv)
 
   /* Integrate the Gebhart Factors */
   #pragma omp parallel for
-  for(iprim = 0; iprim < nprims; ++iprim) {
+  for(iprim = 0; iprim < (int)nprims; ++iprim) {
     size_t iprim2;
     struct sgf_status* row = status + iprim * nprims;
     const int ithread = omp_get_thread_num();
diff --git a/src/test_sgf_tetrahedron.c b/src/test_sgf_tetrahedron.c
@@ -61,8 +61,9 @@ main(int argc, char** argv)
   struct sgf_status* status = NULL;
   struct ssp_rng_proxy* proxy = NULL;
   struct ssp_rng** rngs = NULL;
-  size_t i, iprim;
+  size_t i;
   size_t nbuckets;
+  int iprim;
   (void)argc, (void)argv;
 
   mem_init_proxy_allocator(&allocator, &mem_default_allocator);
@@ -105,7 +106,7 @@ main(int argc, char** argv)
 
   /* Gebhart Factor integration */
   #pragma omp parallel for
-  for(iprim = 0; iprim < nprims; ++iprim) {
+  for(iprim = 0; iprim < (int)nprims; ++iprim) {
     struct sgf_status* row = status + iprim*nprims;
     struct sgf_estimator* estimator = NULL;
     size_t iprim2;