[med-svn] [libhmsbeagle] 01/04: Imported Upstream version 2.1.2+20150820

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libhmsbeagle.

commit e2d517b54ca6d84e1f402eb323ed04106c28bebe
Author: Andreas Tille <tille at debian.org>
Date:   Wed Oct 21 18:15:26 2015 +0200

    Imported Upstream version 2.1.2+20150820
---
 libhmsbeagle/GPU/GPUInterfaceCUDA.cpp | 6 +-----
 libhmsbeagle/GPU/kernels/Makefile.am  | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libhmsbeagle/GPU/GPUInterfaceCUDA.cpp b/libhmsbeagle/GPU/GPUInterfaceCUDA.cpp
index a8e6b3d..d64a260 100644
--- a/libhmsbeagle/GPU/GPUInterfaceCUDA.cpp
+++ b/libhmsbeagle/GPU/GPUInterfaceCUDA.cpp
@@ -162,12 +162,8 @@ int GPUInterface::Initialize() {
     // Driver init; CUDA manual: "Currently, the Flags parameter must be 0."
     CUresult error = cuInit(0);
     
-    if (error == CUDA_ERROR_NO_DEVICE) {
+    if (error != CUDA_SUCCESS) {
         return 0;
-    } else if (error != CUDA_SUCCESS) {
-        fprintf(stderr, "CUDA error: \"%s\" from file <%s>, line %i.\n",
-                GetCUDAErrorDescription(error), __FILE__, __LINE__);
-        exit(-1);
     }
     
     int numDevices = 0;
diff --git a/libhmsbeagle/GPU/kernels/Makefile.am b/libhmsbeagle/GPU/kernels/Makefile.am
index 9301495..75e2d90 100644
--- a/libhmsbeagle/GPU/kernels/Makefile.am
+++ b/libhmsbeagle/GPU/kernels/Makefile.am
@@ -22,7 +22,7 @@ BeagleCUDA_kernels.h: Makefile kernels4.cu kernelsX.cu kernelsAll.cu ../GPUImplD
 		$(srcdir)/kernels4.cu $(NVCCFLAGS) -DHAVE_CONFIG_H $(INCLUDE_DIRS)
 	echo "#define KERNELS_STRING_SP_4 \"" | sed 's/$$/\\n\\/' >> BeagleCUDA_kernels.h
 	cat BeagleCUDA_kernels.ptx | sed 's/\"/\\"/g' | sed 's/$$/\\n\\/' >> BeagleCUDA_kernels.h
-	echo "\"" >> BeagleCUDA_kernels.h	
+	echo "\"" >> BeagleCUDA_kernels.h
 #
 #	HERE IS THE LOOP FOR GENERIC KERNELS
 #
@@ -39,17 +39,17 @@ BeagleCUDA_kernels.h: Makefile kernels4.cu kernelsX.cu kernelsAll.cu ../GPUImplD
 # Compile double-precision kernels
 #
 # 	Compile 4-state model
-	$(NVCC) -o BeagleCUDA_kernels.ptx -ptx -arch compute_13 -DCUDA -DSTATE_COUNT=4 -DDOUBLE_PRECISION \
+	$(NVCC) -o BeagleCUDA_kernels.ptx -ptx -DCUDA -DSTATE_COUNT=4 -DDOUBLE_PRECISION \
 		$(srcdir)/kernels4.cu $(NVCCFLAGS) -DHAVE_CONFIG_H $(INCLUDE_DIRS)
 	echo "#define KERNELS_STRING_DP_4 \"" | sed 's/$$/\\n\\/' >> BeagleCUDA_kernels.h
 	cat BeagleCUDA_kernels.ptx | sed 's/\"/\\"/g' | sed 's/$$/\\n\\/' >> BeagleCUDA_kernels.h
-	echo "\"" >> BeagleCUDA_kernels.h	
+	echo "\"" >> BeagleCUDA_kernels.h
 #
 #	HERE IS THE LOOP FOR GENERIC KERNELS
 #
 	for s in $(STATE_COUNT_LIST); do \
 		echo "Making state count = $$s" ; \
-		($(NVCC) -o BeagleCUDA_kernels.ptx -ptx -arch compute_13 -DCUDA -DSTATE_COUNT=$$s -DDOUBLE_PRECISION \
+		($(NVCC) -o BeagleCUDA_kernels.ptx -ptx -DCUDA -DSTATE_COUNT=$$s -DDOUBLE_PRECISION \
 			$(srcdir)/kernelsX.cu $(NVCCFLAGS) -DHAVE_CONFIG_H $(INCLUDE_DIRS)) || exit; \
 		echo "#define KERNELS_STRING_DP_$$s \"" | sed 's/$$/\\n\\/' >> BeagleCUDA_kernels.h; \
 		cat BeagleCUDA_kernels.ptx | sed 's/\"/\\"/g' | sed 's/$$/\\n\\/' >> BeagleCUDA_kernels.h; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libhmsbeagle.git