Changeset 7777


Ignore:
Timestamp:
05/02/12 19:41:52 (7 years ago)
Author:
ascheibe
Message:

#1700 added configuration of number of cores used for calculation to slave

Location:
trunk/sources
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config

    r7020 r7777  
    11<?xml version="1.0"?>
    22<configuration>
     3  <configSections>
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
    38  <runtime>
    49    <gcServer enabled="true" />
     
    4651   
    4752 </system.serviceModel>
     53 
     54  <userSettings>
     55    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     56      <setting name="HeartbeatInterval" serializeAs="String">
     57        <value>00:00:20</value>
     58      </setting>
     59      <setting name="LastUsedFileName" serializeAs="String">
     60        <value>lastUsed.dat</value>
     61      </setting>
     62      <setting name="PluginCacheDir" serializeAs="String">
     63        <value>PluginCache</value>
     64      </setting>
     65      <setting name="PluginTempBaseDir" serializeAs="String">
     66        <value>PluginTemp</value>
     67      </setting>
     68      <setting name="ConfigurationName" serializeAs="String">
     69        <value>Configuration</value>
     70      </setting>
     71      <setting name="PluginInfrastructureDll" serializeAs="String">
     72        <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
     73      </setting>
     74      <setting name="SharpZipLibDll" serializeAs="String">
     75        <value>ICSharpCode.SharpZipLib.dll</value>
     76      </setting>
     77      <setting name="SharpZipLibLicense" serializeAs="String">
     78        <value>ICSharpCode.SharpZipLib License.txt</value>
     79      </setting>
     80      <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
     81        <value>HeuristicLab.Clients.Hive.SlaveCore-3.3.dll</value>
     82      </setting>
     83      <setting name="ClientsHiveDll" serializeAs="String">
     84        <value>HeuristicLab.Clients.Hive-3.3.dll</value>
     85      </setting>
     86      <setting name="HiveDll" serializeAs="String">
     87        <value>HeuristicLab.Hive-3.3.dll</value>
     88      </setting>
     89      <setting name="ClientsCommonDll" serializeAs="String">
     90        <value>HeuristicLab.Clients.Common-3.3.dll</value>
     91      </setting>
     92      <setting name="PluginLifetime" serializeAs="String">
     93        <value>3</value>
     94      </setting>
     95      <setting name="DirOpSleepTime" serializeAs="String">
     96        <value>00:00:01</value>
     97      </setting>
     98      <setting name="PluginDeletionRetries" serializeAs="String">
     99        <value>5</value>
     100      </setting>
     101      <setting name="PluginDeletionTimeout" serializeAs="String">
     102        <value>00:00:01</value>
     103      </setting>
     104      <setting name="ExecutorSemTimeouts" serializeAs="String">
     105        <value>00:00:46</value>
     106      </setting>
     107      <setting name="QueuesMaxThreads" serializeAs="String">
     108        <value>5000</value>
     109      </setting>
     110      <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String">
     111        <value>SlaveCommunicationServiceEndpoint</value>
     112      </setting>
     113      <setting name="SlaveUser" serializeAs="String">
     114        <value>hiveslave</value>
     115      </setting>
     116      <setting name="SlavePwd" serializeAs="String">
     117        <value>hiveslave</value>
     118      </setting>
     119      <setting name="MaxLogCount" serializeAs="String">
     120        <value>1</value>
     121      </setting>
     122      <setting name="ExecutorQueueTimeout" serializeAs="String">
     123        <value>00:00:20</value>
     124      </setting>
     125      <setting name="NrOfCoresToScavenge" serializeAs="String">
     126        <value>2</value>
     127      </setting>
     128   </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     129  </userSettings>
    48130<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
  • trunk/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config

    r6993 r7777  
    11<?xml version="1.0"?>
    22<configuration>
     3  <configSections>
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
    38  <runtime>
    49    <gcServer enabled="true" />
     
    3944
    4045  </system.serviceModel>
     46
     47  <userSettings>
     48    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     49      <setting name="HeartbeatInterval" serializeAs="String">
     50        <value>00:00:60</value>
     51      </setting>
     52      <setting name="LastUsedFileName" serializeAs="String">
     53        <value>lastUsed.dat</value>
     54      </setting>
     55      <setting name="PluginCacheDir" serializeAs="String">
     56        <value>PluginCache</value>
     57      </setting>
     58      <setting name="PluginTempBaseDir" serializeAs="String">
     59        <value>PluginTemp</value>
     60      </setting>
     61      <setting name="ConfigurationName" serializeAs="String">
     62        <value>Configuration</value>
     63      </setting>
     64      <setting name="PluginInfrastructureDll" serializeAs="String">
     65        <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
     66      </setting>
     67      <setting name="SharpZipLibDll" serializeAs="String">
     68        <value>ICSharpCode.SharpZipLib.dll</value>
     69      </setting>
     70      <setting name="SharpZipLibLicense" serializeAs="String">
     71        <value>ICSharpCode.SharpZipLib License.txt</value>
     72      </setting>
     73      <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
     74        <value>HeuristicLab.Clients.Hive.SlaveCore-3.3.dll</value>
     75      </setting>
     76      <setting name="ClientsHiveDll" serializeAs="String">
     77        <value>HeuristicLab.Clients.Hive-3.3.dll</value>
     78      </setting>
     79      <setting name="HiveDll" serializeAs="String">
     80        <value>HeuristicLab.Hive-3.3.dll</value>
     81      </setting>
     82      <setting name="ClientsCommonDll" serializeAs="String">
     83        <value>HeuristicLab.Clients.Common-3.3.dll</value>
     84      </setting>
     85      <setting name="PluginLifetime" serializeAs="String">
     86        <value>3</value>
     87      </setting>
     88      <setting name="DirOpSleepTime" serializeAs="String">
     89        <value>00:00:01</value>
     90      </setting>
     91      <setting name="PluginDeletionRetries" serializeAs="String">
     92        <value>5</value>
     93      </setting>
     94      <setting name="PluginDeletionTimeout" serializeAs="String">
     95        <value>00:00:01</value>
     96      </setting>
     97      <setting name="ExecutorSemTimeouts" serializeAs="String">
     98        <value>00:00:46</value>
     99      </setting>
     100      <setting name="QueuesMaxThreads" serializeAs="String">
     101        <value>5000</value>
     102      </setting>
     103      <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String">
     104        <value>SlaveCommunicationServiceEndpoint</value>
     105      </setting>
     106      <setting name="SlaveUser" serializeAs="String">
     107        <value>hiveslave</value>
     108      </setting>
     109      <setting name="SlavePwd" serializeAs="String">
     110        <value>hiveslave</value>
     111      </setting>
     112      <setting name="MaxLogCount" serializeAs="String">
     113        <value>1</value>
     114      </setting>
     115      <setting name="ExecutorQueueTimeout" serializeAs="String">
     116        <value>00:00:20</value>
     117      </setting>
     118      <setting name="NrOfCoresToScavenge" serializeAs="String">
     119        <value>-1</value>
     120      </setting>
     121    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     122  </userSettings>
     123 
    41124  <startup>
    42125    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

    r7259 r7777  
    6363      slave.Id = GetUniqueMachineId();
    6464      slave.Name = Environment.MachineName;
    65       slave.Cores = Environment.ProcessorCount;
     65      if (Settings.Default.NrOfCoresToScavenge < 1 || Settings.Default.NrOfCoresToScavenge > Environment.ProcessorCount) {
     66        slave.Cores = Environment.ProcessorCount;
     67      } else {
     68        slave.Cores = Settings.Default.NrOfCoresToScavenge;
     69      }
    6670      slave.Memory = GetPhysicalMemory();
    6771      slave.CpuArchitecture = Environment.Is64BitOperatingSystem ? CpuArchitecture.x64 : CpuArchitecture.x86;
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

    r7014 r7777  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.239
     4//     Runtime Version:4.0.30319.530
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2626        [global::System.Configuration.UserScopedSettingAttribute()]
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    28         [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
     28        [global::System.Configuration.DefaultSettingValueAttribute("00:00:40")]
    2929        public global::System.TimeSpan HeartbeatInterval {
    3030            get {
     
    299299            }
    300300        }
     301       
     302        [global::System.Configuration.UserScopedSettingAttribute()]
     303        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     304        [global::System.Configuration.DefaultSettingValueAttribute("-1")]
     305        public int NrOfCoresToScavenge {
     306            get {
     307                return ((int)(this["NrOfCoresToScavenge"]));
     308            }
     309            set {
     310                this["NrOfCoresToScavenge"] = value;
     311            }
     312        }
    301313    }
    302314}
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

    r7014 r7777  
    44  <Settings>
    55    <Setting Name="HeartbeatInterval" Type="System.TimeSpan" Scope="User">
    6       <Value Profile="(Default)">00:00:20</Value>
     6      <Value Profile="(Default)">00:00:40</Value>
    77    </Setting>
    88    <Setting Name="LastUsedFileName" Type="System.String" Scope="User">
     
    7272      <Value Profile="(Default)">00:00:20</Value>
    7373    </Setting>
     74    <Setting Name="NrOfCoresToScavenge" Type="System.Int32" Scope="User">
     75      <Value Profile="(Default)">-1</Value>
     76    </Setting>
    7477  </Settings>
    7578</SettingsFile>
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r7020 r7777  
    5151    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    5252      <setting name="HeartbeatInterval" serializeAs="String">
    53         <value>00:00:20</value>
     53        <value>00:00:40</value>
    5454      </setting>
    5555      <setting name="LastUsedFileName" serializeAs="String">
     
    119119        <value>00:00:20</value>
    120120      </setting>
     121      <setting name="NrOfCoresToScavenge" serializeAs="String">
     122        <value>-1</value>
     123      </setting>
    121124    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    122125  </userSettings>
Note: See TracChangeset for help on using the changeset viewer.