ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

having plain filelink instead of filelink.o confuses KOKKOS linking with nvcc

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-09-25 19:37:37 -04:00
parent 836a6d292c
commit e6969002ce
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/latte/Install.py
View File

@ -159,13 +159,13 @@ if buildflag or pathflag:
os.remove("includelink") os.remove("includelink")
if os.path.isfile("liblink") or os.path.islink("liblink"): if os.path.isfile("liblink") or os.path.islink("liblink"):
os.remove("liblink") os.remove("liblink")
if os.path.isfile("filelink") or os.path.islink("filelink"): if os.path.isfile("filelink.o") or os.path.islink("filelink.o"):
os.remove("filelink") os.remove("filelink.o")
cmd = 'ln -s "%s/src" includelink' % lattedir cmd = 'ln -s "%s/src" includelink' % lattedir
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True) subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
cmd = 'ln -s "%s" liblink' % lattedir cmd = 'ln -s "%s" liblink' % lattedir
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True) subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
cmd = 'ln -s "%s/src/latte_c_bind.o" filelink' % lattedir cmd = 'ln -s "%s/src/latte_c_bind.o" filelink.o' % lattedir
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True) subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
# copy Makefile.lammps.suffix to Makefile.lammps # copy Makefile.lammps.suffix to Makefile.lammps

2
lib/latte/Makefile.lammps.gfortran
View File

@ -3,5 +3,5 @@
# GNU Fortran settings # GNU Fortran settings
latte_SYSINC = latte_SYSINC =
latte_SYSLIB = ../../lib/latte/filelink -llatte -lgfortran -llapack -lblas latte_SYSLIB = ../../lib/latte/filelink.o -llatte -lgfortran -llapack -lblas
latte_SYSPATH = -fopenmp latte_SYSPATH = -fopenmp

2
lib/latte/Makefile.lammps.ifort
View File

@ -3,7 +3,7 @@
# Intel ifort settings # Intel ifort settings
latte_SYSINC = latte_SYSINC =
latte_SYSLIB = ../../lib/latte/filelink \ latte_SYSLIB = ../../lib/latte/filelink.o \
-llatte -lifcore -lsvml -lompstub -limf -lmkl_intel_lp64 \ -llatte -lifcore -lsvml -lompstub -limf -lmkl_intel_lp64 \
-lmkl_intel_thread -lmkl_core -lmkl_intel_thread -lpthread \ -lmkl_intel_thread -lmkl_core -lmkl_intel_thread -lpthread \
-openmp -O0 -openmp -O0