Changeset cde0fe for src


Ignore:
Timestamp:
May 4, 2012, 2:19:07 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:
8ee5ac
Parents:
9875cc
git-author:
Frederik Heber <heber@…> (11/27/11 22:57:39)
git-committer:
Frederik Heber <heber@…> (05/04/12 14:19:07)
Message:

Placed FragmentJob, ..Queue, and ..Result into convenience library, atexit into another.

  • this speeds up compilation as we don't have to compile some modules multiple times.
Location:
src/Fragmentation/Automation
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Automation/Makefile.am

    r9875cc rcde0fe  
    77check_PROGRAMS =
    88noinst_PROGRAMS =
     9noinst_LTLIBRARIES =
     10
     11# PLEASE adhere to the alphabetical ordering in this Makefile!
     12# Also indentation by a single tab
     13
     14FRAGMENTJOBSSOURCE = \
     15  FragmentJob.cpp \
     16  FragmentQueue.cpp \
     17  FragmentResult.cpp \
     18  JobId.cpp
     19         
     20FRAGMENTJOBSHEADER = \
     21  FragmentJob.hpp \
     22  FragmentQueue.hpp \
     23  FragmentResult.hpp \
     24  JobId.hpp
     25
     26noinst_LTLIBRARIES += libMolecuilderFragmentJobs.la
     27libMolecuilderFragmentJobs_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
     28nobase_libMolecuilderFragmentJobs_la_include_HEADERS = ${FRAGMENTJOBSHEADER}
     29libMolecuilderFragmentJobs_la_SOURCES = ${FRAGMENTJOBSSOURCE}
     30
     31FRAGMENTATIONAUTOMATIONSOURCE = \
     32  atexit.cpp
     33
     34FRAGMENTATIONAUTOMATIONHEADER = \
     35  atexit.hpp
     36
     37noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la
     38libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
     39nobase_libMolecuilderFragmentationAutomation_la_include_HEADERS = ${FRAGMENTATIONAUTOMATIONHEADER}
     40libMolecuilderFragmentationAutomation_la_SOURCES = ${FRAGMENTATIONAUTOMATIONSOURCE}
    941
    1042include unittests/Makefile.am
    … …  
    1648
    1749SERVERSOURCE = \
    18   atexit.cpp \
    19   FragmentJob.cpp \
    20   FragmentQueue.cpp \
    21   FragmentResult.cpp \
    2250  FragmentScheduler.cpp \
    23   JobId.cpp \
    2451  Server.cpp
    2552
    2653SERVERHEADER = \
    27   atexit.hpp \
    2854  Connection.hpp \
    29   FragmentJob.hpp \
    30   FragmentQueue.hpp \
    31   FragmentResult.hpp \
    32   FragmentScheduler.hpp \
    33   JobId.hpp
     55  FragmentScheduler.hpp
    3456
    3557WORKERSOURCE = \
    36   atexit.cpp \
    37   FragmentJob.cpp \
    38   FragmentResult.cpp \
    3958  FragmentWorker.cpp \
    40   JobId.cpp \
    4159  Worker.cpp
    4260
    4361WORKERHEADER = \
    44   atexit.hpp \
    4562  Connection.hpp \
    46   FragmentJob.hpp \
    47   FragmentResult.hpp \
    48   FragmentWorker.hpp \
    49   JobId.hpp
     63  FragmentWorker.hpp
    5064
    5165Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER)
    … …  
    5367Server_CXXFLAGS = $(AM_CPPFLAGS)
    5468Server_LDADD = \
     69  libMolecuilderFragmentJobs.la \
     70  libMolecuilderFragmentationAutomation.la \
    5571  $(BOOST_ASIO_LIBS) \
    5672  $(BOOST_SERIALIZATION_LIBS) \
    … …  
    6379Worker_CXXFLAGS = $(AM_CPPFLAGS)
    6480Worker_LDADD = \
     81  libMolecuilderFragmentJobs.la \
     82  libMolecuilderFragmentationAutomation.la \
    6583  $(BOOST_ASIO_LIBS) \
    6684  $(BOOST_SERIALIZATION_LIBS) \

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

    r9875cc rcde0fe  
    2323
    2424FRAGMENTATIONAUTOMATIONLIBS = \
     25  libMolecuilderFragmentJobs.la \
    2526  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    2627  $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
    … …  
    4849FragmentQueueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    4950  unittests/FragmentQueueUnitTest.cpp \
    50   unittests/FragmentQueueUnitTest.hpp \
    51   FragmentJob.cpp \
    52   FragmentJob.hpp \
    53   FragmentQueue.cpp \
    54   FragmentQueue.hpp \
    55   FragmentResult.cpp \
    56   FragmentResult.hpp \
    57   JobId.cpp \
    58   JobId.hpp
     51  unittests/FragmentQueueUnitTest.hpp
    5952FragmentQueueUnitTest_LDADD = \
     53  libMolecuilderFragmentJobs.la \
    6054  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    6155  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    … …  
    6660FragmentResultUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    6761  unittests/FragmentResultUnitTest.cpp \
    68   unittests/FragmentResultUnitTest.hpp \
    69   FragmentResult.cpp \
    70   FragmentResult.hpp \
    71   JobId.cpp \
    72   JobId.hpp
     62  unittests/FragmentResultUnitTest.hpp
    7363FragmentResultUnitTest_LDADD = \
     64  libMolecuilderFragmentJobs.la \
    7465  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    7566  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
Note: See TracChangeset for help on using the changeset viewer.