Changed library names and machinery for CUDA.

Make.inc.in

@@ -79,9 +79,7 @@ CXXOPENACC=@CXXOPENACC@
 CUDAD=@CUDAD@
 CUDAMODS=@CUDAMODS@
 CUDALD=@CUDALD@
-LCUDA=@LCUDA@
+LPSB_CUDA=@LPSB_CUDA@
-
-SPGPU_LIBS=@SPGPU_LIBS@
 
 CUDA_DIR=@CUDA_DIR@
 CUDA_INCLUDES=@CUDA_INCLUDES@
@@ -104,4 +102,4 @@ CUDEFINES=@CUDEFINES@
 
 @PSBLASRULES@
 
-PSBGPULDLIBS=$(LCUDA) $(SPGPU_LIBS) $(CUDA_LIBS) $(PSBLDLIBS) $(LIBS) 
+PSBGPULDLIBS=$(LPSB_CUDA) $(CUDA_LIBS) $(PSBLDLIBS) $(LIBS) 

configure

@@ -651,7 +651,7 @@ LIBRSB_DIR
 LIBRSB_INCDIR
 LIBRSB_INCLUDES
 LIBRSB_LIBS
-LCUDA
+LPSB_CUDA
 CUDALD
 CUDAMODS
 CUDAD
@@ -667,7 +667,6 @@ FCUDEFINES
 CUDA_DEFINES
 CUDA_DIR
 EXTRALDLIBS
-SPGPU_LIBS
 SPGPU_FLAGS
 CXXOPENACC
 CCOPENACC
@@ -10922,9 +10921,7 @@ printf "%s\n" "$as_me: For CUDA I need psb_ipk_ to be 4 bytes but it is $pac_cv_
   pac_cv_cuda="no";
   PSB_HAVE_CUDA="no";
   CUDA_CC="";
-  SPGPU_LIBS="";
   CUDAD="";
-  CUDAMODS="";
   CUDALD="";
   CUDEFINES="";
   CUDA_DEFINES="";
@@ -11172,9 +11169,7 @@ printf "%s\n" "$as_me: Unsupported CUDA version ${PSB_CUDA_VERSION} disabling CU
          pac_cv_cuda="no";
          PSB_HAVE_CUDA="no";
          CUDA_CC="";
-         SPGPU_LIBS="";
          CUDAD="";
-         CUDAMODS="";
          CUDALD="";
          CUDEFINES="";
          CUDA_DEFINES="";
@@ -11192,11 +11187,10 @@ printf "%s\n" "$as_me: CUDA version ${PSB_CUDA_VERSION}" >&6;}
          CHAVECUDA="#define PSB_HAVE_CUDA"
          CSHORTVCUDA="#define PSB_CUDA_SHORT_VERSION ${PSB_CUDA_SHORT_VERSION}"
          CVERSIONCUDA="#define PSB_CUDA_VERSION ${PSB_CUDA_VERSION}"
-         SPGPU_LIBS="-lspgpu";
+	          CUDAD=cudad;
-         CUDAD=cudad;
          CUDAMODS=cudamods;
          CUDALD=cudald;
-         LCUDA="-lpsb_cuda";
+         LPSB_CUDA="-lpsb_cuda";
          EXTRALDLIBS="-lstdc++";
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: At this point GPUTARGET is $CUDAD $CUDALD" >&5
 printf "%s\n" "$as_me: At this point GPUTARGET is $CUDAD $CUDALD" >&6;}
@@ -11778,7 +11772,6 @@ FDEFINES=$(PSBFDEFINES)
 
 
 
-
 
 
 ###############################################################################

configure.ac

@@ -850,9 +850,7 @@ if test "x$pac_cv_ipk_size" != "x4"; then
   pac_cv_cuda="no";
   PSB_HAVE_CUDA="no";
   CUDA_CC="";	
-  SPGPU_LIBS="";	
   CUDAD="";
-  CUDAMODS="";	
   CUDALD="";
   CUDEFINES="";
   CUDA_DEFINES="";
@@ -875,9 +873,7 @@ else
          pac_cv_cuda="no";
          PSB_HAVE_CUDA="no";
          CUDA_CC="";	
-         SPGPU_LIBS="";	
          CUDAD="";
-         CUDAMODS="";	
          CUDALD="";
          CUDEFINES="";
          CUDA_DEFINES="";
@@ -894,11 +890,11 @@ else
          CHAVECUDA="#define PSB_HAVE_CUDA"
          CSHORTVCUDA="#define PSB_CUDA_SHORT_VERSION ${PSB_CUDA_SHORT_VERSION}"
          CVERSIONCUDA="#define PSB_CUDA_VERSION ${PSB_CUDA_VERSION}"
-         SPGPU_LIBS="-lspgpu";	
+	 dnl    SPGPU_LIBS="-lspgpu";	
          CUDAD=cudad;
          CUDAMODS=cudamods;
          CUDALD=cudald;
-         LCUDA="-lpsb_cuda";	
+         LPSB_CUDA="-lpsb_cuda";	
          EXTRALDLIBS="-lstdc++";
          AC_MSG_NOTICE([At this point GPUTARGET is $CUDAD $CUDALD])
    
@@ -1101,7 +1097,6 @@ AC_SUBST(CCOPENACC)
 AC_SUBST(CXXOPENACC)
 
 AC_SUBST(SPGPU_FLAGS)
-AC_SUBST(SPGPU_LIBS)
 dnl AC_SUBST(SPGPU_DIR)
 dnl AC_SUBST(SPGPU_INCLUDES)
 dnl AC_SUBST(SPGPU_INCDIR)
@@ -1120,7 +1115,7 @@ AC_SUBST(CUDEFINES)
 AC_SUBST(CUDAD)
 AC_SUBST(CUDAMODS)
 AC_SUBST(CUDALD)
-AC_SUBST(LCUDA)
+AC_SUBST(LPSB_CUDA)
 AC_SUBST(LIBRSB_LIBS)
 AC_SUBST(LIBRSB_INCLUDES)
 AC_SUBST(LIBRSB_INCDIR)

cuda/Makefile

@@ -55,7 +55,7 @@ lib: mods objs ilib cudalib spgpulib
 mods: $(FOBJS)
 	$(INSTALL) -p *$(.mod) $(MODDIR)
 	$(INSTALL) -p *.h $(INCDIR)
-objs: mods $(OBJS) iobjs cudaobjs spgpuobjs
+objs: $(OBJS) iobjs cudaobjs spgpuobjs
 
 $(OBJS) iobjs cudaobjs spgpuobjs: spgpuinc
 

cuda/spgpu/Makefile

@@ -3,10 +3,11 @@ include $(TOP)/Make.inc
 #
 # Libraries used
 #
+UP=..
 LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
-LIBNAME=libspgpu.a
+LIBNAME=$(UP)/libpsb_cuda.a
 
 OBJS=coo.o core.o dia.o ell.o hdia.o hell.o 
 CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
@@ -17,7 +18,7 @@ objs: incl $(OBJS) iobjs
 
 lib: objs iobjs ilib
 	$(AR) $(LIBNAME) $(OBJS)
-	/bin/cp -p $(LIBNAME) $(LIBDIR)
+#	/bin/cp -p $(LIBNAME) $(LIBDIR)
 
 iobjs:
 	$(MAKE) -C kernels objs

cuda/spgpu/kernels/Makefile

@@ -7,7 +7,7 @@ LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
 UP=..
-LIBNAME=$(UP)/libspgpu.a
+LIBNAME=$(UP)/libpsb_cuda.a
 CINCLUDES=-I$(INCDIR)
 CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
 OBJS=cabs.o  camax.o  casum.o  caxpby.o  caxy.o  cdot.o  cgath.o \

test/cudakern/Makefile

@@ -8,7 +8,7 @@ PSBLIBDIR=$(TOPDIR)/lib/
 OPTDIR=$(LIBDIR)
 PSBINCDIR=$(TOPDIR)/include
 PSBMODDIR=$(TOPDIR)/modules
-PSBLAS_LIB= -L$(LIBDIR) -L$(PSBLIBDIR) $(LCUDA) -lpsb_ext -lpsb_util -lpsb_base 
+PSBLAS_LIB= -L$(LIBDIR) -L$(PSBLIBDIR) $(LPSB_CUDA) -lpsb_ext -lpsb_util -lpsb_base 
 INCDIR=$(TOPDIR)/include
 MODDIR=$(TOPDIR)/modules