Changeset cc5db5 for src


Ignore:
Timestamp:
Jul 6, 2012, 10:18:43 AM (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:
311137
Parents:
c586d8
git-author:
Frederik Heber <heber@…> (06/06/12 15:40:14)
git-committer:
Frederik Heber <heber@…> (07/06/12 10:18:43)
Message:

Moved all MPQCCommand... to src/Jobs, controller,server,poolworker to src/.

  • this is preparatory for moving stuff in Fragmentation/Automation into own subpackage JobMarket.
  • first, we need to split off dependencies of Fragmentation/Automation on modules in src/Fragmentation (which is MPQC-related stuff).
  • added src/Fragmentation/Automation to INCLUDES for the moment.
  • TESTFIX: changed all executable paths in regression tests Fragmentation/ Automation.
Location:
src
Files:
2 added
4 edited
11 moved

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Automation/Makefile.am

    rc586d8 rcc5db5  
    1818  JobId.cpp \
    1919  Jobs/FragmentJob.cpp \
    20   Jobs/MPQCCommandJob.cpp \
    21   Jobs/MPQCCommandJob_MPQCData.cpp \
    2220  Jobs/SystemCommandJob.cpp \
    2321  Results/FragmentResult.cpp
    … …  
    2725  JobId.hpp \
    2826  Jobs/FragmentJob.hpp \
    29   Jobs/MPQCCommandJob.hpp \
    30   Jobs/MPQCCommandJob_MPQCData.hpp \
    3127  Jobs/SystemCommandJob.hpp \
    3228  Results/FragmentResult.hpp
    … …  
    106102include unittests/Makefile.am
    107103
    108 AM_LDFLAGS = -ldl ${BOOST_LDFLAGS}
    109 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    110 
    111 bin_PROGRAMS += Controller PoolWorker Server
    112 
    113 CONTROLLERSOURCE = \
    114   FragmentController.cpp \
    115   Operations/OperationRegistry.cpp
    116 
    117 CONTROLLERHEADER = \
    118   Connection.hpp \
    119   FragmentController.hpp \
    120   Operations/OperationRegistry.hpp
    121 
    122 POOLWORKERSOURCE = \
    123   Pool/PoolWorker.cpp
    124 
    125 POOLWORKERHEADER = \
    126   Connection.hpp \
    127   Pool/PoolWorker.hpp
    128 
    129 SERVERSOURCE = \
    130   FragmentScheduler.cpp \
    131   Pool/WorkerPool.cpp
    132 
    133 SERVERHEADER = \
    134   Connection.hpp \
    135   ControllerChoices.hpp \
    136   FragmentScheduler.hpp \
    137   Pool/WorkerPool.hpp
    138 
    139 Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp
    140 Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
    141 Controller_CXXFLAGS = $(AM_CPPFLAGS)
    142 Controller_LDADD = \
    143   libMolecuilderFragmentationAutomationHelper.la \
    144   libMolecuilderFragmentationOperations.la \
    145   libMolecuilderFragmentJobs.la \
    146   $(top_builddir)/src/libMolecuilderFragmentation.la \
    147   $(top_builddir)/src/libMolecuilderHelpers.la \
    148   $(BOOST_ASIO_LIBS) \
    149   $(BOOST_SERIALIZATION_LIBS) \
    150   $(BOOST_PROGRAM_OPTIONS_LIBS) \
    151   $(BOOST_THREAD_LIBS) \
    152   $(BOOST_SYSTEM_LIBS) \
    153   ${CodePatterns_LIBS}
    154 
    155 PoolWorker_SOURCES = $(POOLWORKERSOURCE) $(POOLWORKERHEADER) poolworker.cpp
    156 PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
    157 PoolWorker_CXXFLAGS = $(AM_CPPFLAGS) $(BOOST_ASIO_DEBUG)
    158 PoolWorker_LDADD = \
    159   libMolecuilderFragmentationAutomationHelper.la \
    160   libMolecuilderFragmentationOperations.la \
    161   libMolecuilderFragmentJobs.la \
    162   $(BOOST_ASIO_LIBS) \
    163   $(BOOST_SERIALIZATION_LIBS) \
    164   $(BOOST_PROGRAM_OPTIONS_LIBS) \
    165   $(BOOST_THREAD_LIBS) \
    166   $(BOOST_SYSTEM_LIBS) \
    167   ${CodePatterns_LIBS}
    168 
    169 Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp
    170 Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
    171 Server_CXXFLAGS = $(AM_CPPFLAGS)
    172 Server_LDADD = \
    173   libMolecuilderFragmentationAutomationHelper.la \
    174   libMolecuilderFragmentationOperations.la \
    175   libMolecuilderFragmentJobs.la \
    176   $(BOOST_ASIO_LIBS) \
    177   $(BOOST_SERIALIZATION_LIBS) \
    178   $(BOOST_PROGRAM_OPTIONS_LIBS) \
    179   $(BOOST_THREAD_LIBS) \
    180   $(BOOST_SYSTEM_LIBS) \
    181   ${CodePatterns_LIBS}
    182 

  • src/Fragmentation/Automation/unittests/Makefile.am

    rc586d8 rcc5db5  
    66  unittests/FragmentResultUnitTest.cpp \
    77  unittests/FragmentQueueUnitTest.cpp \
    8   unittests/MPQCCommandJobUnitTest.cpp \
    9   unittests/MPQCDataUnitTest.cpp \
    108  unittests/OperationQueueUnitTest.cpp \
    119  unittests/SystemCommandJobUnitTest.cpp \
    … …  
    1715  unittests/FragmentResultUnitTest.hpp \
    1816  unittests/FragmentQueueUnitTest.hpp \
    19   unittests/MPQCCommandJobUnitTest.hpp \
    20   unittests/MPQCDataUnitTest.hpp \
    2117  unittests/OperationQueueUnitTest.hpp \
    2218  unittests/SystemCommandJobUnitTest.hpp \
    … …  
    2824  FragmentResultUnitTest \
    2925  FragmentQueueUnitTest \
    30   MPQCCommandJobUnitTest \
    31   MPQCDataUnitTest \
    3226  OperationQueueUnitTest \
    3327  SystemCommandJobUnitTest \
    … …  
    8680  unittests/FragmentResultUnitTest.hpp
    8781FragmentResultUnitTest_LDADD = \
    88   libMolecuilderFragmentJobs.la \
    89   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    90   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    91   ${CodePatterns_LIBS}
    92 
    93 MPQCCommandJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    94 MPQCCommandJobUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    95 MPQCCommandJobUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    96   unittests/MPQCCommandJobUnitTest.cpp \
    97   unittests/MPQCCommandJobUnitTest.hpp
    98 MPQCCommandJobUnitTest_LDADD = \
    99   libMolecuilderFragmentJobs.la \
    100   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    101   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    102   ${CodePatterns_LIBS}
    103 
    104 MPQCDataUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    105 MPQCDataUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    106 MPQCDataUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    107   unittests/MPQCDataUnitTest.cpp \
    108   unittests/MPQCDataUnitTest.hpp
    109 MPQCDataUnitTest_LDADD = \
    11082  libMolecuilderFragmentJobs.la \
    11183  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Makefile.am

    rc586d8 rcc5db5  
    1717include Graph/Makefile.am
    1818include Helpers/Makefile.am
     19include Jobs/Makefile.am
    1920include LinkedCell/Makefile.am
    2021include Parser/Makefile.am
    … …  
    246247
    247248
    248 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements -I$(top_srcdir)/LinearAlgebra/src
     249INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/Fragmentation/Automation
    249250
    250251libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER}
    … …  
    351352        $(BOOST_THREAD_LIBS)
    352353
     354
     355bin_PROGRAMS += Controller PoolWorker Server
     356
     357CONTROLLERSOURCE = \
     358  Fragmentation/Automation/FragmentController.cpp \
     359  Fragmentation/Automation/Operations/OperationRegistry.cpp
     360
     361CONTROLLERHEADER = \
     362  Fragmentation/Automation/Connection.hpp \
     363  Fragmentation/Automation/FragmentController.hpp \
     364  Fragmentation/Automation/Operations/OperationRegistry.hpp
     365
     366POOLWORKERSOURCE = \
     367  Fragmentation/Automation/Pool/PoolWorker.cpp
     368
     369POOLWORKERHEADER = \
     370  Fragmentation/Automation/Connection.hpp \
     371  Fragmentation/Automation/Pool/PoolWorker.hpp
     372
     373SERVERSOURCE = \
     374  Fragmentation/Automation/FragmentScheduler.cpp \
     375  Fragmentation/Automation/Pool/WorkerPool.cpp
     376
     377SERVERHEADER = \
     378  Fragmentation/Automation/Connection.hpp \
     379  Fragmentation/Automation/ControllerChoices.hpp \
     380  Fragmentation/Automation/FragmentScheduler.hpp \
     381  Fragmentation/Automation/Pool/WorkerPool.hpp
     382
     383Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp
     384Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
     385Controller_CXXFLAGS = $(AM_CPPFLAGS)
     386Controller_LDADD = \
     387  libMolecuilderJobs.la \
     388  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationAutomationHelper.la \
     389  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationOperations.la \
     390  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
     391  libMolecuilderFragmentation.la \
     392  libMolecuilderHelpers.la \
     393  $(BOOST_ASIO_LIBS) \
     394  $(BOOST_SERIALIZATION_LIBS) \
     395  $(BOOST_PROGRAM_OPTIONS_LIBS) \
     396  $(BOOST_THREAD_LIBS) \
     397  $(BOOST_SYSTEM_LIBS) \
     398  ${CodePatterns_LIBS}
     399
     400PoolWorker_SOURCES = $(POOLWORKERSOURCE) $(POOLWORKERHEADER) poolworker.cpp
     401PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
     402PoolWorker_CXXFLAGS = $(AM_CPPFLAGS) $(BOOST_ASIO_DEBUG)
     403PoolWorker_LDADD = \
     404  libMolecuilderJobs.la \
     405  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationAutomationHelper.la \
     406  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationOperations.la \
     407  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
     408  $(BOOST_ASIO_LIBS) \
     409  $(BOOST_SERIALIZATION_LIBS) \
     410  $(BOOST_PROGRAM_OPTIONS_LIBS) \
     411  $(BOOST_THREAD_LIBS) \
     412  $(BOOST_SYSTEM_LIBS) \
     413  ${CodePatterns_LIBS}
     414
     415Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp
     416Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
     417Server_CXXFLAGS = $(AM_CPPFLAGS)
     418Server_LDADD = \
     419  libMolecuilderJobs.la \
     420  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationAutomationHelper.la \
     421  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationOperations.la \
     422  $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
     423  $(BOOST_ASIO_LIBS) \
     424  $(BOOST_SERIALIZATION_LIBS) \
     425  $(BOOST_PROGRAM_OPTIONS_LIBS) \
     426  $(BOOST_THREAD_LIBS) \
     427  $(BOOST_SYSTEM_LIBS) \
     428  ${CodePatterns_LIBS}
     429
     430
    353431unity_SOURCES = unity.cpp
    354432unity_CXXFLAGS = $(AM_CPPFLAGS)

  • src/Server.cpp

    rc586d8 rcc5db5  
    3131#include <signal.h>
    3232
    33 #include "atexit.hpp"
     33#include "Fragmentation/Automation/atexit.hpp"
    3434#include "CodePatterns/Info.hpp"
    3535#include "CodePatterns/Log.hpp"
    36 #include "FragmentScheduler.hpp"
     36#include "Fragmentation/Automation/FragmentScheduler.hpp"
    3737
    3838

  • src/controller.cpp

    rc586d8 rcc5db5  
    3737#include <vector>
    3838
    39 #include "atexit.hpp"
     39#include "Fragmentation/Automation/atexit.hpp"
    4040#include "CodePatterns/Info.hpp"
    4141#include "CodePatterns/Log.hpp"
    … …  
    4747#include "Jobs/MPQCCommandJob.hpp"
    4848#include "Jobs/MPQCCommandJob_MPQCData.hpp"
    49 #include "Jobs/SystemCommandJob.hpp"
    50 #include "Results/FragmentResult.hpp"
     49#include "Fragmentation/Automation/Jobs/SystemCommandJob.hpp"
     50#include "Fragmentation/Automation/Results/FragmentResult.hpp"
    5151
    5252enum CommandIndices {

  • src/poolworker.cpp

    rc586d8 rcc5db5  
    3434#include <vector>
    3535
    36 #include "atexit.hpp"
     36#include "Fragmentation/Automation/atexit.hpp"
    3737#include "CodePatterns/Info.hpp"
    3838#include "CodePatterns/Log.hpp"
    39 #include "Pool/PoolWorker.hpp"
     39#include "Fragmentation/Automation/Pool/PoolWorker.hpp"
    4040
    4141//!> global shutdown function

  • src/unittests/Makefile.am

    rc586d8 rcc5db5  
    1515include ../../src/Fragmentation/unittests/Makefile.am
    1616include ../../src/Graph/unittests/Makefile.am
     17include ../../src/Jobs/unittests/Makefile.am
    1718include ../../src/LinkedCell/unittests/Makefile.am
    1819include ../../src/Parser/unittests/Makefile.am
    … …  
    2324include ../../src/UIElements/Menu/unittests/Makefile.am
    2425
    25 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
     26INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/Fragmentation/Automation
    2627
    2728AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
Note: See TracChangeset for help on using the changeset viewer.