[arrayfire] 140/248: Add unified backend binaries to the OSX installer
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:17 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 eb0f5b66e200eb442011f7c0a20015992baa7872
Author: Umar Arshad <umar at arrayfire.com>
Date: Tue Oct 20 13:08:16 2015 -0400
Add unified backend binaries to the OSX installer
---
CMakeModules/osx_install/OSXInstaller.cmake | 16 +++++++++----
CMakeModules/osx_install/distribution.dist | 35 ++++++++++++++++++++++++-----
2 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/CMakeModules/osx_install/OSXInstaller.cmake b/CMakeModules/osx_install/OSXInstaller.cmake
index 4a1fc97..dc3a8b2 100644
--- a/CMakeModules/osx_install/OSXInstaller.cmake
+++ b/CMakeModules/osx_install/OSXInstaller.cmake
@@ -76,7 +76,7 @@ PKG_BUILD( PKG_NAME ArrayFireCPU
SCRIPT_DIR ${OSX_INSTALL_DIR}/cpu_scripts
IDENTIFIER com.arrayfire.pkg.arrayfire.cpu.lib
PATH_TO_FILES package/lib
- FILTERS opencl cuda)
+ FILTERS opencl cuda unified)
PKG_BUILD( PKG_NAME ArrayFireCUDA
DEPENDS afcuda
@@ -85,7 +85,7 @@ PKG_BUILD( PKG_NAME ArrayFireCUDA
SCRIPT_DIR ${OSX_INSTALL_DIR}/cuda_scripts
IDENTIFIER com.arrayfire.pkg.arrayfire.cuda.lib
PATH_TO_FILES package/lib
- FILTERS cpu opencl)
+ FILTERS cpu opencl unified)
PKG_BUILD( PKG_NAME ArrayFireOPENCL
DEPENDS afopencl
@@ -93,7 +93,15 @@ PKG_BUILD( PKG_NAME ArrayFireOPENCL
INSTALL_LOCATION /usr/local/lib
IDENTIFIER com.arrayfire.pkg.arrayfire.opencl.lib
PATH_TO_FILES package/lib
- FILTERS cpu cuda)
+ FILTERS cpu cuda unified)
+
+PKG_BUILD( PKG_NAME ArrayFireUNIFIED
+ DEPENDS af
+ TARGETS unified_package
+ INSTALL_LOCATION /usr/local/lib
+ IDENTIFIER com.arrayfire.pkg.arrayfire.unified.lib
+ PATH_TO_FILES package/lib
+ FILTERS cpu cuda opencl)
PKG_BUILD( PKG_NAME ArrayFireHeaders
TARGETS header_package
@@ -107,5 +115,5 @@ PKG_BUILD( PKG_NAME ArrayFireExtra
IDENTIFIER com.arrayfire.pkg.arrayfire.extra
PATH_TO_FILES package/share)
-PRODUCT_BUILD(DEPENDS ${cpu_package} ${cuda_package} ${opencl_package} ${header_package} ${extra_package})
+PRODUCT_BUILD(DEPENDS ${cpu_package} ${cuda_package} ${opencl_package} ${unified_package} ${header_package} ${extra_package})
diff --git a/CMakeModules/osx_install/distribution.dist b/CMakeModules/osx_install/distribution.dist
index 6fe9ba0..3dc8237 100644
--- a/CMakeModules/osx_install/distribution.dist
+++ b/CMakeModules/osx_install/distribution.dist
@@ -4,32 +4,55 @@
<welcome file="${WELCOME_FILE_OUT}" />
<readme file="${README_FILE_OUT}" mime-type="test/html" />
<license file="${CMAKE_MODULE_PATH}/../LICENSE" mime-type="test/plain" />
+ <script>
+ function CheckBackendSelected() {
+ return choices.opencl_lib.selected ||
+ choices.cuda_lib.selected ||
+ choices.cpu_lib.selected;
+ }
+ </script>
<pkg-ref id="com.arrayfire.arrayfire.cpu.lib" version="${AF_VERSION}" onConclusion="none">ArrayFireCPU.pkg</pkg-ref>
<pkg-ref id="com.arrayfire.arrayfire.cuda.lib" version="${AF_VERSION}" onConclusion="none">ArrayFireCUDA.pkg</pkg-ref>
<pkg-ref id="com.arrayfire.arrayfire.opencl.lib" version="${AF_VERSION}" onConclusion="none">ArrayFireOPENCL.pkg</pkg-ref>
+ <pkg-ref id="com.arrayfire.arrayfire.unified.lib" version="${AF_VERSION}" onConclusion="none">ArrayFireUNIFIED.pkg</pkg-ref>
<pkg-ref id="com.arrayfire.arrayfire.inc" version="${AF_VERSION}" onConclusion="none">ArrayFireHeaders.pkg</pkg-ref>
<pkg-ref id="com.arrayfire.arrayfire.extra" version="${AF_VERSION}" onConclusion="none">ArrayFireExtra.pkg</pkg-ref>
<options customize="always" require-scripts="false"/>
<choices-outline>
<line choice="libs">
- <line choice="com.arrayfire.arrayfire.cpu.lib"/>
- <line choice="com.arrayfire.arrayfire.cuda.lib"/>
- <line choice="com.arrayfire.arrayfire.opencl.lib"/>
+ <line choice="cpu_lib"/>
+ <line choice="cuda_lib"/>
+ <line choice="opencl_lib"/>
+ <line choice="com.arrayfire.arrayfire.unified.lib"/>
</line>
<line choice="com.arrayfire.arrayfire.inc"/>
<line choice="com.arrayfire.arrayfire.extra"/>
</choices-outline>
<choice id="libs" title="ArrayFire Libraries" visible="true" />
- <choice title="CPU Libraries" description="CPU Libraries" id="com.arrayfire.arrayfire.cpu.lib" visible="true" enabled="true">
+ <choice title="CPU Libraries"
+ description="ArrayFire targeting CPUs."
+ id="cpu_lib" visible="true" enabled="true">
<pkg-ref id="com.arrayfire.arrayfire.cpu.lib"/>
</choice>
- <choice title="CUDA Libraries" description="CUDA Libraries" id="com.arrayfire.arrayfire.cuda.lib" visible="true" enabled="true">
+ <choice title="CUDA Libraries"
+ description="ArrayFire which targets the CUDA platform. This platform allows you to to take advantage of the CUDA enabled GPUs to run ArrayFire code."
+ id="cuda_lib" visible="true" enabled="true">
<pkg-ref id="com.arrayfire.arrayfire.cuda.lib"/>
</choice>
- <choice title="OpenCL Libraries" description="OpenCL Libraries" id="com.arrayfire.arrayfire.opencl.lib" visible="true" enabled="true">
+ <choice title="OpenCL Libraries"
+ description="ArrayFire which targets the OpenCL platform. This platform allows you to use the ArrayFire library which targets OpenCL devices. NOTE: Currently ArrayFire does not support OpenCL for the Intel CPU on Apple."
+ id="opencl_lib" visible="true" enabled="true">
<pkg-ref id="com.arrayfire.arrayfire.opencl.lib"/>
</choice>
+ <choice title="Unified Library"
+ description="This library will allow you to choose the platform(cpu, cuda, opencl) at runtime. NOTE: This option requires the other platforms to work properly"
+ id="com.arrayfire.arrayfire.unified.lib"
+ selected="CheckBackendSelected()"
+ visible="true"
+ enabled="CheckBackendSelected()">
+ <pkg-ref id="com.arrayfire.arrayfire.unified.lib"/>
+ </choice>
<choice title="ArrayFire Headers" description="ArrayFire Headers" id="com.arrayfire.arrayfire.inc" visible="true" enabled="true">
<pkg-ref id="com.arrayfire.arrayfire.inc"/>
</choice>
--
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