Browse Source

Add missing options gpu-memdiff and gpu-reorder to write config function.

Con Kolivas 14 years ago
parent
commit
55b386a3fc
2 changed files with 9 additions and 1 deletions
  1. 1 0
      NEWS
  2. 8 1
      main.c

+ 1 - 0
NEWS

@@ -4,6 +4,7 @@ NOTE - The GPU Device reordering in 2.2.0 by default was considered a bad idea
 so the original GPU ordering is used by default again unless reordering is
 so the original GPU ordering is used by default again unless reordering is
 explicitly requested.
 explicitly requested.
 
 
+- Add missing options to write config function.
 - Add a --gpu-reorder option to only reorder devices according to PCI Bus ID
 - Add a --gpu-reorder option to only reorder devices according to PCI Bus ID
 when requested.
 when requested.
 - Fix for midstate support being broken on pools that supported no-midstate
 - Fix for midstate support being broken on pools that supported no-midstate

+ 8 - 1
main.c

@@ -3169,6 +3169,9 @@ void write_config(FILE *fcfg)
 		fputs("\",\n\"gpu-memclock\" : \"", fcfg);
 		fputs("\",\n\"gpu-memclock\" : \"", fcfg);
 		for(i = 0; i < nDevs; i++)
 		for(i = 0; i < nDevs; i++)
 			fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].gpu_memclock);
 			fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].gpu_memclock);
+		fputs("\",\n\"gpu-memdiff\" : \"", fcfg);
+		for(i = 0; i < nDevs; i++)
+			fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].gpu_memdiff);
 		fputs("\",\n\"gpu-powertune\" : \"", fcfg);
 		fputs("\",\n\"gpu-powertune\" : \"", fcfg);
 		for(i = 0; i < nDevs; i++)
 		for(i = 0; i < nDevs; i++)
 			fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].gpu_powertune);
 			fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].gpu_powertune);
@@ -3190,6 +3193,10 @@ void write_config(FILE *fcfg)
 		fputs(",\n", fcfg);
 		fputs(",\n", fcfg);
 #endif
 #endif
 	}
 	}
+#ifdef HAVE_ADL
+	if (opt_reorder)
+		fprintf(fcfg, ",\n\"gpu-reorder\" : true");
+#endif
 #ifdef WANT_CPUMINE
 #ifdef WANT_CPUMINE
 	fprintf(fcfg, "\n\"algo\" : \"%s\"", algo_names[opt_algo]);
 	fprintf(fcfg, "\n\"algo\" : \"%s\"", algo_names[opt_algo]);
 #endif
 #endif
@@ -3246,7 +3253,7 @@ void write_config(FILE *fcfg)
 		if (!gpus[i].enabled)
 		if (!gpus[i].enabled)
 			break;
 			break;
 	if (i < nDevs)
 	if (i < nDevs)
-		for(i = 0; i < nDevs; i++)
+		for (i = 0; i < nDevs; i++)
 			if (gpus[i].enabled)
 			if (gpus[i].enabled)
 				fprintf(fcfg, ",\n\"device\" : \"%d\"", i);
 				fprintf(fcfg, ",\n\"device\" : \"%d\"", i);
 	if (strcmp(opt_api_description, PACKAGE_STRING) != 0)
 	if (strcmp(opt_api_description, PACKAGE_STRING) != 0)