From 807afa248f7cd9ea8462d73c69a12888b76f2efa Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Thu, 8 Jan 2026 14:09:47 +0100
Subject: [PATCH 1/4] Fix cuda makefile

---
 cuda/spgpu/kernels/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuda/spgpu/kernels/Makefile b/cuda/spgpu/kernels/Makefile
index a45bb8c0..8bebf1ba 100644
--- a/cuda/spgpu/kernels/Makefile
+++ b/cuda/spgpu/kernels/Makefile
@@ -6,7 +6,7 @@ include $(TOP)/Make.inc
 LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
-UP=..
+UP=../..
 LIBNAME=$(UP)/libpsb_cuda.a
 CINCLUDES=-I$(INCDIR)
 CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
@@ -24,7 +24,7 @@ OBJS=cabs.o  camax.o  casum.o  caxpby.o  caxy.o  cdot.o  cgath.o \
 
 objs: $(OBJS)
 lib: objs
-	$(AR) $(UP)/$(LIBNAME) $(OBJS)
+	$(AR) $(LIBNAME) $(OBJS)
 
 
 clean:

From 24aa5a0bc589b122a91400181858e5e5c1080899 Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Thu, 8 Jan 2026 14:24:02 +0100
Subject: [PATCH 2/4] Fix cuda build

---
 cuda/spgpu/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuda/spgpu/Makefile b/cuda/spgpu/Makefile
index c87b133b..f713d02c 100644
--- a/cuda/spgpu/Makefile
+++ b/cuda/spgpu/Makefile
@@ -23,7 +23,7 @@ lib: objs iobjs ilib
 iobjs:
 	$(MAKE) -C kernels objs
 ilib:
-	$(MAKE) -C kernels lib LIBNAME=$(LIBNAME)
+	$(MAKE) -C kernels lib
 
 incl:
 	/bin/cp -p *.h $(INCDIR)

From f79ab74649cb9043fd030f964fea279e290fb800 Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Fri, 9 Jan 2026 09:10:23 +0100
Subject: [PATCH 3/4] Fix CUDA makefiles

---
 cuda/CUDA/Makefile          | 2 +-
 cuda/Makefile               | 6 +++---
 cuda/impl/Makefile          | 2 +-
 cuda/spgpu/Makefile         | 4 ++--
 cuda/spgpu/kernels/Makefile | 5 ++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cuda/CUDA/Makefile b/cuda/CUDA/Makefile
index 010d591d..3918e298 100644
--- a/cuda/CUDA/Makefile
+++ b/cuda/CUDA/Makefile
@@ -16,7 +16,7 @@ LDLIBS=$(PSBLDLIBS)
 #CCOPT= -g
 FINCLUDES=$(FMFLAG).   $(FMFLAG)$(INCDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
 CINCLUDES=$(SPGPU_INCLUDES) $(CUDA_INCLUDES) -I.. -I$(INCDIR)
-LIBNAME=libpsb_gpu.a
+LIBNAME=libpsb_cuda.a
 
 
 CUDAOBJS=psi_cuda_c_CopyCooToElg.o psi_cuda_c_CopyCooToHlg.o \
diff --git a/cuda/Makefile b/cuda/Makefile
index 5c9754bc..795c17f7 100755
--- a/cuda/Makefile
+++ b/cuda/Makefile
@@ -128,9 +128,9 @@ cudaobjs: $(FOBJS)
 	$(MAKE) -C CUDA objs
 
 ilib: objs
-	$(MAKE) -C impl lib LIBNAME=$(LIBNAME)
-cudalib: objs ilib
-	$(MAKE) -C CUDA lib LIBNAME=$(LIBNAME)
+	$(MAKE) -C impl lib 
+cudalib: objs 
+	$(MAKE) -C CUDA lib 
 
 clean: cclean iclean cudaclean spgpuclean
 	/bin/rm -f  $(FOBJS) *$(.mod) *.a
diff --git a/cuda/impl/Makefile b/cuda/impl/Makefile
index 2d9a774d..63f41660 100755
--- a/cuda/impl/Makefile
+++ b/cuda/impl/Makefile
@@ -11,7 +11,7 @@ LDLIBS=$(PSBLDLIBS)
 #CCOPT= -g
 FINCLUDES=$(FMFLAG)..  $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(FIFLAG)..
 CINCLUDES=-I$(GPU_INCDIR) -I$(CUDA_INCDIR)
-LIBNAME=libpsb_gpu.a
+LIBNAME=libpsb_cuda.a
 CXXDEFINES=$(PSBCXXDEFINES) $(SPGPU_DEFINES) $(CUDA_DEFINES)
 CDEFINES=$(PSBCDEFINES) $(SPGPU_DEFINES) $(CUDA_DEFINES)
 FDEFINES=$(PSBFDEFINES) $(SPGPU_DEFINES) $(CUDA_DEFINES)
diff --git a/cuda/spgpu/Makefile b/cuda/spgpu/Makefile
index f713d02c..fbe99fb4 100644
--- a/cuda/spgpu/Makefile
+++ b/cuda/spgpu/Makefile
@@ -7,7 +7,7 @@ UP=..
 LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
-LIBNAME=$(UP)/libpsb_cuda.a
+LIBNAME=libpsb_cuda.a
 
 OBJS=coo.o core.o dia.o ell.o hdia.o hell.o 
 CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
@@ -17,7 +17,7 @@ all: incl objs
 objs: incl $(OBJS) iobjs
 
 lib: objs iobjs ilib
-	$(AR) $(LIBNAME) $(OBJS)
+	$(AR) ../$(LIBNAME) $(OBJS)
 #	/bin/cp -p $(LIBNAME) $(LIBDIR)
 
 iobjs:
diff --git a/cuda/spgpu/kernels/Makefile b/cuda/spgpu/kernels/Makefile
index 8bebf1ba..f73e74a7 100644
--- a/cuda/spgpu/kernels/Makefile
+++ b/cuda/spgpu/kernels/Makefile
@@ -6,8 +6,7 @@ include $(TOP)/Make.inc
 LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
-UP=../..
-LIBNAME=$(UP)/libpsb_cuda.a
+LIBNAME=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 \
@@ -24,7 +23,7 @@ OBJS=cabs.o  camax.o  casum.o  caxpby.o  caxy.o  cdot.o  cgath.o \
 
 objs: $(OBJS)
 lib: objs
-	$(AR) $(LIBNAME) $(OBJS)
+	$(AR) ../../$(LIBNAME) $(OBJS)
 
 
 clean:

From 3983255f9f99ad010506248ac7eb6a92fa5bd37d Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Fri, 9 Jan 2026 09:30:59 +0100
Subject: [PATCH 4/4] Further cuda makefile fix

---
 cuda/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuda/Makefile b/cuda/Makefile
index 795c17f7..ee4757ce 100755
--- a/cuda/Makefile
+++ b/cuda/Makefile
@@ -127,9 +127,9 @@ iobjs: $(FOBJS)
 cudaobjs: $(FOBJS)
 	$(MAKE) -C CUDA objs
 
-ilib: objs
+ilib: objs spgpulib 
 	$(MAKE) -C impl lib 
-cudalib: objs 
+cudalib: objs ilib
 	$(MAKE) -C CUDA lib 
 
 clean: cclean iclean cudaclean spgpuclean