Fix opencl usage and example compilation on macOS (#185)

* Fix opencl usage on macOS * Don't skip examples on macOS * Install opencl-headers * Fix
vlang · Oct 25, 2023 · 0a5f65b · 0a5f65b
1 parent 7d5ee50
commit 0a5f65b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,12 +105,13 @@ jobs:
           brew install open-mpi
           brew install openblas
           brew install lapack
+          brew install opencl-headers
 
       - name: Move VSL source code to V Modules
         run: mv ./vsl ~/.vmodules
 
       - name: Execute Tests using Pure V Backend
-        run: ~/.vmodules/vsl/bin/test --skip-examples
+        run: ~/.vmodules/vsl/bin/test
 
       - name: Execute Tests using Pure V Backend with Pure C Blas
-        run: ~/.vmodules/vsl/bin/test --use-cblas --skip-examples
+        run: ~/.vmodules/vsl/bin/test --use-cblas
diff --git a/bin/test b/bin/test
@@ -65,7 +65,7 @@ if [[ -z "${skip_examples}" ]]; then
             continue
         fi
         echo "Compiling ${file}"
-        v ${flags} -o "${file}.o" "${file}"
+        v ${flags} -d dlopencl -o "${file}.o" "${file}"
         echo "${file}.o created"
         echo "Removing ${file}.o"
         rm -f "${file}.o"

diff --git a/vcl/internal/dl/path_darwin.c.v → vcl/internal/dl/paths_macos.c.v b/vcl/internal/dl/path_darwin.c.v → vcl/internal/dl/paths_macos.c.v
diff --git a/vcl/vcl.h b/vcl/vcl.h
@@ -1,7 +1,7 @@
 #ifndef VCL_OPENCL_H
 #define VCL_OPENCL_H
 
-#ifdef DARWIN
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #else
 #include <CL/cl.h>