Changeset 103eb8 for src

Timestamp:

Jul 6, 2012, 10:18:48 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:

edecba

Parents:

c8446c

git-author:

Frederik Heber <heber@…> (05/30/12 13:00:50)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:48)

Message:

Removed SystemCommandJob capabilities from src/controller while maintaining MPQCCommandJob.

• SystemCommandJob is now maintained by JobMarket's controller.

Location:

src

Files:

• ControllerOptions_MPQCCommandJob.cpp (modified) (2 diffs)
• ControllerOptions_MPQCCommandJob.hpp (modified) (1 diff)
• controller_MPQCCommandJob.cpp (modified) (4 diffs)

src/ControllerOptions_MPQCCommandJob.cpp

@@ -26 +26 @@
 
 int ControllerOptions_MPQCCommandJob::parseExecutable(boost::program_options::variables_map &vm) {
-  if ((command == "createjobs") || (command == "addjobs")) {
+  if (command == "addjobs") {
     if (!vm.count("executable")) {
       ELOG(1, "'"+command+"' requires two options: [executable] [jobcommand].");
@@ -32 +32 @@
     }
     executable = vm["executable"].as< std::string >();
-  }
-  return 0;
-}
-
-int ControllerOptions_MPQCCommandJob::parseJobCommand(boost::program_options::variables_map &vm) {
-  if (command == "createjobs") {
-    if (!vm.count("jobcommand")) {
-      ELOG(1, "'"+command+"' requires two options: [executable] [jobcommand].");
-      return 255;
-    }
-    jobcommand = vm["jobcommand"].as< std::string >();
   }
   return 0;

src/ControllerOptions_MPQCCommandJob.hpp

@@ -23 +23 @@
 {
   int parseExecutable(boost::program_options::variables_map &vm);
-  int parseJobCommand(boost::program_options::variables_map &vm);
-
   int parseFragmentpath(boost::program_options::variables_map &vm);
   int parseJobfiles(boost::program_options::variables_map &vm);
 
   std::string executable;
-  std::string jobcommand;
   std::string fragmentpath;
   std::vector<std::string> jobfiles;

src/controller_MPQCCommandJob.cpp

@@ -260 +260 @@
 }
 
-
-/** Creates a SystemCommandJob out of give \a command with \a argument.
- *
- * @param controller reference to controller to add jobs
- * @param ControllerInfo information on the job
- */
-void createJobs(FragmentController &controller, const ControllerOptions_MPQCCommandJob &ControllerInfo)
-{
-  const JobId_t next_id = controller.getAvailableId();
-  LOG(2, "DEBUG: Creating new SystemCommandJob with '"
-      +toString(ControllerInfo.executable)+"' and argument '"
-      +toString(ControllerInfo.jobcommand)+"'.");
-  FragmentJob::ptr testJob(
-      new SystemCommandJob(ControllerInfo.executable, ControllerInfo.jobcommand, next_id) );
-  std::vector<FragmentJob::ptr> jobs;
-  jobs.push_back(testJob);
-  controller.addJobs(jobs);
-  controller.sendJobs(ControllerInfo.server, ControllerInfo.serverport);
-  LOG(1, "INFO: Added one SystemCommandJob.");
-}
-
 /** Creates a MPQCCommandJob out of give \a command with \a argument.
  *
@@ -329 +308 @@
             boost::bind(&std::vector<std::string>::size, boost::cref(CI.jobfiles))))
         (boost::bind(&AddJobs, boost::ref(controller), boost::cref(CI)))
-      ));
-  registrator(new ControllerCommand("createjobs",
-      boost::assign::list_of< ControllerCommand::commands_t >
-        (boost::bind(&FragmentController::requestIds,
-            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport), 1))
-        (boost::bind(&createJobs, boost::ref(controller), boost::cref(CI)))
       ));
   registrator(new ControllerCommand("receiveresults",
@@ -358 +331 @@
 {
   option
-    ("jobcommand", boost::program_options::value< std::string >(), "command argument for executable for 'createjobs'")
     ("executable", boost::program_options::value< std::string >(), "executable for commands 'createjobs'")
     ("fragment-path", boost::program_options::value< std::string >(), "path to fragment files for 'receivempqc'")
@@ -374 +346 @@
   status = CI.parseExecutable(vm);
   if (status) return status;
-  status = CI.parseJobCommand(vm);
-  if (status) return status;
   status = CI.parseFragmentpath(vm);
   if (status) return status;