Selaa lähdekoodia

also fix srand48 usage

Samuel Thibault 15 vuotta sitten
vanhempi
commit
587d90a6b8

+ 3 - 1
configure.ac

@@ -68,8 +68,10 @@ AC_CHECK_FUNCS([posix_memalign memalign])
 
 
 # Some systems don't have drand48
 # Some systems don't have drand48
 AC_CHECK_FUNCS([drand48],
 AC_CHECK_FUNCS([drand48],
+  AC_DEFINE([starpu_srand48(seed)],[srand48(seed)],[srand48 equivalent function])
   AC_DEFINE([starpu_drand48()],[drand48()],[drand48 equivalent function]),
   AC_DEFINE([starpu_drand48()],[drand48()],[drand48 equivalent function]),
-  AC_DEFINE([starpu_drand48()],[((double)rand() / RAND_MAX)],[drand48 equivalent function])
+  AC_DEFINE([starpu_srand48(seed)],[srand(seed)],[srand48 equivalent function])
+  AC_DEFINE([starpu_drand48()],[((double)(rand()) / RAND_MAX)],[drand48 equivalent function])
 )
 )
 
 
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_HEADERS([malloc.h])

+ 2 - 2
examples/lu/lu_example.c

@@ -130,8 +130,8 @@ static void init_matrix(void)
 	starpu_malloc_pinned_if_possible((void **)&A, (size_t)size*size*sizeof(TYPE));
 	starpu_malloc_pinned_if_possible((void **)&A, (size_t)size*size*sizeof(TYPE));
 	STARPU_ASSERT(A);
 	STARPU_ASSERT(A);
 
 
-	srand48((long int)time(NULL));
-	//srand48(0);
+	starpu_srand48((long int)time(NULL));
+	//starpu_srand48(0);
 
 
 	/* initialize matrix content */
 	/* initialize matrix content */
 	unsigned long i,j;
 	unsigned long i,j;

+ 1 - 1
examples/starpufft/testx.c

@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
 	bytes = size * sizeof(STARPUFFT(complex));
 	bytes = size * sizeof(STARPUFFT(complex));
 
 
 	STARPUFFT(complex) *in = STARPUFFT(malloc)(size * sizeof(*in));
 	STARPUFFT(complex) *in = STARPUFFT(malloc)(size * sizeof(*in));
-	srand48(0);
+	starpu_srand48(0);
 	for (i = 0; i < size; i++)
 	for (i = 0; i < size; i++)
 		in[i] = starpu_drand48() + I * starpu_drand48();
 		in[i] = starpu_drand48() + I * starpu_drand48();
 
 

+ 1 - 1
examples/starpufft/testx_threads.c

@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
 	bytes = size * sizeof(_FFTW(complex));
 	bytes = size * sizeof(_FFTW(complex));
 
 
 	_FFTW(complex) *in = _FFTW(malloc)(size * sizeof(*in));
 	_FFTW(complex) *in = _FFTW(malloc)(size * sizeof(*in));
-	srand48(0);
+	starpu_srand48(0);
 	for (i = 0; i < size; i++)
 	for (i = 0; i < size; i++)
 		in[i] = starpu_drand48() + I * starpu_drand48();
 		in[i] = starpu_drand48() + I * starpu_drand48();
 
 

+ 1 - 0
include/starpu_config.h.in

@@ -37,5 +37,6 @@
 #undef HAVE_LIBNUMA
 #undef HAVE_LIBNUMA
 
 
 #undef starpu_drand48
 #undef starpu_drand48
+#undef starpu_srand48
 
 
 #endif
 #endif

+ 1 - 1
mpi/examples/mpi_lu/plu_example.c

@@ -412,7 +412,7 @@ int main(int argc, char **argv)
 	MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 	MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 	MPI_Comm_size(MPI_COMM_WORLD, &world_size);
 	MPI_Comm_size(MPI_COMM_WORLD, &world_size);
 
 
-	srand48((long int)time(NULL));
+	starpu_srand48((long int)time(NULL));
 
 
 	parse_args(argc, argv, rank);
 	parse_args(argc, argv, rank);
 
 

+ 1 - 1
src/core/policies/random-policy.c

@@ -100,7 +100,7 @@ static void initialize_random_policy(struct machine_config_s *config,
 {
 {
 	nworkers = 0;
 	nworkers = 0;
 
 
-	srand48(time(NULL));
+	starpu_srand48(time(NULL));
 
 
 	setup_queues(init_fifo_queues_mechanisms, init_random_fifo, config);
 	setup_queues(init_fifo_queues_mechanisms, init_random_fifo, config);
 }
 }