Changeset a10cc0 for src


Ignore:
Timestamp:
Jul 6, 2012, 10:18:46 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:
7da5cd
Parents:
7546b0
git-author:
Frederik Heber <heber@…> (05/18/12 14:37:17)
git-committer:
Frederik Heber <heber@…> (07/06/12 10:18:46)
Message:

Moved all Fragmentation/Automation into new subpackage JobMarket.

  • adapted most files (which have been copied from sub-package LinearAlgebra).
  • adapted all Makefile.ams to splitting.
  • unit tests are ok.
  • there is one very strange issue: Whereas for LinearAlgebra in its header files a prefix of "LinearAlgebra/" is _not_ required (and even has been removed when LinearAlgebra was placed in its own folder), the same does not hold for "JobMarket/". Here, we have to use both includes, one with the prefix and one without.
  • NOTE: We force libJobMarket to be linked with c++ linker via dummy.cxx file.
  • Removed all reference to FRAGMENT... in JobMarket's Makefile.am.
Location:
src
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • src/Jobs/MPQCCommandJob.cpp

    r7546b0 ra10cc0  
    2626
    2727#include "MPQCCommandJob.hpp"
    28 
    29 // include headers that implement a archive in simple text format
    30 #include <boost/archive/text_oarchive.hpp>
    3128
    3229#include <boost/algorithm/string.hpp>

  • src/Jobs/MPQCCommandJob.hpp

    r7546b0 ra10cc0  
    1818#include <string>
    1919
    20 #include "Results/FragmentResult.hpp"
    21 #include "Jobs/SystemCommandJob.hpp"
     20#include "JobMarket/Results/FragmentResult.hpp"
     21#include "JobMarket/Jobs/SystemCommandJob.hpp"
    2222
    2323#include "Jobs/MPQCCommandJob_MPQCData.hpp"

  • src/Jobs/Makefile.am

    r7546b0 ra10cc0  
    1919libMolecuilderJobs_la_SOURCES = $(JOBSSOURCE)
    2020libMolecuilderJobs_la_LIBADD = \
    21   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
     21  $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    2222  $(BOOST_SERIALIZATION_LIBS) \
    2323  $(CodePatterns_LIBS)

  • src/Jobs/unittests/Makefile.am

    r7546b0 ra10cc0  
    3333MPQCCommandJobUnitTest_LDADD = \
    3434  ../libMolecuilderJobs.la \
    35   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
     35  $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    3636  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    3737  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \

  • src/Makefile.am

    r7546b0 ra10cc0  
    2525include UIElements/Makefile.am
    2626
    27 AM_LDFLAGS = -ldl ${BOOST_LDFLAGS}
     27AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
    2828AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    2929
    … …  
    248248
    249249
    250 INCLUDES = -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
     250INCLUDES = \
     251        -I$(top_srcdir)/src/unittests \
     252        -I$(top_srcdir)/src/Actions \
     253        -I$(top_srcdir)/src/UIElements \
     254        -I$(top_srcdir)/LinearAlgebra/src \
     255        -I$(top_srcdir)/JobMarket/src/JobMarket \
     256        -I$(top_srcdir)/JobMarket/src
    251257
    252258libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER}
    253259noinst_LIBRARIES = libmenu.a
    254 bin_PROGRAMS += molecuilder joiner analyzer
     260bin_PROGRAMS += molecuilder joiner analyzer Controller PoolWorker Server
    255261EXTRA_PROGRAMS = unity
    256262
    … …  
    358364        ControllerOptions.cpp \
    359365        ControllerOptions_MPQCCommandJob.cpp \
    360         DefaultOptions.cpp \
    361                                 Fragmentation/Automation/FragmentController.cpp
     366        DefaultOptions.cpp
    362367
    363368CONTROLLERHEADER = \
    364         Fragmentation/Automation/Connection.hpp \
    365369        controller_AddOn.hpp \
    366370        controller_MPQCCommandJob.hpp \
    … …  
    369373        ControllerOptions.hpp \
    370374        ControllerOptions_MPQCCommandJob.hpp \
    371         DefaultOptions.hpp \
    372                                 Fragmentation/Automation/FragmentController.hpp
     375        DefaultOptions.hpp
    373376
    374377EXTRA_DIST += \
    … …  
    385388libFragmentationAutomationController_la_SOURCES = $(CONTROLLERSOURCE)
    386389libFragmentationAutomationController_la_LIBADD = \
    387         $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la
     390        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
    388391
    389392POOLWORKERSOURCE = \
    390393        DefaultOptions.cpp \
    391         Fragmentation/Automation/Pool/PoolWorker.cpp \
    392394        SignalHandler.cpp \
    393395        SignalOptions.cpp \
    … …  
    396398POOLWORKERHEADER = \
    397399        DefaultOptions.hpp \
    398         Fragmentation/Automation/Connection.hpp \
    399         Fragmentation/Automation/Pool/PoolWorker.hpp \
    400400        SignalHandler.hpp \
    401401        SignalOptions.hpp \
    402         Fragmentation/Automation/WorkerChoices.hpp \
    403402        WorkerOptions.hpp
    404403
    … …  
    408407libFragmentationAutomationPoolWorker_la_SOURCES = $(POOLWORKERSOURCE)
    409408libFragmentationAutomationPoolWorker_la_LIBADD = \
    410         $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la
    411 
    412 POOLSOURCE = \
    413         Fragmentation/Automation/Pool/WorkerPool.cpp
    414 
    415 POOLHEADER = \
    416         Fragmentation/Automation/Pool/WorkerPool.hpp
    417 
    418 lib_LTLIBRARIES += libFragmentationAutomationPool.la
    419 libFragmentationAutomationPool_la_includedir = $(includedir)/MoleCuilder/JobMarket
    420 nobase_libFragmentationAutomationPool_la_include_HEADERS = $(POOLHEADER)
    421 libFragmentationAutomationPool_la_SOURCES = $(POOLSOURCE)
     409        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
    422410
    423411SERVERSOURCE = \
    424412        DefaultOptions.cpp \
    425         Fragmentation/Automation/FragmentScheduler.cpp \
    426413        ServerOptions.cpp \
    427414        SignalHandler.cpp \
    … …  
    430417SERVERHEADER = \
    431418        DefaultOptions.hpp \
    432         Fragmentation/Automation/Connection.hpp \
    433         Fragmentation/Automation/ControllerChoices.hpp \
    434         Fragmentation/Automation/FragmentScheduler.hpp \
    435419        ServerOptions.hpp \
    436420        SignalHandler.hpp \
    … …  
    442426libFragmentationAutomationServer_la_SOURCES = $(SERVERSOURCE)
    443427libFragmentationAutomationServer_la_LIBADD = \
    444         $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la
     428        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
    445429
    446430bin_PROGRAMS += Controller PoolWorker Server
    447431
    448432Controller_SOURCES = controller.cpp controller_main.cpp controller_main.hpp controller_AddOn_MPQCCommandJob.cpp
    449 Controller_LDFLAGS = $(AM_LDFLAGS)
     433Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
    450434Controller_CXXFLAGS = $(AM_CPPFLAGS)
    451435Controller_LDADD = \
    452436        libMolecuilderJobs.la \
    453437        libFragmentationAutomationController.la \
    454         libMolecuilderFragmentation.la \
    455         libMolecuilderHelpers.la \
    456         $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la \
     438        libMolecuilderFragmentation.la \
     439        libMolecuilderHelpers.la \
     440        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    457441        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    458442        ${CodePatterns_LIBS} \
    459         $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     443        $(BOOST_PROGRAM_OPTIONS_LIBS)
    460444
    461445PoolWorker_SOURCES = poolworker.cpp poolworker_main.cpp poolworker_main.hpp
    462 PoolWorker_LDFLAGS = $(AM_LDFLAGS)
     446PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
    463447PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)
    464448PoolWorker_LDADD = \
    465449        libMolecuilderJobs.la \
    466450        libFragmentationAutomationPoolWorker.la \
    467         $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la \
     451        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    468452        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    469453        ${CodePatterns_LIBS} \
    470         $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     454        $(BOOST_PROGRAM_OPTIONS_LIBS)
    471455
    472456Server_SOURCES = Server.cpp server_main.cpp server_main.hpp
    473 Server_LDFLAGS = $(AM_LDFLAGS)
     457Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
    474458Server_CXXFLAGS = $(AM_CPPFLAGS)
    475459Server_LDADD = \
    476460        libMolecuilderJobs.la \
    477461        libFragmentationAutomationServer.la \
    478         libFragmentationAutomationPool.la \
    479         $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la \
     462        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    480463        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    481464        ${CodePatterns_LIBS} \
    482         $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     465        $(BOOST_PROGRAM_OPTIONS_LIBS)
    483466
    484467

  • src/UIElements/Makefile.am

    r7546b0 ra10cc0  
    282282        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    283283        libMolecuilderRandomNumbers.la \
     284        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    284285        ${CodePatterns_LIBS} \
    285286        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/unittests/Makefile.am

    r7546b0 ra10cc0  
    2424include ../../src/UIElements/Menu/unittests/Makefile.am
    2525
    26 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/Fragmentation/Automation
     26INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/JobMarket/src -I$(top_srcdir)/JobMarket/src/JobMarket
    2727
    2828AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
Note: See TracChangeset for help on using the changeset viewer.