conv2d direct always on for opencl

Author: daniandtheweb

CMakeLists.txt

@@ -58,6 +58,7 @@ if (SD_OPENCL)
     message("-- Use OpenCL as backend stable-diffusion")
     set(GGML_OPENCL ON)
     add_definitions(-DSD_USE_OPENCL)
+    add_definitions(-DSD_USE_CONV2D_DIRECT)
 endif ()
 
 if (SD_HIPBLAS)

ggml_extend.hpp

@@ -1510,9 +1510,12 @@ class Conv2d : public UnaryBlock {
         if (bias) {
             b = params["bias"];
         }
+        #if defined(SD_USE_OPENCL)
+            direct = true
+        #endif
         if (direct) {
             #if defined(SD_USE_CONV2D_DIRECT)
-                #if defined(SD_USE_CUDA) || defined(SD_USE_SYCL) || defined(SD_USE_METAL) || defined(SD_USE_OPENCL)
+                #if defined(SD_USE_CUDA) || defined(SD_USE_SYCL) || defined(SD_USE_METAL)
                     return ggml_nn_conv_2d(ctx, x, w, b, stride.second, stride.first, padding.second, padding.first, dilation.second, dilation.first);
                 #else
                     return ggml_nn_conv_2d_direct(ctx, x, w, b, stride.second, stride.first, padding.second, padding.first, dilation.second, dilation.first);