removed logging from SAPFOR and SERVER, updated NPB and fdvm

This commit is contained in:
ALEXks
2025-01-28 10:09:10 +03:00
committed by Dudarenko
parent 44600a50c1
commit b76753c285
17 changed files with 51 additions and 40 deletions

View File

@@ -43,22 +43,22 @@ ${PROGRAM}: config
fi
MPI_VER: $(OBJS) $(OBJS_MPI)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
SINGLE_VER: $(OBJS) $(OBJS_SINGLE)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
BLOCK_VER: $(OBJS) $(OBJS_BLOCK)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK)
BLOCK_VER1: $(OBJS) $(OBJS_BLOCK1)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK1)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK1)
BLOCK_VER2: $(OBJS) $(OBJS_BLOCK2)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK2)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK2)
%.o: %.fdv npbparams.h header3d.h
${F77} ${FFLAGS} -c -o $@ $<
${F77} f ${FFLAGS} -c -o $@ $<
clean:
rm -f npbparams.h

View File

@@ -10,10 +10,12 @@ SOURCES = cg.fdv
OBJS = ${SOURCES:.fdv=.o}
${PROGRAM}: config $(OBJS)
${FLINK} -o ${PROGRAM} ${OBJS}
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
%.o: %.fdv npbparams.h globals.h
${F77} ${FFLAGS} -dvmIrregAnalysis -c -o $@ $<
cg.o: cg.fdv npbparams.h globals.h
${F77} fdv ${FFLAGS} -dvmIrregAnalysis cg.fdv
cp cg.DVMH_cuda.cu_opt cg.DVMH_cuda.cu
${F77} fc cg.fdv -c -o cg.o
clean:
rm -f npbparams.h

View File

@@ -10,10 +10,10 @@ SOURCES = ep.fdv
OBJS = ${SOURCES:.fdv=.o}
${PROGRAM}: config $(OBJS)
${FLINK} -o ${PROGRAM} ${OBJS}
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
%.o: %.fdv npbparams.h
${F77} ${FFLAGS} -c -o $@ $<
${F77} f ${FFLAGS} -c -o $@ $<
clean:
rm -f npbparams.h

View File

@@ -10,10 +10,10 @@ SOURCES = ft.fdv
OBJS = ${SOURCES:.fdv=.o}
${PROGRAM}: config $(OBJS)
${FLINK} -o ${PROGRAM} ${OBJS}
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
%.o: %.fdv npbparams.h global.h
${F77} ${FFLAGS} -f90 -c -o $@ $<
${F77} f ${FFLAGS} -f90 -c -o $@ $<
clean:
rm -f npbparams.h

View File

@@ -1796,7 +1796,7 @@ subroutine print_results(name, class, n1, n2, n3, niter, t, mops, optype, verifi
parameter(d2m46=0.5d0**46)
save i246m1
data i246m1/X'00003FFFFFFFFFFF'/
data i246m1/Z'00003FFFFFFFFFFF'/
Lx = X
La = A
@@ -1819,7 +1819,7 @@ subroutine vranlc (N, X, A, Y)
parameter(d2m46=0.5d0**46)
save i246m1
data i246m1/X'00003FFFFFFFFFFF'/
data i246m1/Z'00003FFFFFFFFFFF'/
Lx = X
La = A

View File

@@ -16,10 +16,10 @@ ${PROGRAM}: config
${MAKE} exec
exec: $(OBJS)
${FLINK} ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${F_LIB}
${FLINK} flink -shared-dvm ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${F_LIB}
.f.o :
${F77} ${FFLAGS} -c -o $@ $<
${F77} f ${FFLAGS} -c -o $@ $<
lu.o: lu.f applu.incl npbparams.h
erhs.o: erhs.f applu.incl npbparams.h

View File

@@ -20,10 +20,10 @@ SOURCES = mg.fdv \
OBJS = ${SOURCES:.fdv=.o}
${PROGRAM}: config $(OBJS)
${FLINK} -o ${PROGRAM} ${OBJS}
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
%.o: %.fdv npbparams.h globals.h dvmvars.h
${F77} ${FFLAGS} -c -o $@ $<
${F77} f ${FFLAGS} -c -o $@ $<
clean:
rm -f npbparams.h

View File

@@ -30,13 +30,13 @@ ${PROGRAM}: config
fi
MPI_VER: $(OBJS) $(OBJS_MPI)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
SINGLE_VER: $(OBJS) $(OBJS_SINGLE)
${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
%.o: %.for npbparams.h header.h
${F77} ${FFLAGS} -c -o $@ $<
${F77} f ${FFLAGS} -c -o $@ $<
clean:
rm -f npbparams.h

View File

@@ -1,5 +1,5 @@
F77 = dvm f -shared-dvm
FLINK = dvm flink -shared-dvm
F77 = dvm
FLINK = dvm
FFLAGS = ${FOPT}