Skip to content

Commit 1fce685

Browse files
committed
Nbody6++GPU-Aug2021. Downloaded from kepler:/work/Tit7/DRAGON/frozen/Nbody6++GPU-Aug2021 Changelog: http://silkroad.bao.ac.cn/joomla/index.php/main-forum/22-nbody6/529-nbody6-gpu-updates-as-of-dec-9-202
1 parent dba1980 commit 1fce685

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+4190
-1498
lines changed

README

-70
This file was deleted.

build/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ CXX = g++
1616
CC = gcc
1717
NVCC = nvcc
1818

19-
RESULT = nbody6++.sse.gpu.mpi
19+
RESULT = nbody6++.sse.gpu.mpi.hdf5
2020
#FFLAGS = -O3 -fbounds-check -fbacktrace -fno-automatic -fmax-stack-var-size=0 -fPIC -mcmodel=large -Wall
2121
OMP_FLAGS= -D OMP
2222
MPI_FLAGS = -D PARALLEL -D PUREMPI
2323
GPU_FLAGS = -D GPU
2424
SIMD_FLAGS = -D SIMD
25-
HDF5_FLAGS = -D H5OUTPUT
25+
HDF5_FLAGS = -D H5OUTPUT -I/usr/include/openmpi-x86_64/ -L/usr/lib64/openmpi/lib/ -lhdf5_fortran
2626
DEBUG_FLAGS= -D DEBUG
2727
TT_FLAGS= -D TT
2828
INTEL_FLAGS= -D __USE_INTEL -no-wrap-margin
2929

30-
FFLAGS = -g -fbounds-check -fbacktrace -O3 -fPIC -mcmodel=large -fopenmp -I../include $(GPU_FLAGS) $(MPI_FLAGS) ${SIMD_FLAGS} ${OMP_FLAGS}
30+
FFLAGS = -O0 -fPIC -mcmodel=large -fopenmp -I../include $(GPU_FLAGS) $(MPI_FLAGS) ${SIMD_FLAGS} ${OMP_FLAGS} ${HDF5_FLAGS}
3131
CXXFLAGS = -O3 -fopenmp -I../include -march=native -fPIC -mcmodel=large -msse ${OMP_FLAGS}
32-
CUFLAGS = -O3 -I ../extra_inc/cuda
32+
CUFLAGS = -O0 -D CUDA_5 -I /usr/local/cuda-7.5/samples/common/inc
3333
LDFLAGS = -o $(RESULT)
3434

3535
MPI_FSOURCES= energy_mpi.f fpoly1_mpi.f fpoly2_mpi.f
@@ -118,7 +118,7 @@ OBJECTS = $(SOURCE:.f=.o)
118118
TARGET: $(RESULT)
119119

120120
$(RESULT): $(OBJECTS) $(EXTRAOBJ)
121-
$(FC) $(FFLAGS) $(LDFLAGS) $(OBJECTS) $(EXTRAOBJ) -lstdc++ -lcudart
121+
$(FC) $(FFLAGS) $(LDFLAGS) $(OBJECTS) $(EXTRAOBJ) -lstdc++ -L/usr/local/cuda-7.5/lib64 -lcudart
122122

123123
libinitial.so: initial.h initial.cpp
124124
$(CXX) -shared $(CXXFLAGS) ../src/Tools/initial.cpp -o libinitial.so

config.status

+7-7
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ $config_files
417417
418418
Report bugs to <[email protected]>."
419419

420-
ac_cs_config="'--with-par=b10m' '--enable-simd=sse' '--enable-mcmodel=large'"
420+
ac_cs_config="'--with-par=b1m' '--enable-simd=sse' '--enable-mcmodel=large'"
421421
ac_cs_version="\
422422
Nbody6++ config.status 1.0
423423
configured by ./configure, generated by GNU Autoconf 2.69,
@@ -427,7 +427,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
427427
This config.status script is free software; the Free Software Foundation
428428
gives unlimited permission to copy, distribute and modify it."
429429

430-
ac_pwd='/p/home/jusers/spurzem2/juwels/Nbody/Nbody6++GPU-Dec2020'
430+
ac_pwd='/home/Tit1/spurzem/Nbody/Nbody6++GPU-Aug2021'
431431
srcdir='.'
432432
AWK='gawk'
433433
test -n "$AWK" || AWK=awk
@@ -496,7 +496,7 @@ if $ac_cs_silent; then
496496
fi
497497

498498
if $ac_cs_recheck; then
499-
set X /bin/sh './configure' '--with-par=b10m' '--enable-simd=sse' '--enable-mcmodel=large' $ac_configure_extra_args --no-create --no-recursion
499+
set X /bin/sh './configure' '--with-par=b1m' '--enable-simd=sse' '--enable-mcmodel=large' $ac_configure_extra_args --no-create --no-recursion
500500
shift
501501
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
502502
CONFIG_SHELL='/bin/sh'
@@ -587,13 +587,13 @@ cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
587587
S["LTLIBOBJS"]=""
588588
S["MMAX"]="2048"
589589
S["LMAX"]="600"
590-
S["KMAX"]="5120000"
591-
S["NMAX"]="15107200"
590+
S["KMAX"]="512000"
591+
S["NMAX"]="1510720"
592592
S["EXTRARESULT"]=""
593593
S["EXTRAOBJ"]=" $(CUDA_OBJECTS) ${IRRSSE_OBJECTS}"
594594
S["EXTRASRC"]=" $(GPU_FSOURCES) $(MPI_FSOURCES)"
595595
S["RESULT"]=".sse.gpu.mpi"
596-
S["CUFLAGS"]=" -O3 -I ../extra_inc/cuda"
596+
S["CUFLAGS"]=" -O3 -D CUDA_5 -I /usr/local/cuda-7.5/samples/common/inc"
597597
S["AWK"]="gawk"
598598
S["SED"]="/usr/bin/sed"
599599
S["NVCC"]="nvcc"
@@ -619,7 +619,7 @@ S["FC"]="mpif77"
619619
S["target_alias"]=""
620620
S["host_alias"]=""
621621
S["build_alias"]=""
622-
S["LIBS"]=" -lstdc++ -lcudart"
622+
S["LIBS"]=" -lstdc++ -L/usr/local/cuda-7.5/lib64 -lcudart"
623623
S["ECHO_T"]=""
624624
S["ECHO_N"]="-n"
625625
S["ECHO_C"]=""

0 commit comments

Comments
 (0)