Add support for the CUDA visual profiler (bug #274095).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 176 insertions, 6 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 29966b3ea008..1851279cd425 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.5 2009/05/16 15:46:35 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.6 2009/06/19 23:57:06 spock Exp $
+
+*nvidia-cuda-toolkit-2.2-r1 (19 Jun 2009)
+
+  19 Jun 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2-r1.ebuild,
+  +files/nvidia-cuda-toolkit-2.2-enum_fix.patch, metadata.xml:
+  Add support for the CUDA visual profiler (bug #274095).
 
 *nvidia-cuda-toolkit-2.2 (16 May 2009)
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index f016da660750..b8a0bfbf2f8b 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX nvidia-cuda-toolkit-2.2-enum_fix.patch 1901 RMD160 74aadb45017c94404d6379a0f94b62db38d74656 SHA1 5b79051ddb2701c80331b64d376e6c106c38def6 SHA256 a1917977a94f0439ca3e28be0eb41b9e5c0ca9c03f3a22dc91d6bfdca253b258
 DIST NVIDIA_CUDA_Toolkit_2.0_suse10.3_x86.run 18966963 RMD160 934922578b3320e2cacf4e08a3a51cdbea87be21 SHA1 2e783ed52c73e76655bba54fc83df8b55d6450ae SHA256 fbf3cddc6a7039b853b4c8eb89b2aeb5eb3430f44d95e2e1ae382f78ae90c07e
 DIST NVIDIA_CUDA_Toolkit_2.0_suse10.3_x86_64.run 20245140 RMD160 134b76adc0645568bd7484c085539dfb53e95d89 SHA1 60d8348366d547ad18e44119440d0582de6440d0 SHA256 7ff2685e32e54351a4556d65fc2a2e097e08901614b6763d14ac31824d975bb6
 DIST cudatoolkit_2.1_linux32_suse11.0.run 21309180 RMD160 d026b0ecbca2f8b53d2d69b53b8548e1a5a0d666 SHA1 2df0fdd256ea1dd42f7b4f455a13bd60cc21a00a SHA256 c13b3ba9628c888228c9b841d4944103de972f19ca7cf26a75d66e48632323cf
@@ -9,13 +10,14 @@ DIST cudatoolkit_2.2_linux_32_suse11.1.run 28234843 RMD160 50cd85effc3188ee83622
 DIST cudatoolkit_2.2_linux_64_suse11.1.run 29640032 RMD160 8288a864304757847e5ec72445955c4b8890563d SHA1 c30bd24e4ef81e8c4369e38b2910e9de0afe9fd3 SHA256 3c87763084fef5e5854041b46420e71946136e07d5e4fa17721e1b4a83ade965
 EBUILD nvidia-cuda-toolkit-2.0.ebuild 1615 RMD160 b61ecb10eaae317d72e63b961f59903c7f9f12c2 SHA1 8a4f1729d0d54b64a653206b483c67ccdbfcfad6 SHA256 e211a0908ad6721867f59fa95b96d950a21738869fcfd6e43ee72c9cedc6e327
 EBUILD nvidia-cuda-toolkit-2.1.ebuild 1708 RMD160 310a568cf25b0fd171f55c5b9a7a5c32eb5ad994 SHA1 ad205269eec4d4a49e4343dc95139e89b35384d9 SHA256 faca233fb1464c5ce6053a4fd44af657215189d7a0ac4e728884bc2b8f8dede1
+EBUILD nvidia-cuda-toolkit-2.2-r1.ebuild 2452 RMD160 76054c24bddd6cb2be053f6d6b72dbeff0c61eb2 SHA1 020c10b54a80408cde72e9608fc08630429fa203 SHA256 f423c48c40d46fb95f9ae3d8bc45773e3761482c03a5674b892345c6b03d4451
 EBUILD nvidia-cuda-toolkit-2.2.ebuild 1741 RMD160 cb7a54b18f3480e9d6851f816befa0a489e81e33 SHA1 f2e214414c3b98053c9b4157c4ba9f0e62821f7c SHA256 a7565064e53b9cb18aa15bad3a189ece913fafdd170a2f05353650b934b8887b
-MISC ChangeLog 1107 RMD160 ae9d5a8b43273ed64f4042fd8afd2c10b8398899 SHA1 c6d7282a005c46764a55f8d583582a395b835f1f SHA256 53cd457c7d9b517a183ce111afdd0f9f1d1630fc0395378df73dd4de766736a5
-MISC metadata.xml 260 RMD160 7c8f2391a156380ab813494ac3d3db92386fc03b SHA1 631f6ea758b913f6dabd59b83bc8a5f053274f50 SHA256 4e471cd253b0e2e3c1900f0dd3383623080ca9ad9b6e116dd88bac46224681ac
+MISC ChangeLog 1364 RMD160 38dec7d9a3d1ba2149984d2644eca351b0c50bdb SHA1 a1c0763666fed91aa1a09f58e8c06e34543ddb4e SHA256 88e7233c3eea3ac2e8d58d975338ca5680dc25a67b87c7304af8896ff37518ca
+MISC metadata.xml 355 RMD160 61a9a4dc51bce1060798e97b65a0994791f18536 SHA1 abf0f34bfed6dd1885ea7455d278c1a51a8445fa SHA256 7156b57a062096801a6610f46f0b7acdc2f65e5bf9b283a323e81b184edfb4f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoO370ACgkQchej4aZK9/cCiQCeP1DYbMr14RAHx/s3w712bC9V
-M8IAn0EKKyZNh6VIsvDVQ7y/8KzR67rj
-=LzVe
+iEYEARECAAYFAko8JYUACgkQchej4aZK9/eGZACcCztImMMfPRlxw9AorvoZvFOM
+AiQAn0/QEvPuZcnLkvVLgNltH5KFLvf/
+=QooY
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch
new file mode 100644
index 000000000000..21556729fb9a
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-2.2-enum_fix.patch
@@ -0,0 +1,42 @@
+diff -Naurp cudatoolkit_orig/include/cuda.h cudatoolkit/include/cuda.h
+--- cudatoolkit_orig/include/cuda.h	2009-04-13 10:39:12.000000000 +0200
++++ cudatoolkit/include/cuda.h	2009-05-09 17:28:25.000000000 +0200
+@@ -86,7 +86,7 @@ typedef enum CUctx_flags_enum {
+     CU_CTX_SCHED_MASK  = 0x3,
+     CU_CTX_BLOCKING_SYNC = 4,   ///< Use blocking synchronization
+     CU_CTX_MAP_HOST = 8,        ///< Support mapped pinned allocations
+-    CU_CTX_FLAGS_MASK  = 0xf,
++    CU_CTX_FLAGS_MASK  = 0xf
+ } CUctx_flags;
+ 
+ /**
+@@ -94,7 +94,7 @@ typedef enum CUctx_flags_enum {
+  */
+ typedef enum CUevent_flags_enum {
+     CU_EVENT_DEFAULT       = 0, ///< Default event flag
+-    CU_EVENT_BLOCKING_SYNC = 1, ///< Event uses blocking synchronization
++    CU_EVENT_BLOCKING_SYNC = 1  ///< Event uses blocking synchronization
+ } CUevent_flags;
+ 
+ /**
+@@ -117,7 +117,7 @@ typedef enum CUarray_format_enum {
+ typedef enum CUaddress_mode_enum {
+     CU_TR_ADDRESS_MODE_WRAP = 0,    ///< Wrapping address mode
+     CU_TR_ADDRESS_MODE_CLAMP = 1,   ///< Clamp to edge address mode
+-    CU_TR_ADDRESS_MODE_MIRROR = 2,  ///< Mirror address mode
++    CU_TR_ADDRESS_MODE_MIRROR = 2   ///< Mirror address mode
+ } CUaddress_mode;
+ 
+ /**
+diff -Naurp cudatoolkit_orig/include/driver_types.h cudatoolkit/include/driver_types.h
+--- cudatoolkit_orig/include/driver_types.h	2009-04-13 10:39:06.000000000 +0200
++++ cudatoolkit/include/driver_types.h	2009-05-09 17:31:17.000000000 +0200
+@@ -140,7 +140,7 @@ enum cudaChannelFormatKind
+   cudaChannelFormatKindSigned           =   0,      ///< Signed channel format
+   cudaChannelFormatKindUnsigned         =   1,      ///< Unsigned channel format
+   cudaChannelFormatKindFloat            =   2,      ///< Float channel format
+-  cudaChannelFormatKindNone             =   3,      ///< No channel format
++  cudaChannelFormatKindNone             =   3       ///< No channel format
+ };
+ 
+ /**
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 2c3ddaaa0f8e..54cc6b7049e4 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -6,5 +6,10 @@
 		<email>spock@gentoo.org</email>
 		<name>Michał Januszewski</name>
 	</maintainer>
+	<use>
+		<flag name='profiler'>
+			Installs the NVIDIA CUDA visual profiler.
+		</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild
new file mode 100644
index 000000000000..4ae1f0c3c997
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild,v 1.1 2009/06/19 23:57:06 spock Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//./_}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${CUDA_V}/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${PV}_linux_64_suse11.1.run )
+	x86? ( ${BASE_URI}/cudatoolkit_${PV}_linux_32_suse11.1.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc profiler"
+
+DEPEND="!dev-util/nvidia-cuda-profiler"
+RDEPEND=""
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_makeself
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-enum_fix.patch"
+}
+
+src_install() {
+	local DEST=/opt/cuda
+	export CONF_LIBDIR_OVERRIDE="lib"
+
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${DEST}
+	dobin bin/*
+	dolib lib/*
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+
+	# doman does not respect DESTTREE
+	insinto ${DEST}/man/man1
+	doins man/man1/*
+	insinto ${DEST}/man/man3
+	doins man/man3/*
+	prepman ${DEST}
+
+	insinto ${DEST}/include
+	doins include/*.h
+	insinto ${DEST}/include/crt
+	doins include/crt/*.h
+
+	insinto ${DEST}/src
+	doins src/*
+
+	into ${DEST}/open64
+	dobin open64/bin/*
+	libopts -m0755
+	dolib open64/lib/*
+
+	if use doc ; then
+		insinto ${DEST}/doc
+		doins doc/*
+	fi
+
+	cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/lib
+MANPATH=${DEST}/man
+EOF
+	newenvd "${T}/env" 99cuda
+
+	if use profiler; then
+		# Visual profiler needs qt4.
+		# TODO: use system libraries on x86 systems.
+		into ${DEST}/cudaprof
+		dobin cudaprof/bin/{cudaprof,assistant}
+		insinto ${DEST}/cudaprof/bin
+		doins cudaprof/bin/*.so*
+		insinto ${DEST}/cudaprof/bin/sqldrivers
+		doins cudaprof/bin/sqldrivers/*
+
+		if use doc; then
+			insinto ${DEST}/cudaprof/doc
+			doins cudaprof/doc/*
+			insinto ${DEST}/cudaprof/projects
+			doins cudaprof/projects/*
+		fi
+
+		cat > "${T}/env" << EOF
+PATH=${DEST}/cudaprof/bin
+ROOTPATH=${DEST}/cudaprof/bin
+LDPATH=${DEST}/cudaprof/bin
+EOF
+		newenvd "${T}/env" 99cudaprof
+	fi
+}
+
+pkg_postinst() {
+	elog "If you want to natively run the code generated by CUDA, you will need"
+	elog ">=x11-drivers/nvidia-drivers-185.18.08."
+	elog ""
+	elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}