Selaa lähdekoodia

Fix spurious NUMA benchmarking

When CUDA and OpenCL are disabled, we were checking for the presence of
the affinity file, but not writing it.
Samuel Thibault 5 vuotta sitten
vanhempi
commit
b17c6e8860
1 muutettua tiedostoa jossa 6 lisäystä ja 5 poistoa
  1. 6 5
      src/core/perfmodel/perfmodel_bus.c

+ 6 - 5
src/core/perfmodel/perfmodel_bus.c

@@ -871,9 +871,9 @@ static void get_affinity_path(char *path, size_t maxlen)
 
 #ifndef STARPU_SIMGRID
 
+#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL)
 static void load_bus_affinity_file_content(void)
 {
-#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL)
 	FILE *f;
 	int locked;
 
@@ -941,9 +941,8 @@ static void load_bus_affinity_file_content(void)
 		_starpu_frdunlock(f);
 
 	fclose(f);
-#endif /* !(STARPU_USE_CUDA_ || STARPU_USE_OPENCL */
-
 }
+#endif /* !(STARPU_USE_CUDA_ || STARPU_USE_OPENCL */
 
 #ifndef STARPU_SIMGRID
 static void write_bus_affinity_file_content(void)
@@ -1041,10 +1040,10 @@ static void generate_bus_affinity_file(void)
 	write_bus_affinity_file_content();
 }
 
+#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL)
 static int check_bus_affinity_file(void)
 {
 	int ret = 1;
-#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL)
 	FILE *f;
 	int locked;
 	unsigned dummy;
@@ -1068,12 +1067,13 @@ static int check_bus_affinity_file(void)
 		_starpu_frdunlock(f);
 
 	fclose(f);
-#endif
 	return ret == 1;
 }
+#endif
 
 static void load_bus_affinity_file(void)
 {
+#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL)
 	int exist, check = 1;
 
 	char path[PATH_LENGTH];
@@ -1096,6 +1096,7 @@ static void load_bus_affinity_file(void)
 	}
 
 	load_bus_affinity_file_content();
+#endif
 }
 
 #ifdef STARPU_USE_CUDA