From 97665684e61566e767ed650d809daa528891b57e Mon Sep 17 00:00:00 2001 From: sfilippone Date: Wed, 3 Dec 2025 17:37:01 +0100 Subject: [PATCH] Fix CUDA library names and configry --- Make.inc.in | 6 ++---- configure | 11 +++-------- configure.ac | 9 +++------ cuda/spgpu/Makefile | 5 +++-- cuda/spgpu/kernels/Makefile | 2 +- test/cudakern/Makefile | 2 +- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Make.inc.in b/Make.inc.in index ceba77b8..be1aa4e7 100755 --- a/Make.inc.in +++ b/Make.inc.in @@ -77,9 +77,7 @@ CXXOPENACC=@CXXOPENACC@ CUDAD=@CUDAD@ CUDALD=@CUDALD@ -LCUDA=@LCUDA@ - -SPGPU_LIBS=@SPGPU_LIBS@ +LPSB_CUDA=@LPSB_CUDA@ CUDA_DIR=@CUDA_DIR@ CUDA_INCLUDES=@CUDA_INCLUDES@ @@ -102,4 +100,4 @@ CUDEFINES=@CUDEFINES@ @PSBLASRULES@ -PSBGPULDLIBS=$(LCUDA) $(SPGPU_LIBS) $(CUDA_LIBS) $(PSBLDLIBS) $(LIBS) \ No newline at end of file +PSBGPULDLIBS=$(LPSB_CUDA) $(CUDA_LIBS) $(PSBLDLIBS) $(LIBS) \ No newline at end of file diff --git a/configure b/configure index 9f7434aa..58245e7b 100755 --- a/configure +++ b/configure @@ -651,7 +651,7 @@ LIBRSB_DIR LIBRSB_INCDIR LIBRSB_INCLUDES LIBRSB_LIBS -LCUDA +LPSB_CUDA CUDALD CUDAD CUDEFINES @@ -666,7 +666,6 @@ FCUDEFINES CUDA_DEFINES CUDA_DIR EXTRALDLIBS -SPGPU_LIBS SPGPU_FLAGS CXXOPENACC CCOPENACC @@ -10878,7 +10877,6 @@ 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=""; CUDALD=""; CUDEFINES=""; @@ -11127,7 +11125,6 @@ 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=""; CUDALD=""; CUDEFINES=""; @@ -11146,10 +11143,9 @@ 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; 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;} @@ -11735,7 +11731,6 @@ FDEFINES=$(PSBFDEFINES) - ############################################################################### diff --git a/configure.ac b/configure.ac index ecaa89de..dab9954e 100644 --- a/configure.ac +++ b/configure.ac @@ -851,7 +851,6 @@ if test "x$pac_cv_ipk_size" != "x4"; then pac_cv_cuda="no"; PSB_HAVE_CUDA="no"; CUDA_CC=""; - SPGPU_LIBS=""; CUDAD=""; CUDALD=""; CUDEFINES=""; @@ -875,7 +874,6 @@ else pac_cv_cuda="no"; PSB_HAVE_CUDA="no"; CUDA_CC=""; - SPGPU_LIBS=""; CUDAD=""; CUDALD=""; CUDEFINES=""; @@ -893,10 +891,10 @@ 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; CUDALD=cudald; - LCUDA="-lpsb_cuda"; + LPSB_CUDA="-lpsb_cuda"; EXTRALDLIBS="-lstdc++"; AC_MSG_NOTICE([At this point GPUTARGET is $CUDAD $CUDALD]) @@ -1104,7 +1102,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) @@ -1122,7 +1119,7 @@ AC_SUBST(CUDA_NVCC) AC_SUBST(CUDEFINES) AC_SUBST(CUDAD) AC_SUBST(CUDALD) -AC_SUBST(LCUDA) +AC_SUBST(LPSB_CUDA) AC_SUBST(LIBRSB_LIBS) AC_SUBST(LIBRSB_INCLUDES) AC_SUBST(LIBRSB_INCDIR) diff --git a/cuda/spgpu/Makefile b/cuda/spgpu/Makefile index 75302a50..9c483660 100644 --- a/cuda/spgpu/Makefile +++ b/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: $(OBJS) iobjs lib: objs iobjs ilib $(AR) $(LIBNAME) $(OBJS) - /bin/cp -p $(LIBNAME) $(LIBDIR) +# /bin/cp -p $(LIBNAME) $(LIBDIR) iobjs: $(MAKE) -C kernels objs diff --git a/cuda/spgpu/kernels/Makefile b/cuda/spgpu/kernels/Makefile index 37113c75..a45bb8c0 100644 --- a/cuda/spgpu/kernels/Makefile +++ b/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 \ diff --git a/test/cudakern/Makefile b/test/cudakern/Makefile index a7752f0a..34e5bed6 100755 --- a/test/cudakern/Makefile +++ b/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