drop unrelated changes

examples/basic_examples/vector_scal.c

@@ -27,7 +27,7 @@
 #include <starpu_opencl.h>
 #include <stdio.h>
 
-#define	NX	128
+#define	NX	2048
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 extern void scal_cpu_func(void *buffers[], void *_args);
@@ -67,9 +67,6 @@ struct starpu_opencl_program opencl_program;
 
 int main(int argc, char **argv)
 {
-
-		simInitLibrary();
-
 	/* We consider a vector of float that is initialized just as any of C
  	 * data */
 	float vector[NX];
@@ -142,7 +139,5 @@ int main(int argc, char **argv)
 	FPRINTF(stderr, "AFTER: First element is %f\n", vector[0]);
 	FPRINTF(stderr, "AFTER: Last element is %f\n", vector[NX-1]);
 
-	closeThreads();
-
 	return 0;
 }

examples/basic_examples/vector_scal_opencl_kernel.cl

@@ -14,8 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "intrinsics.h"
-
 __kernel void vector_mult_opencl(__global float* val, int nx, float factor)
 {
         const int i = get_global_id(0);

examples/spmv/spmv.c

@@ -106,7 +106,6 @@ static starpu_codelet spmv_cl = {
 
 int main(int argc, char **argv)
 {
-	simInitLibrary();
 	int ret;
 	unsigned part;
 	double timing;
@@ -267,7 +266,5 @@ int main(int argc, char **argv)
 	FPRINTF(stderr, "Computation took (in ms)\n");
 	FPRINTF(stdout, "%2.2f\n", timing/1000);
 
-	closeThreads();
-
 	return 0;
 }

examples/spmv/spmv_opencl.cl

@@ -14,8 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include "intrinsics.h"
-
 __kernel void spmv(unsigned nnz, unsigned nrow,
                    __global float* nzval, __global unsigned* colind,
                    __global unsigned* rowptr, unsigned firstentry,

src/core/perfmodel/perfmodel_bus.c

@@ -41,7 +41,7 @@
 #include <windows.h>
 #endif
 
-#define SIZE	(32*1024*sizeof(char))
+#define SIZE	(32*1024*1024*sizeof(char))
 #define NITER	128
 
 #define MAXCPUS	32

tools/starpu_machine_display.c

@@ -72,7 +72,6 @@ static void display_all_combined_workers(void)
 
 int main(int argc, char **argv)
 {
-	simInitLibrary();
 	starpu_init(NULL);
 
 	unsigned ncpu = starpu_cpu_worker_get_count();
@@ -94,7 +93,5 @@ int main(int argc, char **argv)
 
 	starpu_shutdown();
 
-	closeThreads();
-
 	return 0;
 }