[arrayfire] 62/248: Add unified backend details to using on pages and cmake.in file
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:53:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.
commit 94e8dbfce6994323efc6b462a5247664869c0bbc
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Fri Sep 18 11:33:07 2015 -0400
Add unified backend details to using on pages and cmake.in file
---
ArrayFireConfig.cmake.in | 14 ++++++++------
docs/pages/using_on_linux.md | 23 ++++++++++++++---------
docs/pages/using_on_osx.md | 23 ++++++++++++++---------
docs/pages/using_on_windows.md | 8 ++++----
4 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/ArrayFireConfig.cmake.in b/ArrayFireConfig.cmake.in
index 3bb918d..c34b5a2 100644
--- a/ArrayFireConfig.cmake.in
+++ b/ArrayFireConfig.cmake.in
@@ -9,12 +9,14 @@
#
# ----------------------------------------------------------------------------
#
-# ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found.
-# ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found
-# ArrayFire_CUDA_FOUND - True of the ArrayFire CUDA library has been found.
-# ArrayFire_CUDA_LIBRARIES - Location of ArrayFire's CUDA library, if found
-# ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found.
-# ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found
+# ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found.
+# ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found
+# ArrayFire_CUDA_FOUND - True of the ArrayFire CUDA library has been found.
+# ArrayFire_CUDA_LIBRARIES - Location of ArrayFire's CUDA library, if found
+# ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found.
+# ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found
+# ArrayFire_Unified_FOUND - True of the ArrayFire Unified library has been found.
+# ArrayFire_Unified_LIBRARIES - Location of ArrayFire's Unified library, if found
#
#=============================================================================
# Copyright (c) 2015, ArrayFire
diff --git a/docs/pages/using_on_linux.md b/docs/pages/using_on_linux.md
index 9f50602..4faf083 100644
--- a/docs/pages/using_on_linux.md
+++ b/docs/pages/using_on_linux.md
@@ -77,6 +77,8 @@ directory.
These scripts will automatically find the CUDA, OpenCL, and CPU versions
of ArrayFire and automatically choose the most powerful installed backend
(typically CUDA).
+Following version 3.2, the scripts will also check for the Unified backend of
+ArrayFire.
To use ArrayFire, simply insert the `FIND_PACKAGE` command inside of your
`CMakeLists.txt` file as follows:
@@ -97,16 +99,19 @@ The find script will automatically define several variables including:
If you wish to use a specific backend, the find script also defines these variables:
- ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found.
- ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found
- ArrayFire_CUDA_FOUND - True of the ArrayFire CUDA library has been found.
- ArrayFire_CUDA_LIBRARIES - Location of ArrayFire's CUDA library, if found
- ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found.
- ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found
+ ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found.
+ ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found
+ ArrayFire_CUDA_FOUND - True of the ArrayFire CUDA library has been found.
+ ArrayFire_CUDA_LIBRARIES - Location of ArrayFire's CUDA library, if found
+ ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found.
+ ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found
+ ArrayFire_Unified_FOUND - True of the ArrayFire Unified library has been found.
+ ArrayFire_Unified_LIBRARIES - Location of ArrayFire's Unified library, if found
Therefore, if you wish to target a specific specific backend, switch
-`${ArrayFire_LIBRARIES}` to `${ArrayFire_CPU}` `${ArrayFire_OPENCL}` or
-`${ArrayFire_CUDA}` in the `TARGET_LINK_LIBRARIES` command above.
+`${ArrayFire_LIBRARIES}` to `${ArrayFire_CPU}` `${ArrayFire_OPENCL}`
+`${ArrayFire_CUDA}` or `${ArrayFire_Unified}` in the `TARGET_LINK_LIBRARIES`
+command above.
Finally, if you have installed ArrayFire to a non-standard location, CMake can still help
you out. When you execute CMake specify the path to the `ArrayFireConfig*` files that
@@ -128,7 +133,7 @@ instructions.
Then, in your linker line specify the path to ArrayFire using the `-L` option
(typically `-L/usr/lib` or `-L/usr/local/lib` and the specific ArrayFire backend
you wish to use with the `-l` option (i.e. `-lafcpu`, `-lafopencl` or `-lafcuda`
-for the CPU, OpenCL and CUDA backends repsectively).
+`-laf` for the CPU, OpenCL, CUDA and Unified backends repsectively).
Here is a minimial example MakeFile which uses ArrayFire's CPU backend:
diff --git a/docs/pages/using_on_osx.md b/docs/pages/using_on_osx.md
index d491231..c6caeb9 100644
--- a/docs/pages/using_on_osx.md
+++ b/docs/pages/using_on_osx.md
@@ -25,6 +25,8 @@ directory.
These scripts will automatically find the CUDA, OpenCL, and CPU versions
of ArrayFire and automatically choose the most powerful installed backend
(typically CUDA).
+Following version 3.2, the scripts will also check for the Unified backend of
+ArrayFire.
To use ArrayFire, simply insert the `FIND_PACKAGE` command inside of your
`CMakeLists.txt` file as follows:
@@ -45,16 +47,19 @@ The find script will automatically define several variables including:
If you wish to use a specific backend, the find script also defines these variables:
- ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found.
- ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found
- ArrayFire_CUDA_FOUND - True of the ArrayFire CUDA library has been found.
- ArrayFire_CUDA_LIBRARIES - Location of ArrayFire's CUDA library, if found
- ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found.
- ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found
+ ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found.
+ ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found
+ ArrayFire_CUDA_FOUND - True of the ArrayFire CUDA library has been found.
+ ArrayFire_CUDA_LIBRARIES - Location of ArrayFire's CUDA library, if found
+ ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found.
+ ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found
+ ArrayFire_Unified_FOUND - True of the ArrayFire Unified library has been found.
+ ArrayFire_Unified_LIBRARIES - Location of ArrayFire's Unified library, if found
Therefore, if you wish to target a specific specific backend, switch
-`${ArrayFire_LIBRARIES}` to `${ArrayFire_CPU}` `${ArrayFire_OPENCL}` or
-`${ArrayFire_CUDA}` in the `TARGET_LINK_LIBRARIES` command above.
+`${ArrayFire_LIBRARIES}` to `${ArrayFire_CPU}` `${ArrayFire_OPENCL}`
+`${ArrayFire_CUDA}` or `${ArrayFire_Unified}` in the `TARGET_LINK_LIBRARIES`
+command above.
Finally, if you have installed ArrayFire to a non-standard location, CMake can still help
you out. When you execute CMake specify the path to the `ArrayFireConfig*` files that
@@ -76,7 +81,7 @@ instructions.
Then, in your linker line specify the path to ArrayFire using the `-L` option
(typically `-L/usr/lib` or `-L/usr/local/lib` and the specific ArrayFire backend
you wish to use with the `-l` option (i.e. `-lafcpu`, `-lafopencl` or `-lafcuda`
-for the CPU, OpenCL and CUDA backends repsectively).
+`-laf` for the CPU, OpenCL, CUDA and Unified backends repsectively).
Here is a minimial example MakeFile which uses ArrayFire's CPU backend:
diff --git a/docs/pages/using_on_windows.md b/docs/pages/using_on_windows.md
index aa4aeff..491e493 100644
--- a/docs/pages/using_on_windows.md
+++ b/docs/pages/using_on_windows.md
@@ -53,8 +53,8 @@ To allow DLL detection for all users, it needs to be added to the system
`AF_PATH/examples/helloworld/helloworld.sln`.
2. Build and run the `helloworld` example. Be sure to, select the
platform/configuration of your choice using the platform drop-down
- (the options are CPU, CUDA, and OpenCL) and Solution Configuration drop down
- (options of Release and Debug) menus.
+ (the options are CPU, CUDA, OpenCL, and Unified) and Solution Configuration
+ drop down (options of Release and Debug) menus.
3. Run the `helloworld` example
## Step 3: Creating your own Visual Studio Project
@@ -96,10 +96,10 @@ different:
_Project Properties -> Build Events -> Post Build Events_
dialog:
- ```
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo copy "$(CUDA_PATH)\nvvm\bin\nvvm64*.dll" "$(OutDir)"
copy "$(CUDA_PATH)\nvvm\bin\nvvm64*.dll" "$(OutDir)"
- ```
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4. Ensure that you use x64 based configurations.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list