Changeset bbc982 for ThirdParty/mpqc_open/src/lib

Timestamp:

Mar 2, 2017, 12:28:37 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

c2debc

Parents:

0035ea

git-author:

Frederik Heber <heber@…> (02/11/17 08:17:10)

git-committer:

Frederik Heber <heber@…> (03/02/17 12:28:37)

Message:

Various fixes to mpqc_open's configure.ac.

• using AC_CANONICAL_SYSTEM to set host and target.
• adding missing DEFINES to config header.
• adding more conditionals for mpi, armci, ...
• consolidating rename of several conditionals as COND_...
• src/lib/Makefile.am: conditionals are now generally prefixed with COND_.

Location:

ThirdParty/mpqc_open/src/lib

Files:

• Makefile.am (modified) (3 diffs)
• chemistry/cca/Makefile.am (modified) (1 diff)
• chemistry/qc/cints/Makefile.am (modified) (1 diff)
• chemistry/qc/intcca/Makefile.am (modified) (1 diff)
• util/group/Makefile.am (modified) (5 diffs)

ThirdParty/mpqc_open/src/lib/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib $(MPI_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib $(EXTRADEFINES) $(MPI_CXXFLAGS)
 AM_LDFLAGS = $(MPI_LDFLAGS)
 
@@ -16 +16 @@
 MKF77SYM= $(PERL) $(top_builddir)/bin/mkf77sym.pl
 
-if CONDCCA
+if COND_CCA
 include chemistry/cca/Makefile.am
 endif
@@ -22 +22 @@
 include chemistry/molecule/Makefile.am
 include chemistry/qc/basis/Makefile.am
-#include chemistry/qc/cints/Makefile.am
+
+if COND_LIBINT
+include chemistry/qc/cints/Makefile.am
+endif
+
 include chemistry/qc/dft/Makefile.am
-#include chemistry/qc/intcca/Makefile.am
+
+if COND_CCA
+include chemistry/qc/intcca/Makefile.am
+endif
+
 include chemistry/qc/intv3/Makefile.am
 include chemistry/qc/mbpt/Makefile.am
 
-if CONDLIBINT
+if COND_LIBINT
 include chemistry/qc/mbptr12/Makefile.am
 endif

ThirdParty/mpqc_open/src/lib/chemistry/cca/Makefile.am

@@ -48 +48 @@
 libSCcca_la_includedir = $(includedir)/chemistry/cca
 libSCcca_la_CPPFLAGS = $(AM_CPPFLAGS)
+if COND_LIBINT
+libSCcca_la_CPPFLAGS += -DHAVE_CINTS
+endif
 libSCcca_la_LDFLAGS = $(AM_LDFLAGS)
 libSCcca_la_LIBADD =

ThirdParty/mpqc_open/src/lib/chemistry/qc/cints/Makefile.am

@@ -100 +100 @@
         $(CINTSLIBS)
 
+if COND_LIBINT
+cintstest_LDADD += -lint
+endif
+if COND_LIBR12
+cintstest_LDADD += -lr12
+endif
+if COND_LIBDERIV
+cintstest_LDADD += -lderiv
+endif
 
 EXTRA_DIST += ./chemistry/qc/cints/cintstest.in

ThirdParty/mpqc_open/src/lib/chemistry/qc/intcca/Makefile.am

@@ -23 +23 @@
 noinst_LTLIBRARIES += libSCintcca.la
 libSCintcca_la_includedir = $(includedir)/chemistry/qc/intcca
-libSCintcca_la_CPPFLAGS = $(AM_CPPFLAGS)
-libSCintcca_la_LDFLAGS = $(AM_LDFLAGS)
-libSCintcca_la_LIBADD =
+libSCintcca_la_CPPFLAGS = $(AM_CPPFLAGS) 
+if COND_LIBINT
+libSCintcca_la_CPPFLAGS += -DHAVE_CINTS
+endif
+libSCintcca_la_CPPFLAGS += -DDMALLOC -I../../cca
+libSCintcca_la_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        -L$(CCAFE_LIB) -R$(CCAFE_LIB) \
+        -L$(BABEL_LIB) -R$(BABEL_LIB) \
+        -L$(CCA_CHEM_LIB) -R$(CCA_CHEM_LIB)
+libSCintcca_la_LIBADD = -lccafeCore -lsidl -lccachem_cxx_client -lccachem_cxx_server
 
 nobase_libSCintcca_la_include_HEADERS = ${LIBSCINTCCAHEADERS}

ThirdParty/mpqc_open/src/lib/util/group/Makefile.am

@@ -1 +1 @@
 LIBSCGROUPSOURCES = \
-        util/group/globcnt.cc \
         util/group/hcube.cc \
         util/group/memamsg.cc \
         util/group/memiter.cc \
         util/group/memmsg.cc \
-        util/group/memmtmpi.cc \
         util/group/memory.cc \
         util/group/memproc.cc \
         util/group/memrdma.cc \
-        util/group/memshm.cc \
         util/group/message.cc \
         util/group/messimpl.cc \
         util/group/messint.cc \
-        util/group/messmpi.cc \
         util/group/messproc.cc \
-        util/group/messshm.cc \
         util/group/mstate.cc \
         util/group/pool.cc \
@@ -21 +16 @@
         util/group/reduce.cc \
         util/group/rnglock.cc \
-        util/group/thpthd.cc \
         util/group/thread.cc \
         util/group/topology.cc
-
+        
 #       util/group/file.cc \
 #       util/group/fileproc.cc \
-#       util/group/memarmci.cc \
 #       util/group/thpuma.cc \
 #
 TESTSOURCES = \
+        util/group/mstate.cc \
         util/group/message.cc \
         util/group/messimpl.cc \
@@ -50 +44 @@
 
 LIBSCGROUPHEADERS = \
-        util/group/globcnt.h \
         util/group/hcube.h \
-        util/group/LIBS.h \
         util/group/linkage.h \
         util/group/memamsg.h \
         util/group/memiter.h \
         util/group/memmsg.h \
-        util/group/memmtmpi.h \
         util/group/memory.h \
         util/group/memproc.h \
         util/group/memrdma.h \
-        util/group/memshm.h \
         util/group/message.h \
         util/group/messaget.h \
-        util/group/messmpi.h \
-        util/group/messshm.h \
         util/group/mstate.h \
         util/group/pool.h \
         util/group/pregtime.h \
         util/group/rnglock.h \
-        util/group/thpthd.h \
         util/group/thread.h \
         util/group/topology.h
@@ -76 +63 @@
 #       util/group/file.h \
 #       util/group/fileproc.h \
-#       util/group/memarmci.h \
 #       util/group/thpuma.h \
 #
 TESTHEADERS = \
+        util/group/mstate.h \
         util/group/message.h \
         util/group/topology.h \
@@ -94 +81 @@
         util/group/memrdma.h
 
+if COND_SYSV_IPC
+LIBSCGROUPSOURCES += \
+        util/group/globcnt.cc \
+        util/group/memshm.cc \
+        util/group/messshm.cc
+LIBSCGROUPHEADERS += \
+        util/group/globcnt.h \
+        util/group/memshm.h \
+        util/group/messshm.h
+endif
+
+if COND_MPI
+LIBSCGROUPSOURCES += \
+        util/group/memmtmpi.cc \
+        util/group/messmpi.cc
+LIBSCGROUPHEADERS += \
+        util/group/memmtmpi.h \
+        util/group/messmpi.h
+endif
+
+if COND_ARMCI
+LIBSCGROUPSOURCES += \
+        util/group/memarmci.cc
+LIBSCGROUPHEADERS += \
+        util/group/memarmci.h
+endif
+
+if COND_PTHREAD
+LIBSCGROUPSOURCES += \
+        util/group/thpthd.cc
+LIBSCGROUPHEADERS += \
+        util/group/thpthd.h
+endif
+
 lib_LTLIBRARIES +=
 noinst_LTLIBRARIES += libSCgroup.la