Changeset ef7b4b


Ignore:
Timestamp:
Mar 15, 2017, 6:15:56 PM (8 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable
Children:
6ec999
Parents:
86f27c
git-author:
Frederik Heber <heber@…> (03/14/17 21:59:48)
git-committer:
Frederik Heber <heber@…> (03/15/17 18:15:56)
Message:

ENABLEFIX: disable-jobmarket is now working.

  • needed to add additional results for parse/save-fragment-results regression test in case of no jobmarket.
  • MPQCJob_Work lacked include in ndef HAVE_JOBMARKET case.
  • should not compile mpqc_extract without JobMarket.
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • src/Jobs/MPQCJob_Work.cpp

    r86f27c ref7b4b  
    3737#include "CodePatterns/Log.hpp"
    3838
     39#include <boost/archive/text_oarchive.hpp>
    3940#ifdef HAVE_JOBMARKET
    4041// include headers that implement a archive in simple text format
    4142// otherwise BOOST_CLASS_EXPORT_IMPLEMENT has no effect
    42 #include <boost/archive/text_oarchive.hpp>
    4343#include <boost/archive/text_iarchive.hpp>
    4444#include <boost/tokenizer.hpp>

  • src/Jobs/Makefile.am

    r86f27c ref7b4b  
    5656
    5757lib_LTLIBRARIES += \
    58         libMolecuilderJobs.la \
     58        libMolecuilderJobs.la
     59if CONDJOBMARKET
     60lib_LTLIBRARIES += \
    5961        libmolecuilder_mpqc_extract.la
     62endif
    6063noinst_LTLIBRARIES += \
    6164        libMolecuilderJobs_Work.la
    6265
    6366### libmolecuilder_mpqc_extract.la
     67if CONDJOBMARKET
    6468libmolecuilder_mpqc_extract_la_SOURCES = \
    6569        Jobs/mpqc_extract.cc \
    … …  
    8387        libMolecuilderFragmentationSummation.la \
    8488        -lboost_serialization
     89endif
    8590
    8691### libMolecuilderJobs_Work.la

  • tests/regression/Fragmentation/ParseSaveFragmentResults/testsuite-fragmentation-parse-save-fragment-results.at

    r86f27c ref7b4b  
    3232# we ignore white space changes (also missing new line on end of last line)
    3333AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
    34         AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore])
     34        AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
     35                AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     36        ])
    3537])
    3638
    … …  
    4042AT_CHECK([../../molecuilder --parse-fragment-results $file --save-fragment-results $newfile], 0, [ignore], [ignore])
    4143AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
    42         AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore])
     44        AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
     45                AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     46        ])
    4347])
    4448
    … …  
    5458# we ignore white space changes (also missing new line on end of last line)
    5559AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_enabled.dat], 0, [ignore], [ignore], [
    56         AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_disabled.dat], 0, [ignore], [ignore])
     60        AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_disabled.dat], 0, [ignore], [ignore], [
     61                AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     62        ])
    5763])
    5864
    … …  
    6874# we ignore white space changes (also missing new line on end of last line)
    6975AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
    70         AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore])
     76        AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
     77                AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     78        ])
    7179])
    7280
Note: See TracChangeset for help on using the changeset viewer.