From 08a9744413475b756341bbd9cd47e3b28aefd069 Mon Sep 17 00:00:00 2001 From: tloloum Date: Fri, 19 Jul 2024 13:01:07 +0200 Subject: [PATCH] moving test --- test/openacc/Makefile | 7 ++++++- test/{pargen => openacc}/psb_d_oacc_pde3d.F90 | 0 test/pargen/Makefile | 7 +------ 3 files changed, 7 insertions(+), 7 deletions(-) rename test/{pargen => openacc}/psb_d_oacc_pde3d.F90 (100%) diff --git a/test/openacc/Makefile b/test/openacc/Makefile index 9d62f3cd..a2827b30 100644 --- a/test/openacc/Makefile +++ b/test/openacc/Makefile @@ -9,7 +9,7 @@ INCDIR=$(TOPDIR)/include MODDIR=$(TOPDIR)/modules EXEDIR=./runs -PSBLAS_LIB= -L$(LIBDIR) -L$(PSBLIBDIR) -lpsb_openacc -lpsb_base -lpsb_ext -lpsb_util -lpsb_krylov -lpsb_prec -lopenblas -lmetis +PSBLAS_LIB= -L$(LIBDIR) -L$(PSBLIBDIR) -lpsb_openacc -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBGPULDLIBS) FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(FMFLAG). $(FMFLAG)$(PSBMODDIR) $(FMFLAG)$(PSBINCDIR) $(LIBRSB_DEFINES) @@ -39,6 +39,11 @@ dir: %.o: %.c $(CC) $(CFLAGS) $(FINCLUDES) -c $< -o $@ +psb_d_oacc_pde3d: + mpifort -fallow-argument-mismatch -frecursive -g -O3 -frecursive -I../../modules/ -I. -DOPENACC -DHAVE_LAPACK -DHAVE_FLUSH_STMT -DLPK8 -DIPK4 -DMPI_MOD -c psb_d_oacc_pde3d.F90 -o psb_d_oacc_pde3d.o + $(FLINK) -fopenacc -DOPENACC psb_d_oacc_pde3d.o -o psb_d_oacc_pde3d $(PSBLAS_LIB) $(LDLIBS) + /bin/mv psb_d_oacc_pde3d $(EXEDIR) + clean: /bin/rm -fr *.o *.mod $(EXEDIR)/* diff --git a/test/pargen/psb_d_oacc_pde3d.F90 b/test/openacc/psb_d_oacc_pde3d.F90 similarity index 100% rename from test/pargen/psb_d_oacc_pde3d.F90 rename to test/openacc/psb_d_oacc_pde3d.F90 diff --git a/test/pargen/Makefile b/test/pargen/Makefile index 9b720ac2..c0a1c375 100644 --- a/test/pargen/Makefile +++ b/test/pargen/Makefile @@ -5,7 +5,7 @@ include $(INCDIR)/Make.inc.psblas # # Libraries used LIBDIR=$(INSTALLDIR)/lib -PSBLAS_LIB= -L$(LIBDIR) -lpsb_openacc -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base +PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) # # Compilers and such @@ -25,11 +25,6 @@ psb_d_pde3d: psb_d_pde3d.o $(FLINK) psb_d_pde3d.o -o psb_d_pde3d $(PSBLAS_LIB) $(LDLIBS) /bin/mv psb_d_pde3d $(EXEDIR) -psb_d_oacc_pde3d: - mpifort -fallow-argument-mismatch -frecursive -g -O3 -frecursive -I../../modules/ -I. -DOPENACC -DHAVE_LAPACK -DHAVE_FLUSH_STMT -DLPK8 -DIPK4 -DMPI_MOD -c psb_d_oacc_pde3d.F90 -o psb_d_oacc_pde3d.o - $(FLINK) -fopenacc -DOPENACC psb_d_oacc_pde3d.o -o psb_d_oacc_pde3d $(PSBLAS_LIB) $(LDLIBS) - /bin/mv psb_d_oacc_pde3d $(EXEDIR) - psb_s_pde3d: psb_s_pde3d.o $(FLINK) psb_s_pde3d.o -o psb_s_pde3d $(PSBLAS_LIB) $(LDLIBS) /bin/mv psb_s_pde3d $(EXEDIR)