From f509f165d6740cab56ee4f18c9a761454fb6e56e Mon Sep 17 00:00:00 2001 From: Edoardo Baldi Date: Wed, 10 Jan 2024 16:43:36 +0100 Subject: [PATCH] Cleanup Makefiles --- cleedpy/cleed/{Makefile => Makefile.original} | 0 cleedpy/cleed/Makefile_LINUXBLAS | 183 ----------------- cleedpy/cleed/Makefile_OPENBLAS | 188 ------------------ 3 files changed, 371 deletions(-) rename cleedpy/cleed/{Makefile => Makefile.original} (100%) delete mode 100644 cleedpy/cleed/Makefile_LINUXBLAS delete mode 100644 cleedpy/cleed/Makefile_OPENBLAS diff --git a/cleedpy/cleed/Makefile b/cleedpy/cleed/Makefile.original similarity index 100% rename from cleedpy/cleed/Makefile rename to cleedpy/cleed/Makefile.original diff --git a/cleedpy/cleed/Makefile_LINUXBLAS b/cleedpy/cleed/Makefile_LINUXBLAS deleted file mode 100644 index 65b96e8..0000000 --- a/cleedpy/cleed/Makefile_LINUXBLAS +++ /dev/null @@ -1,183 +0,0 @@ -#============================================================================ -# GH/25.03.2020 -# makefile for the nonsymmetry LEED program -#============================================================================ -.SUFFIXES: .o .c .h -#============================================================================= -MYPRG = $(HOME)/LEED/CLEED_BUILD -INCLUDEDIR = $(MYPRG)/INCLUDE -# -# "homemade" BLAS library -CBLASLIB = $(MYPRG)/CBLAS/lib/cblas_LINUX.a - -# Generic DLS cluster BLAS library (not recommended) -# CBLASLIB = /lib64/libblas.so /lib64/libgslcblas.so - -LIBDIR = . - -# -#==flags===================================================================== -# CCOMP = cc -OPT = -O2 -# OPT = -O3 -march=native -CCOMP = gcc -CFLAGSSUB = -g -c $(OPT) -I$(INCLUDEDIR) -L$(LIBDIR) -CFLAGS = -g $(OPT) -I$(INCLUDEDIR) -L$(LIBDIR) -LDFLAGS = -lm -lblas -llapack -#============================================================================ -# header files -# -FILES.h = $(INCLUDEDIR)/stddef.h \ - $(INCLUDEDIR)/leed.h -#=========================================================================== -# subroutines for matrix operations -# -# complex library -CPLOBJ = cribasfun.o - -# basic qm functions -QMOBJ = qmbessm.o \ - qmcgc.o \ - qmhank.o \ - qmylm.o - -# matrix library -MATOBJ = matabs.o \ - matalloc.o \ - matarralloc.o\ - matarrfree.o \ - matcblasaux_lp.o \ - matcgau.o \ - matcheck.o \ - matclu.o \ - matcol.o \ - matconj.o \ - matcop.o \ - matdiff.o \ - matext.o \ - matfree.o \ - matins.o \ - matinv_lp.o \ - matmul_lp.o \ - matnattovht.o\ - matread.o \ - matrlu.o \ - matrow.o \ - matrm.o \ - matscal.o \ - matshow.o \ - matshowabs.o \ - matshowpar.o \ - matsqmod.o \ - mattrace.o \ - mattrans.o \ - matwrite.o - -# input for LEED programs -INPOBJ = linpbullayer.o \ - linpdebtemp.o \ - linpovllayer.o \ - linpphasend.o \ - linprdbulnd.o \ - linprdpar.o \ - linprdovlnd.o \ - linpshowbop.o - - # lreadpar.o - # lwritepar.o - # linpmatlm.o - -# output for LEED programs -OUTOBJ = loutbmlist.o \ - louthead.o \ - loutint.o - -# beams: -BEAMOBJ = lbmgen.o \ - lbmselect.o \ - lbmset.o - - # lbmrotmat.o \ - -# parameter control: -PCOBJ = lpcmktlnd.o \ - lpctemtl.o \ - lpcupdate.o - - # lpcmktl.o - -# layer doubling: -LDOBJ = lld2n.o \ - lld2lay.o \ - lld2layrpm.o \ - lldpotstep.o \ - lldpotstep0.o - -# multiple scattering: -MSOBJ = lmsbravlnd.o \ - lmscomplnd.o \ - lmslsumii.o \ - lmslsumij.o \ - lmspartinv.o \ - lmstmatii.o \ - lmstmatndii.o \ - lmstmatij.o \ - lmsymat.o \ - lmsymatset.o \ - lmsymmat.o \ - lmsypy.o - - # lmsbravl.o - # lmscompl.o - # lmsltok.o - -PRGOBJ = prgcheck.o - -TMAOBJ = lpccumtl.o \ - lpcmkms.o - - -LEEDOBJ = $(CPLOBJ) \ - $(QMOBJ) \ - $(MATOBJ) \ - $(INPOBJ) \ - $(OUTOBJ) \ - $(BEAMOBJ) \ - $(PCOBJ) \ - $(LDOBJ) \ - $(MSOBJ) \ - $(PRGOBJ) - -TMATOBJ = $(CPLOBJ) \ - $(QMOBJ) \ - $(MATOBJ) \ - $(INPOBJ) \ - $(PCOBJ) \ - $(PRGOBJ)\ - $(OUTOBJ) \ - $(BEAMOBJ) \ - $(LDOBJ) \ - $(MSOBJ) \ - $(TMAOBJ) - -TMATOBJ_531 = $(CPLOBJ) \ - $(QMOBJ) \ - $(MATOBJ) \ - $(INPOBJ) \ - $(PCOBJ) \ - $(PRGOBJ)\ - $(OUTOBJ_531) \ - $(BEAMOBJ) \ - $(LDOBJ) \ - $(MSOBJ) \ - $(TMAOBJ) - - -#============================================================================ -.c.o: ; $(CCOMP) $(CFLAGSSUB) $*.c -.f.o: ; f77 $(FFLAGSSUB) $*.f -#============================================================================ -test_nsym_lp: test_nsym_lp.o $(TMATOBJ) - $(CCOMP) -o $(MYPRG)/LEED_NSYM_LP/test_nsym_lp $(CFLAGS) $(TMATOBJ) $(CBLASLIB) test_nsym_lp.c $(LDFLAGS) - rm -f test_nsym_lp.o -#============================================================================ diff --git a/cleedpy/cleed/Makefile_OPENBLAS b/cleedpy/cleed/Makefile_OPENBLAS deleted file mode 100644 index a14cbd7..0000000 --- a/cleedpy/cleed/Makefile_OPENBLAS +++ /dev/null @@ -1,188 +0,0 @@ -#============================================================================ -# GH/26.03.2020 -# makefile for the nonsymmetry LEED program -#============================================================================ -.SUFFIXES: .o .c .h -#============================================================================= -MYPRG = $(HOME)/LEED/CLEED_BUILD -INCLUDEDIR = $(MYPRG)/INCLUDE -LIBDIR = . -# -#==flags===================================================================== -CCOMP = gcc -OPT = -O3 -march=native -# Use this for homemade BLAS: -# OPT = -O2 -CFLAGSSUB = -g -c $(OPT) -I$(INCLUDEDIR) -I$(INCLUDEDIRBLAS) -L$(LIBDIR) -CFLAGS = -g $(OPT) -I$(INCLUDEDIR) -I$(INCLUDEDIRBLAS) -LDFLAGS = -lm - -# GH 26/03/2020 added for openblas -INCLUDEDIRBLAS = /dls_sw/apps/openblas/0.3.9/include -LIBDIRBLAS = /dls_sw/apps/openblas/0.3.9/lib -FLAGSBLAS = -L$(LIBDIRBLAS) -Wl,-rpath,$(LIBDIRBLAS) -lopenblas - -# GH 24/03/2020 added for "homemade" CBLAS -# INCLUDEDIRBLAS = $(MYPRG)/CBLAS/include -# "homemade" CBLAS library -# CBLASLIB = $(MYPRG)/CBLAS/lib/cblas_LINUX.a - -# system CBLAS library (not recommended) -# CBLASLIB = /lib64/libblas.so /lib64/libgslcblas.so - -#============================================================================ -# header files -# -FILES.h = $(INCLUDEDIR)/stddef.h \ - $(INCLUDEDIR)/leed.h -#=========================================================================== -# subroutines for matrix operations -# -# complex library -CPLOBJ = cribasfun.o - -# basic qm functions -QMOBJ = qmbessm.o \ - qmcgc.o \ - qmhank.o \ - qmylm.o - -# matrix library -MATOBJ = matabs.o \ - matalloc.o \ - matarralloc.o\ - matarrfree.o \ - matcblasaux_lp.o \ - matcgau.o \ - matcheck.o \ - matclu.o \ - matcol.o \ - matconj.o \ - matcop.o \ - matdiff.o \ - matext.o \ - matfree.o \ - matins.o \ - matinv_lp.o \ - matmul_lp.o \ - matnattovht.o\ - matread.o \ - matrlu.o \ - matrow.o \ - matrm.o \ - matscal.o \ - matshow.o \ - matshowabs.o \ - matshowpar.o \ - matsqmod.o \ - mattrace.o \ - mattrans.o \ - matwrite.o - -# input for LEED programs -INPOBJ = linpbullayer.o \ - linpdebtemp.o \ - linpovllayer.o \ - linpphasend.o \ - linprdbulnd.o \ - linprdpar.o \ - linprdovlnd.o \ - linpshowbop.o - - # lreadpar.o - # lwritepar.o - # linpmatlm.o - -# output for LEED programs -OUTOBJ = loutbmlist.o \ - louthead.o \ - loutint.o - -# beams: -BEAMOBJ = lbmgen.o \ - lbmselect.o \ - lbmset.o - - # lbmrotmat.o \ - -# parameter control: -PCOBJ = lpcmktlnd.o \ - lpctemtl.o \ - lpcupdate.o - - # lpcmktl.o - -# layer doubling: -LDOBJ = lld2n.o \ - lld2lay.o \ - lld2layrpm.o \ - lldpotstep.o \ - lldpotstep0.o - -# multiple scattering: -MSOBJ = lmsbravlnd.o \ - lmscomplnd.o \ - lmslsumii.o \ - lmslsumij.o \ - lmspartinv.o \ - lmstmatii.o \ - lmstmatndii.o \ - lmstmatij.o \ - lmsymat.o \ - lmsymatset.o \ - lmsymmat.o \ - lmsypy.o - - # lmsbravl.o - # lmscompl.o - # lmsltok.o - -PRGOBJ = prgcheck.o - -TMAOBJ = lpccumtl.o \ - lpcmkms.o - - -LEEDOBJ = $(CPLOBJ) \ - $(QMOBJ) \ - $(MATOBJ) \ - $(INPOBJ) \ - $(OUTOBJ) \ - $(BEAMOBJ) \ - $(PCOBJ) \ - $(LDOBJ) \ - $(MSOBJ) \ - $(PRGOBJ) - -TMATOBJ = $(CPLOBJ) \ - $(QMOBJ) \ - $(MATOBJ) \ - $(INPOBJ) \ - $(PCOBJ) \ - $(PRGOBJ)\ - $(OUTOBJ) \ - $(BEAMOBJ) \ - $(LDOBJ) \ - $(MSOBJ) \ - $(TMAOBJ) - -TMATOBJ_531 = $(CPLOBJ) \ - $(QMOBJ) \ - $(MATOBJ) \ - $(INPOBJ) \ - $(PCOBJ) \ - $(PRGOBJ)\ - $(OUTOBJ_531) \ - $(BEAMOBJ) \ - $(LDOBJ) \ - $(MSOBJ) \ - $(TMAOBJ) - - -#============================================================================ -.c.o: ; $(CCOMP) $(CFLAGSSUB) $*.c -#============================================================================ -test_nsym_lp: test_nsym_lp.o $(TMATOBJ) - $(CCOMP) -o $(MYPRG)/LEED_NSYM_LP/test_nsym_lp $(CFLAGS) $(TMATOBJ) test_nsym_lp.c $(LDFLAGS) $(FLAGSBLAS) - rm -f test_nsym_lp.o -#============================================================================