Skip to content

Commit

Permalink
makefile update
Browse files Browse the repository at this point in the history 
several version of makefile are prepared
  • Loading branch information
@Infant83
Infant83 committed Mar 28, 2022
1 parent 4d827bc commit 694547a
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
23 changes: 12 additions & 11 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
#####################
# MAC-INTEL COMPILE #
#####################
FC = mpiifort
#FC = mpif90
#FC = mpiifort
FC = mpif90
OPTIONS= -fPIC -fpp -DF08 -DMKL_SPARSE -DSPGLIB -DPSPARSE #-DSCALAPACK
FFLAG = -O2 -heap-arrays -nogen-interfaces
MPI_USE= YES
#F90WRAP_LAPACK = --link-lapack_mkl # for ifflsurm --link-lapack , for mac --link-lapack_mkl
F90WRAP_LAPACK = --link-lapack # for ifflsurm --link-lapack , for mac --link-lapack_mkl
F90WRAP_LAPACK = --link-lapack_mkl # for ifflsurm --link-lapack , for mac --link-lapack_mkl
#F90WRAP_LAPACK = --link-lapack # for ifflsurm --link-lapack , for mac --link-lapack_mkl
##########################
# LINUX-gfortran COMPILE #
##########################
Expand Down Expand Up @@ -89,8 +89,8 @@ LIB = $(TBLIB)
# Dependencies: LAPACK, SPGLIB |
#---------------------------------------------------------------------------|
#SPGLIB = -L/Users/Infant/code/lib/ -lsymspg # home
#SPGLIB = ${HOME}/tbfit_fortran/LIB/spglib-1.16.2/lib/libsymspg.a # mymac
SPGLIB = /local/th1/iff003/kim/tbfit_fortran/LIB/spglib-1.16.2/lib64/libsymspg.a # iffslurm
SPGLIB = ${HOME}/tbfit_fortran/LIB/spglib-1.16.2/lib/libsymspg.a # mymac
#SPGLIB = /local/th1/iff003/kim/tbfit_fortran/LIB/spglib-1.16.2/lib64/libsymspg.a # iffslurm
#SPGLIB = -L/home/Infant/tbfit_fortran/LIB/spglib-master -lsymspg # curion2

MKLPATH = $(MKLROOT)
Expand All @@ -99,10 +99,11 @@ LAPACK = -L$(MKLPATH)/lib/ \
-lmkl_core -liomp5
BLAS =
INCLUDE = -I$(MKLPATH)/include
#FEAST = -L/${HOME}/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lfeast # Serial version for mac
#FEAST_MPI = -L/${HOME}/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lpfeast -lfeast # MPI version for mac
FEAST = -L/local/th1/iff003/kim/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lfeast # Serial version for iffslurm
FEAST_MPI = -L/local/th1/iff003/kim/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lpfeast -lfeast # MPI version for iffslurm
FEAST = -L/${HOME}/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lfeast # Serial version for mac
FEAST_MPI = -L/${HOME}/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lpfeast -lfeast # MPI version for mac
#FEAST = -L/local/th1/iff003/kim/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lfeast # Serial version for iffslurm
#FEAST_MPI = -L/local/th1/iff003/kim/tbfit_fortran/LIB/FEAST/4.0/lib/x64 -lpfeast -lfeast # MPI version for iffslurm

#SCALAPACK = /Users/Infant/tbfit_fortran/LIB/scalapack-2.0.2/libscalapack.a
SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
#---------------------------------------------------------------------------|
Expand All @@ -111,7 +112,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_iffslurm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_iffslurm_mpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_iffslurm_mpi_py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_iffslurm_py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
4 changes: 2 additions & 2 deletions makefile_mac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
FC = mpif90
OPTIONS= -fPIC -fpp -DF08 -DMKL_SPARSE -DSPGLIB #-DPSPARSE #-DSCALAPACK
FFLAG = -O2 -heap-arrays -nogen-interfaces
MPI_USE= NO
MPI_USE= NO
F90WRAP_LAPACK = --link-lapack_mkl # for ifflsurm --link-lapack , for mac --link-lapack_mkl
#F90WRAP_LAPACK = --link-lapack # for ifflsurm --link-lapack , for mac --link-lapack_mkl
##########################
Expand Down Expand Up @@ -112,7 +112,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_mac_mpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_mac_mpi_py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down
2 changes: 1 addition & 1 deletion makefile_mac_py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ SCALAPACK = /${HOME}/tbfit_fortran/LIB/scala_home/libscalapack.a
######################### Do not modify below ###############################
# version tag
#TBFIT_VERSION=0.5.4
TBFIT_VERSION=0.5.5
TBFIT_VERSION=0.5.6

#-----------------------------------
# Objects |
Expand Down

0 comments on commit 694547a

Please sign in to comment.