Changeset 004d5c for configure.ac

Timestamp:

Jul 10, 2012, 3:41:00 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

5ffa05

Parents:

c1d78c

git-author:

Frederik Heber <heber@…> (07/09/12 15:04:43)

git-committer:

Frederik Heber <heber@…> (07/10/12 15:41:00)

Message:

Removed JobMarket as it is now in its own repository.

• added ax_jobmarket.m4.
• added check to configure.ac
• Removed libraries libJobMarket... in Makefile.am's, replaced by JobMarket_..._LIBS.
• changed some includes that now required JobMarket/ prefix.

Larger change to get JobMarket including its tests out of MoleCuilder:

• configure has new enable-switch for JobMarket. Only then, we tests for its presence and usability (and also for boost::asio).
• I do not know how to check for AM_CONDITIONAL or config.h values properly in a shell. Hence, I moved all regression tests dealing with the JobMarket into their own folder tests/JobMarket with depends on CONDJOBMARKET whether its included or not, similar to tests/Python.
• TESTFIX: regression tests moved to tests/JobMarket have their paths changed.
• FragmentationAutomationAction is now conditionally compiled in as well.
• some Makefile.am's changed because we now have JobMarket_CFLAGS and _LIBS similar CodePatterns.
• We use boost::preprocessor to add it dependently on HAVE_JOBMARKET to src/Actions/GlobalListOfActions.
• TESTFIX: The former required a small change to CodeChecks test testsuite-globallistofactions_hpp as we can check no longer for the action name within brackets there.
• FIX: I removed some unnecessary includes (defs.hpp) from MPQCCommandJob...hpp into the .cpp files.

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -8 +8 @@
 AC_CONFIG_HEADER([config.h libmolecuilder_config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SUBDIRS([LinearAlgebra JobMarket])
+AC_CONFIG_SUBDIRS([LinearAlgebra])
 
 # parallel-tests: use parallel test druver
@@ -162 +162 @@
 
 # Boost headers with libraries
-BOOST_ASIO
 BOOST_FILESYSTEM
 BOOST_IOSTREAMS
@@ -173 +172 @@
 # CodePatterns library (needs boost/archive/iserializer.hpp before MemDebug.hpp)
 AM_PATH_CODEPATTERNS([1.2.2], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+
+# JobMarket library (needs boost/archive/iserializer.hpp before MemDebug.hpp)
+AC_ARG_ENABLE(
+  [jobmarket],
+  AS_HELP_STRING([--enable-jobmarket],[turn on JobMarket feature [default=yes]]),
+  enable_jobmarket=$enableval,
+  enable_jobmarket="yes")
+AC_MSG_RESULT($enable_jobmarket)
+AS_IF([test x"$enable_jobmarket" != x"no"],[
+  AM_PATH_JOBMARKET([1.0.0], $have_debug,[
+    # the following is only required if we have JobMarket
+    BOOST_ASIO
+    AC_DEFINE(HAVE_JOBMARKET,1, ["use JobMarket to calculate fragment jobs."])
+    ],[
+      enable_jobmarket="no"
+    ])
+]
+#[
+#  AC_DEFINE(HAVE_JOBMARKET,0, ["use JobMarket to calculate fragment jobs."])
+#]
+)
+AC_SUBST(HAVE_JOBMARKET)
+AM_CONDITIONAL([CONDJOBMARKET], [test x"$enable_jobmarket" = x"yes"])
 
 # Checks for header files.
@@ -273 +295 @@
 AC_CONFIG_FILES([tests/Fragmentations/molecuilder], [chmod +x tests/Fragmentations/molecuilder])
 
+AC_CONFIG_TESTDIR(tests/JobMarket)
+AC_CONFIG_FILES([
+  tests/JobMarket/atlocal 
+  tests/JobMarket/Makefile])
+AC_CONFIG_FILES([tests/JobMarket/molecuilder], [chmod +x tests/JobMarket/molecuilder])
+
 AC_CONFIG_TESTDIR(tests/regression)
 AC_CONFIG_FILES([