Commit e6969002 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

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

parent 836a6d29

lib/latte/Install.py

+3 −3
Original line number Diff line number Diff line
@@ -159,13 +159,13 @@ if buildflag or pathflag: 
    os.remove("includelink")

  if os.path.isfile("liblink") or os.path.islink("liblink"):

    os.remove("liblink")

  if os.path.isfile("filelink") or os.path.islink("filelink"):

    os.remove("filelink")

  if os.path.isfile("filelink.o") or os.path.islink("filelink.o"):

    os.remove("filelink.o")

  cmd = 'ln -s "%s/src" includelink' % lattedir

  subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)

  cmd = 'ln -s "%s" liblink' % lattedir

  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)



# copy Makefile.lammps.suffix to Makefile.lammps

lib/latte/Makefile.lammps.gfortran

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
# GNU Fortran settings



latte_SYSINC = 

latte_SYSLIB = ../../lib/latte/filelink -llatte -lgfortran -llapack -lblas

latte_SYSLIB = ../../lib/latte/filelink.o -llatte -lgfortran -llapack -lblas

latte_SYSPATH = -fopenmp

lib/latte/Makefile.lammps.ifort

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Intel ifort settings



latte_SYSINC = 

latte_SYSLIB = ../../lib/latte/filelink \

latte_SYSLIB = ../../lib/latte/filelink.o \

               -llatte -lifcore -lsvml -lompstub -limf -lmkl_intel_lp64 \

               -lmkl_intel_thread -lmkl_core -lmkl_intel_thread -lpthread \

               -openmp -O0

CRA Git | Maintained and supported by SUSTech CRA and CCSE