Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix opencl usage and example compilation on macOS #185

Merged
merged 4 commits into from
Oct 25, 2023
+5 −4
Merged

Fix opencl usage and example compilation on macOS #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fa4529
Fix opencl usage on macOS
ttytm Oct 24, 2023
63cb5f8
Don't skip examples on macOS
ttytm Oct 24, 2023
8e31a0f
Install opencl-headers
ttytm Oct 24, 2023
ec19b28
Fix
ttytm Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion bin/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 vcl/internal/dl/path_darwin.c.v → vcl/internal/dl/paths_macos.c.v
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion vcl/vcl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading