Commit: f583b1106240c501bb33960056e2589f860c7b1b - MolDS (git)

Commit MetaInfo

• Revisión: f583b1106240c501bb33960056e2589f860c7b1b (tree)
• Tiempo: 2013-10-04 14:25:40
• Autor: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

Makefile_FX10 is modified for optimization on FX10. #32094

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/fx10@1534 1136aad2-a195-0410-b898-f5ea1d11b9d8

Cambiar Resumen

• modified: src/Makefile_FX10

Diferencia incremental

--- a/src/Makefile_FX10
+++ b/src/Makefile_FX10
@@ -18,24 +18,15 @@
 #// along with MolDS.  If not, see <http://www.gnu.org/licenses/>.         // 
 #//************************************************************************//
 CC = mpiFCCpx
-#CFLAGS = -Kfast,openmp -SSL2BLAMP -Xg
-CFLAGS = -O0 -Kopenmp -SSL2BLAMP -Xg
+CFLAGS = -Kfast,openmp -SSL2BLAMP -Xg
 BOOST_TOP_DIR = /home/n0011/n001101/opt/boost/boost1.49.0/
 BOOST_INC_DIR = $(BOOST_TOP_DIR)include/
 BOOST_LIB_DIR = $(BOOST_TOP_DIR)lib/
 BOOST_LIBS    = -lboost
-#OPENBLAS_TOP_DIR = /usr/local/openblas/
-#OPENBLAS_INC_DIR = $(OPENBLAS_TOP_DIR)include/
-#OPENBLAS_LIB_DIR = $(OPENBLAS_TOP_DIR)lib/
-#OPENBLAS_LIBS    = -lopenblas
-#LIBSBASE = -lpthread -lgomp
-#LIBS = $(LIBSBASE) $(BOOST_LIBS) $(OPENBLAS_LIBS)
-#LIBS = $(LIBSBASE) $(BOOST_LIBS) 
 LIBS = $(BOOST_LIBS) 
 EXENAME = MolDS.out
 DEPFILE = obj/objfile.dep
-#LDFLAGS = -Kfast,openmp -SSL2BLAMP -Xg
-LDFLAGS = -O0 -Kopenmp -SSL2BLAMP -Xg
+LDFLAGS = -Kfast,openmp -SSL2BLAMP -Xg
 
 ALL_CPP_FILES  = base/Enums.cpp                   base/PrintController.cpp base/MolDSException.cpp                                     base/MallocerFreer.cpp              mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Satom.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/RealSphericalHarmonicsIndex.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp                            cndo/Cndo2.cpp                                    indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp  base/MolDS.cpp     Main.cpp
 ALL_HEAD_FILES = base/Enums.h   base/Uncopyable.h base/PrintController.h   base/MolDSException.h   base/containers/ThreadSafeQueue.h   base/MallocerFreer.h   mpi/MpiInt.h mpi/MpiProcess.h   mpi/AsyncCommunicator.h   wrappers/Blas.h   wrappers/Lapack.h   base/Utilities.h   base/MathUtilities.h   base/EularAngle.h   base/Parameters.h   base/atoms/Atom.h   base/atoms/Hatom.h   base/atoms/Liatom.h   base/atoms/Catom.h   base/atoms/Natom.h   base/atoms/Oatom.h   base/atoms/Satom.h   base/factories/AtomFactory.h   base/Molecule.h   base/InputParser.h   base/GTOExpansionSTO.h   base/RealSphericalHarmonicsIndex.h   base/loggers/MOLogger.h   base/loggers/DensityLogger.h   base/loggers/HoleDensityLogger.h   base/loggers/ParticleDensityLogger.h   base/ElectronicStructure.h cndo/Cndo2.h   cndo/ReducedOverlapAOsParameters.h indo/Indo.h   zindo/ZindoS.h   mndo/Mndo.h   am1/Am1.h   am1/Am1D.h   pm3/Pm3.h   pm3/Pm3D.h   pm3/Pm3Pddg.h   base/factories/ElectronicStructureFactory.h   md/MD.h   mc/MC.h   rpmd/RPMD.h   nasco/NASCO.h   optimization/Optimizer.h   optimization/ConjugateGradient.h   optimization/SteepestDescent.h   optimization/BFGS.h   optimization/GEDIIS.h   base/factories/OptimizerFactory.h    base/MolDS.h
@@ -43,7 +34,6 @@ ALL_OBJ_FILES  =  obj/Enums.o                      obj/PrintController.o    obj/
 
 $(EXENAME): $(ALL_OBJ_FILES)
 	$(CC) -o $@ $(LDFLAGS) -Wl,-rpath=$(BOOST_LIB_DIR) $(LDFLAGS) $(ALL_OBJ_FILES) -L$(BOOST_LIB_DIR) $(LIBS)
-#	$(CC) -o $@ $(LDFLAGS) -Wl,-rpath=$(BOOST_LIB_DIR) -Wl,-rpath=$(OPENBLAS_LIB_DIR) $(LDFLAGS) $(ALL_OBJ_FILES) -L$(BOOST_LIB_DIR) -L$(OPENBLAS_LIB_DIR) $(LIBS)
 
 -include $(DEPFILE)
 
@@ -54,10 +44,8 @@ depend:
 
 $(DEPFILE): Makefile_FX10
 	$(CC) -MM $(ALL_CPP_FILES) -I$(BOOST_INC_DIR) | sed 's/^\([^ ]\)/obj\/\1/g' | sed 's/\($$*\)\.o[ :]*/\1.o : /g'  > $(DEPFILE)
-#	$(CC) -MM $(ALL_CPP_FILES) -I$(BOOST_INC_DIR) -I$(OPENBLAS_INC_DIR) | sed 's/^\([^ ]\)/obj\/\1/g' | sed 's/\($$*\)\.o[ :]*/\1.o : /g'  > $(DEPFILE)
 $(ALL_OBJ_FILES):
 	$(CC) -I$(BOOST_INC_DIR) -o $@ $< $(CFLAGS) -c
-#	$(CC) -I$(BOOST_INC_DIR) -I$(OPENBLAS_INC_DIR) -o $@ $< $(CFLAGS) -c
 .PHONY: clean
 clean:
 	rm -f $(ALL_OBJ_FILES) $(EXENAME) $(DEPFILE)