source: src/Fragmentation/Automation/Makefile.am@ ff60cfa

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
Last change on this file since ff60cfa was ff60cfa, checked in by Frederik Heber <heber@…>, 13 years ago

Controller has new function addjobs.

  • addjobs parses mpqc input file and creates MPQCCommandJob which is sent to send jobs
  • old sendjobs is now createjobs which creates empty SystemCommandJob.
  • added new class GlobalJobId which holds a global JobId such that FragmentJobs created by Controller each have a unique id. NOTE: This should probably be replaced by IdPool implementation when Fragmentation/Automation is integrated into rest of molecuilder.
  • dummyInit() to have MPQCCommandJob instances known to FragmentScheduler.
  • TESTFIX: Adapted regression tests Fragmentation/Automation adding-jobs, server-worker, and completerun due to command token change.
  • Property mode set to 100644
File size: 4.2 KB
RevLine 
[d0b3aca]1# PLEASE adhere to the alphabetical ordering in this Makefile!
2# Also indentation by a single tab
3
[cc276e]4INCLUDES = -I$(top_srcdir)/LinearAlgebra/src
5
[d0b3aca]6MOSTLYCLEANFILES =
7bin_PROGRAMS =
[b5ebb5]8TESTS =
9check_PROGRAMS =
10noinst_PROGRAMS =
[cde0fe]11noinst_LTLIBRARIES =
12
13# PLEASE adhere to the alphabetical ordering in this Makefile!
14# Also indentation by a single tab
15
16FRAGMENTJOBSSOURCE = \
17 FragmentQueue.cpp \
[f0834d]18 JobId.cpp \
[7670865]19 Jobs/FragmentJob.cpp \
[cc276e]20 Jobs/MPQCCommandJob.cpp \
21 Jobs/MPQCCommandJob_MPQCData.cpp \
[d920b9]22 Jobs/SystemCommandJob.cpp \
[7670865]23 Results/FragmentResult.cpp
[cde0fe]24
25FRAGMENTJOBSHEADER = \
26 FragmentQueue.hpp \
[f0834d]27 JobId.hpp \
[7670865]28 Jobs/FragmentJob.hpp \
[cc276e]29 Jobs/MPQCCommandJob.hpp \
30 Jobs/MPQCCommandJob_MPQCData.hpp \
[d920b9]31 Jobs/SystemCommandJob.hpp \
[7670865]32 Results/FragmentResult.hpp
[cde0fe]33
34noinst_LTLIBRARIES += libMolecuilderFragmentJobs.la
35libMolecuilderFragmentJobs_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
[1dc209]36nobase_libMolecuilderFragmentJobs_la_include_HEADERS = $(FRAGMENTJOBSHEADER)
[cc276e]37libMolecuilderFragmentJobs_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
38libMolecuilderFragmentJobs_la_LDFLAGS = $(AM_LDFLAGS)
[1dc209]39libMolecuilderFragmentJobs_la_SOURCES = $(FRAGMENTJOBSSOURCE)
[d920b9]40libMolecuilderFragmentJobs_la_LIBADD = \
41 $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
42 $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS)
[cde0fe]43
44FRAGMENTATIONAUTOMATIONSOURCE = \
[1dc209]45 atexit.cpp \
[7ca772]46 Controller/CommandRegistry.cpp \
[73d6fc]47 Controller/FragmentController.cpp \
[167b63]48 Controller/Commands/CheckResultsOperation.cpp \
49 Controller/Commands/Operation.cpp \
50 Controller/Commands/ReceiveJobsOperation.cpp \
51 Controller/Commands/SendResultsOperation.cpp \
[ff60cfa]52 Controller/Commands/ShutdownOperation.cpp \
53 GlobalJobId.cpp
[cde0fe]54
55FRAGMENTATIONAUTOMATIONHEADER = \
[1dc209]56 atexit.hpp \
57 Connection.hpp \
58 ControllerChoices.hpp \
[7ca772]59 Controller/CommandRegistry.hpp \
[73d6fc]60 Controller/FragmentController.hpp \
[167b63]61 Controller/Commands/CheckResultsOperation.hpp \
62 Controller/Commands/Operation.hpp \
63 Controller/Commands/ReceiveJobsOperation.hpp \
64 Controller/Commands/SendResultsOperation.hpp \
[ff60cfa]65 Controller/Commands/ShutdownOperation.hpp \
66 GlobalJobId.hpp
[cde0fe]67
68noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la
69libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
[1dc209]70nobase_libMolecuilderFragmentationAutomation_la_include_HEADERS = $(FRAGMENTATIONAUTOMATIONHEADER)
71libMolecuilderFragmentationAutomation_la_SOURCES = $(FRAGMENTATIONAUTOMATIONSOURCE)
[b5ebb5]72
73include unittests/Makefile.am
[d0b3aca]74
75AM_LDFLAGS = -ldl ${BOOST_LDFLAGS}
76AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
77
[7ca772]78bin_PROGRAMS += Controller Server Worker
[db03d9]79
[1dc209]80CONTROLLERSOURCE =
[db03d9]81
82CONTROLLERHEADER = \
83 FragmentController.hpp
[d0b3aca]84
[b05673]85SERVERSOURCE = \
[db03d9]86 FragmentScheduler.cpp
[b05673]87
88SERVERHEADER = \
[af3aed]89 Connection.hpp \
[778abb]90 ControllerChoices.hpp \
[cde0fe]91 FragmentScheduler.hpp
[b05673]92
93WORKERSOURCE = \
94 FragmentWorker.cpp \
95 Worker.cpp
96
97WORKERHEADER = \
98 Connection.hpp \
[cde0fe]99 FragmentWorker.hpp
[b05673]100
[7ca772]101Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp
102Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
103Controller_CXXFLAGS = $(AM_CPPFLAGS)
104Controller_LDADD = \
[778abb]105 libMolecuilderFragmentationAutomation.la \
[1dc209]106 libMolecuilderFragmentJobs.la \
[db03d9]107 $(BOOST_ASIO_LIBS) \
108 $(BOOST_SERIALIZATION_LIBS) \
109 $(BOOST_THREAD_LIBS) \
110 $(BOOST_SYSTEM_LIBS) \
111 ${CodePatterns_LIBS}
112
113Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp
[b14f17]114Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
115Server_CXXFLAGS = $(AM_CPPFLAGS)
116Server_LDADD = \
[cde0fe]117 libMolecuilderFragmentationAutomation.la \
[1dc209]118 libMolecuilderFragmentJobs.la \
[72eaf7f]119 $(BOOST_ASIO_LIBS) \
120 $(BOOST_SERIALIZATION_LIBS) \
[d0b3aca]121 $(BOOST_THREAD_LIBS) \
[72eaf7f]122 $(BOOST_SYSTEM_LIBS) \
123 ${CodePatterns_LIBS}
124
[b05673]125Worker_SOURCES = $(WORKERSOURCE) $(WORKERHEADER)
[b14f17]126Worker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
127Worker_CXXFLAGS = $(AM_CPPFLAGS)
128Worker_LDADD = \
[cde0fe]129 libMolecuilderFragmentationAutomation.la \
[1dc209]130 libMolecuilderFragmentJobs.la \
[d0b3aca]131 $(BOOST_ASIO_LIBS) \
[72eaf7f]132 $(BOOST_SERIALIZATION_LIBS) \
133 $(BOOST_THREAD_LIBS) \
134 $(BOOST_SYSTEM_LIBS) \
135 ${CodePatterns_LIBS}
[d0b3aca]136
Note: See TracBrowser for help on using the repository browser.