diff --git a/bin/test b/bin/test index 881eecf8e..07dbf064a 100755 --- a/bin/test +++ b/bin/test @@ -28,7 +28,7 @@ flags="" if [[ -n "${use_cblas}" ]]; then echo "Running tests using Open BLAS" - flags="${flags} -d cblas" + flags="${flags} -d vsl_vlas_cblas" fi if [[ -n "${use_autofree}" ]]; then @@ -65,7 +65,7 @@ if [[ -z "${skip_examples}" ]]; then continue fi echo "Compiling ${file}" - v ${flags} -d dlopencl -o "${file}.o" "${file}" + v ${flags} -d vsl_vcl_dlopencl -o "${file}.o" "${file}" echo "${file}.o created" echo "Removing ${file}.o" rm -f "${file}.o" diff --git a/vcl/README.md b/vcl/README.md index b18deea42..1866c0089 100644 --- a/vcl/README.md +++ b/vcl/README.md @@ -59,7 +59,7 @@ cp -r /tmp/OpenCL-Headers/CL ~/.vmodules/vcl/CL ## Loading OpenCL dynamically By default VCL uses OpenCL loading the library statically. If you want to use OpenCL -dynamically, you can use the `-d dlopencl` flag. +dynamically, you can use the `-d vsl_vcl_dlopencl` flag. By default it will look for the OpenCL library in the system path and all the known locations for OpenCL libraries (like `/usr/lib` and `/usr/local/lib`) and load the first diff --git a/vcl/_cflags_d_dlopencl.c.v b/vcl/_cflags_d_vsl_vcl_dlopencl.c.v similarity index 100% rename from vcl/_cflags_d_dlopencl.c.v rename to vcl/_cflags_d_vsl_vcl_dlopencl.c.v diff --git a/vcl/_cflags_notd_dlopencl.c.v b/vcl/_cflags_notd_vsl_vcl_dlopencl.c.v similarity index 100% rename from vcl/_cflags_notd_dlopencl.c.v rename to vcl/_cflags_notd_vsl_vcl_dlopencl.c.v diff --git a/vcl/_cfun_d_dlopencl.c.v b/vcl/_cfun_d_vsl_vcl_dlopencl.c.v similarity index 100% rename from vcl/_cfun_d_dlopencl.c.v rename to vcl/_cfun_d_vsl_vcl_dlopencl.c.v diff --git a/vcl/_cfun_notd_dlopencl.c.v b/vcl/_cfun_notd_vsl_vcl_dlopencl.c.v similarity index 100% rename from vcl/_cfun_notd_dlopencl.c.v rename to vcl/_cfun_notd_vsl_vcl_dlopencl.c.v diff --git a/vlas/README.md b/vlas/README.md index 20133d5de..1677eb1c8 100644 --- a/vlas/README.md +++ b/vlas/README.md @@ -2,17 +2,17 @@ This package implements BLAS and LAPACKE functions. It provides different backends: -| Backend | Description | Status | Compilation Flags | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | ----------------- | -| VLAS | Pure V implementation | WIP | `-d vlas` | -| OpenBLAS | OpenBLAS is an optimized BLAS library based on . Check the section [OpenBLAS Backend](#openblas-backend) for more information. | Working | `-d cblas` | -| LAPACKE | LAPACKE is a C interface to the LAPACK linear algebra routines | Working | `-d lapacke` | +| Backend | Description | Status | Compilation Flags | +| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | --------------------- | +| VLAS | Pure V implementation | WIP | `NONE` | +| OpenBLAS | OpenBLAS is an optimized BLAS library based on . Check the section [OpenBLAS Backend](#openblas-backend) for more information. | Working | `-d vsl_vlas_cblas` | +| LAPACKE | LAPACKE is a C interface to the LAPACK linear algebra routines | Working | `-d vsl_vlas_lapacke` | Therefore, its routines are a little more _lower level_ than the ones in the package `vsl.la`. ## OpenBLAS Backend -Use the flag `-d cblas` to use the OpenBLAS backend. +Use the flag `-d vsl_vlas_cblas` to use the OpenBLAS backend. ### Install dependencies @@ -30,17 +30,17 @@ sudo apt-get install -y --no-install-recommends \ #### Arch Linux/Manjaro GNU Linux The best way of installing OpenBlas is using -[openblas-lapack](https://aur.archlinux.org/packages/openblas-lapack/). +[lapack-openblas](https://aur.archlinux.org/packages/lapack-openblas/). ```sh -yay -S openblas-lapack +yay -S lapack-openblas ``` or ```sh -git clone https://aur.archlinux.org/openblas-lapack.git /tmp/openblas-lapack -cd /tmp/openblas-lapack +git clone https://aur.archlinux.org/lapack-openblas.git /tmp/lapack-openblas +cd /tmp/lapack-openblas makepkg -si ``` @@ -52,7 +52,7 @@ brew install openblas ## LAPACKE Backend -Use the flag `-d lapacke` to use the LAPACKE backend (enabled by default for now). +Use the flag `-d vsl_vlas_lapacke` to use the LAPACKE backend (enabled by default for now). ### Install dependencies @@ -68,16 +68,16 @@ sudo apt-get install -y --no-install-recommends \ #### Arch Linux/Manjaro GNU Linux The best way of installing LAPACKE is using -[openblas-lapack](https://aur.archlinux.org/packages/openblas-lapack/). +[lapack-openblas](https://aur.archlinux.org/packages/lapack-openblas/). ```sh -yay -S openblas-lapack +yay -S lapack-openblas ``` or ```sh -git clone https://aur.archlinux.org/openblas-lapack.git /tmp/openblas-lapack -cd /tmp/openblas-lapack +git clone https://aur.archlinux.org/lapack-openblas.git /tmp/lapack-openblas +cd /tmp/lapack-openblas makepkg -si ``` diff --git a/vlas/cflags_d_cblas.v b/vlas/cflags_d_vsl_vlas_cblas.v similarity index 100% rename from vlas/cflags_d_cblas.v rename to vlas/cflags_d_vsl_vlas_cblas.v diff --git a/vlas/cflags_notd_cblas.v b/vlas/cflags_notd_vsl_vlas_cblas.v similarity index 100% rename from vlas/cflags_notd_cblas.v rename to vlas/cflags_notd_vsl_vlas_cblas.v diff --git a/vlas/oblas_d_cblas.v b/vlas/oblas_d_vsl_vlas_cblas.v similarity index 100% rename from vlas/oblas_d_cblas.v rename to vlas/oblas_d_vsl_vlas_cblas.v diff --git a/vlas/oblas_notd_cblas.v b/vlas/oblas_notd_vsl_vlas_cblas.v similarity index 100% rename from vlas/oblas_notd_cblas.v rename to vlas/oblas_notd_vsl_vlas_cblas.v