Ver código fonte

OpenCL driver: minor fixes

Nathalie Furmento 15 anos atrás
pai
commit
439124846b

+ 2 - 2
src/drivers/opencl/driver_opencl_utils.c

@@ -53,7 +53,7 @@ int _starpu_opencl_locate_file(char *source_file_name, char *located_file_name)
         if (access(located_file_name, R_OK) == 0) return EXIT_SUCCESS;
         if (access(located_file_name, R_OK) == 0) return EXIT_SUCCESS;
 
 
         strcpy(located_file_name, "");
         strcpy(located_file_name, "");
-        OPENCL_ERROR("Cannot locate file <%s>\n", source_file_name);
+        _STARPU_OPENCL_ERROR("Cannot locate file <%s>\n", source_file_name);
         return EXIT_FAILURE;
         return EXIT_FAILURE;
 }
 }
 
 
@@ -165,7 +165,7 @@ int starpu_opencl_load_opencl_from_file(char *source_file_name, struct starpu_op
         // Load the compute program from disk into a cstring buffer
         // Load the compute program from disk into a cstring buffer
         char *opencl_codelet_source = _starpu_opencl_load_program_source(located_file_name);
         char *opencl_codelet_source = _starpu_opencl_load_program_source(located_file_name);
         if(!opencl_codelet_source)
         if(!opencl_codelet_source)
-                OPENCL_ERROR("Failed to load compute program from file <%s>!\n", located_file_name);
+                _STARPU_OPENCL_ERROR("Failed to load compute program from file <%s>!\n", located_file_name);
 
 
         return starpu_opencl_load_opencl_from_string(opencl_codelet_source, codelet);
         return starpu_opencl_load_opencl_from_string(opencl_codelet_source, codelet);
 }
 }

+ 1 - 4
src/drivers/opencl/driver_opencl_utils.h

@@ -27,7 +27,7 @@
 
 
 #define _STARPU_OPENCL_DISP(fmt, args ...) fprintf(stderr, "[starpu][%s] " fmt ,__func__ ,##args)
 #define _STARPU_OPENCL_DISP(fmt, args ...) fprintf(stderr, "[starpu][%s] " fmt ,__func__ ,##args)
 
 
-#define OPENCL_ERROR(fmt, args ...)                                                   \
+#define _STARPU_OPENCL_ERROR(fmt, args ...)                                                   \
 	do {                                                                          \
 	do {                                                                          \
                 fprintf(stderr, "[starpu][%s] Error: " fmt ,__func__ ,##args); \
                 fprintf(stderr, "[starpu][%s] Error: " fmt ,__func__ ,##args); \
 		assert(0);                                                            \
 		assert(0);                                                            \
@@ -35,7 +35,4 @@
 
 
 #define STARPU_OPENCL_PLATFORM_MAX 4
 #define STARPU_OPENCL_PLATFORM_MAX 4
 
 
-int _starpu_opencl_init_programs(int dev);
-int _starpu_opencl_release_programs(int dev);
-
 #endif /* __STARPU_OPENCL_UTILS_H__ */
 #endif /* __STARPU_OPENCL_UTILS_H__ */