Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
preprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pablo Winant
preprocessor
Commits
fb8a26f8
Verified
Commit
fb8a26f8
authored
5 years ago
by
Houtan Bastani
Browse files
Options
Downloads
Patches
Plain Diff
dragonfly: support ProgramConfig config file option
parent
f022f666
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ConfigFile.cc
+20
-14
20 additions, 14 deletions
src/ConfigFile.cc
src/ConfigFile.hh
+7
-6
7 additions, 6 deletions
src/ConfigFile.hh
with
27 additions
and
20 deletions
src/ConfigFile.cc
+
20
−
14
View file @
fb8a26f8
...
@@ -56,8 +56,8 @@ Path::Path(vector<string> includepath_arg)
...
@@ -56,8 +56,8 @@ Path::Path(vector<string> includepath_arg)
SlaveNode
::
SlaveNode
(
string
computerName_arg
,
string
port_arg
,
int
minCpuNbr_arg
,
int
maxCpuNbr_arg
,
string
userName_arg
,
SlaveNode
::
SlaveNode
(
string
computerName_arg
,
string
port_arg
,
int
minCpuNbr_arg
,
int
maxCpuNbr_arg
,
string
userName_arg
,
string
password_arg
,
string
remoteDrive_arg
,
string
remoteDirectory_arg
,
string
password_arg
,
string
remoteDrive_arg
,
string
remoteDirectory_arg
,
string
programPath_arg
,
string
matlabOctavePath_arg
,
bool
singleCompThread_arg
,
int
numberOfThreadsPerJob_arg
,
string
programPath_arg
,
string
programConfig_arg
,
string
matlabOctavePath_arg
,
bool
singleCompThread_arg
,
string
operatingSystem_arg
)
:
int
numberOfThreadsPerJob_arg
,
string
operatingSystem_arg
)
:
computerName
{
move
(
computerName_arg
)},
computerName
{
move
(
computerName_arg
)},
port
{
move
(
port_arg
)},
port
{
move
(
port_arg
)},
minCpuNbr
{
minCpuNbr_arg
},
minCpuNbr
{
minCpuNbr_arg
},
...
@@ -67,6 +67,7 @@ SlaveNode::SlaveNode(string computerName_arg, string port_arg, int minCpuNbr_arg
...
@@ -67,6 +67,7 @@ SlaveNode::SlaveNode(string computerName_arg, string port_arg, int minCpuNbr_arg
remoteDrive
{
move
(
remoteDrive_arg
)},
remoteDrive
{
move
(
remoteDrive_arg
)},
remoteDirectory
{
move
(
remoteDirectory_arg
)},
remoteDirectory
{
move
(
remoteDirectory_arg
)},
programPath
{
move
(
programPath_arg
)},
programPath
{
move
(
programPath_arg
)},
programConfig
{
move
(
programConfig_arg
)},
matlabOctavePath
{
move
(
matlabOctavePath_arg
)},
matlabOctavePath
{
move
(
matlabOctavePath_arg
)},
singleCompThread
{
singleCompThread_arg
},
singleCompThread
{
singleCompThread_arg
},
numberOfThreadsPerJob
{
numberOfThreadsPerJob_arg
},
numberOfThreadsPerJob
{
numberOfThreadsPerJob_arg
},
...
@@ -168,8 +169,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
...
@@ -168,8 +169,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
}
}
string
name
,
computerName
,
port
,
userName
,
password
,
remoteDrive
,
string
name
,
computerName
,
port
,
userName
,
password
,
remoteDrive
,
remoteDirectory
,
programPath
,
matlabOctavePath
,
operatingSystem
,
remoteDirectory
,
programPath
,
programConfig
,
matlabOctavePath
,
global_init_file
;
operatingSystem
,
global_init_file
;
vector
<
string
>
includepath
;
vector
<
string
>
includepath
;
int
minCpuNbr
{
0
},
maxCpuNbr
{
0
};
int
minCpuNbr
{
0
},
maxCpuNbr
{
0
};
int
numberOfThreadsPerJob
{
1
};
int
numberOfThreadsPerJob
{
1
};
...
@@ -202,8 +203,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
...
@@ -202,8 +203,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
addParallelConfFileElement
(
inNode
,
inCluster
,
member_nodes
,
name
,
addParallelConfFileElement
(
inNode
,
inCluster
,
member_nodes
,
name
,
computerName
,
port
,
minCpuNbr
,
maxCpuNbr
,
userName
,
computerName
,
port
,
minCpuNbr
,
maxCpuNbr
,
userName
,
password
,
remoteDrive
,
remoteDirectory
,
password
,
remoteDrive
,
remoteDirectory
,
programPath
,
matlabOctavePath
,
singleCompThread
,
numberOfThreadsPerJob
,
programPath
,
programConfig
,
matlabOctavePath
,
singleCompThread
,
operatingSystem
);
numberOfThreadsPerJob
,
operatingSystem
);
//! Reset communication vars / option defaults
//! Reset communication vars / option defaults
if
(
!
line
.
compare
(
"[hooks]"
))
if
(
!
line
.
compare
(
"[hooks]"
))
...
@@ -236,7 +237,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
...
@@ -236,7 +237,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
}
}
name
=
userName
=
computerName
=
port
=
password
=
remoteDrive
name
=
userName
=
computerName
=
port
=
password
=
remoteDrive
=
remoteDirectory
=
programPath
=
matlabOctavePath
=
remoteDirectory
=
programPath
=
programConfig
=
matlabOctavePath
=
operatingSystem
=
global_init_file
=
""
;
=
operatingSystem
=
global_init_file
=
""
;
includepath
.
clear
();
includepath
.
clear
();
minCpuNbr
=
maxCpuNbr
=
0
;
minCpuNbr
=
maxCpuNbr
=
0
;
...
@@ -356,6 +357,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
...
@@ -356,6 +357,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
else
if
(
!
tokenizedLine
.
front
().
compare
(
"DynarePath"
)
else
if
(
!
tokenizedLine
.
front
().
compare
(
"DynarePath"
)
||
!
tokenizedLine
.
front
().
compare
(
"ProgramPath"
))
||
!
tokenizedLine
.
front
().
compare
(
"ProgramPath"
))
programPath
=
tokenizedLine
.
back
();
programPath
=
tokenizedLine
.
back
();
else
if
(
!
tokenizedLine
.
front
().
compare
(
"ProgramConfig"
))
programConfig
=
tokenizedLine
.
back
();
else
if
(
!
tokenizedLine
.
front
().
compare
(
"MatlabOctavePath"
))
else
if
(
!
tokenizedLine
.
front
().
compare
(
"MatlabOctavePath"
))
matlabOctavePath
=
tokenizedLine
.
back
();
matlabOctavePath
=
tokenizedLine
.
back
();
else
if
(
!
tokenizedLine
.
front
().
compare
(
"NumberOfThreadsPerJob"
))
else
if
(
!
tokenizedLine
.
front
().
compare
(
"NumberOfThreadsPerJob"
))
...
@@ -446,8 +449,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
...
@@ -446,8 +449,8 @@ ConfigFile::getConfigFileInfo(const string &config_file)
addParallelConfFileElement
(
inNode
,
inCluster
,
member_nodes
,
name
,
addParallelConfFileElement
(
inNode
,
inCluster
,
member_nodes
,
name
,
computerName
,
port
,
minCpuNbr
,
maxCpuNbr
,
userName
,
computerName
,
port
,
minCpuNbr
,
maxCpuNbr
,
userName
,
password
,
remoteDrive
,
remoteDirectory
,
password
,
remoteDrive
,
remoteDirectory
,
programPath
,
matlabOctavePath
,
singleCompThread
,
numberOfThreadsPerJob
,
programPath
,
programConfig
,
matlabOctavePath
,
singleCompThread
,
operatingSystem
);
numberOfThreadsPerJob
,
operatingSystem
);
configFile
.
close
();
configFile
.
close
();
}
}
...
@@ -478,9 +481,10 @@ ConfigFile::addPathsConfFileElement(vector<string> includepath)
...
@@ -478,9 +481,10 @@ ConfigFile::addPathsConfFileElement(vector<string> includepath)
void
void
ConfigFile
::
addParallelConfFileElement
(
bool
inNode
,
bool
inCluster
,
const
member_nodes_t
&
member_nodes
,
const
string
&
name
,
ConfigFile
::
addParallelConfFileElement
(
bool
inNode
,
bool
inCluster
,
const
member_nodes_t
&
member_nodes
,
const
string
&
name
,
const
string
&
computerName
,
const
string
&
port
,
int
minCpuNbr
,
int
maxCpuNbr
,
const
string
&
userName
,
const
string
&
computerName
,
const
string
&
port
,
int
minCpuNbr
,
int
maxCpuNbr
,
const
string
&
password
,
const
string
&
remoteDrive
,
const
string
&
remoteDirectory
,
const
string
&
userName
,
const
string
&
password
,
const
string
&
remoteDrive
,
const
string
&
programPath
,
const
string
&
matlabOctavePath
,
bool
singleCompThread
,
int
numberOfThreadsPerJob
,
const
string
&
remoteDirectory
,
const
string
&
programPath
,
const
string
&
programConfig
,
const
string
&
matlabOctavePath
,
bool
singleCompThread
,
int
numberOfThreadsPerJob
,
const
string
&
operatingSystem
)
const
string
&
operatingSystem
)
{
{
//! ADD NODE
//! ADD NODE
...
@@ -498,14 +502,15 @@ ConfigFile::addParallelConfFileElement(bool inNode, bool inCluster, const member
...
@@ -498,14 +502,15 @@ ConfigFile::addParallelConfFileElement(bool inNode, bool inCluster, const member
}
}
else
else
slave_nodes
.
emplace
(
name
,
SlaveNode
{
computerName
,
port
,
minCpuNbr
,
maxCpuNbr
,
userName
,
slave_nodes
.
emplace
(
name
,
SlaveNode
{
computerName
,
port
,
minCpuNbr
,
maxCpuNbr
,
userName
,
password
,
remoteDrive
,
remoteDirectory
,
programPath
,
password
,
remoteDrive
,
remoteDirectory
,
programPath
,
programConfig
,
matlabOctavePath
,
singleCompThread
,
numberOfThreadsPerJob
,
matlabOctavePath
,
singleCompThread
,
numberOfThreadsPerJob
,
operatingSystem
});
operatingSystem
});
//! ADD CLUSTER
//! ADD CLUSTER
else
if
(
inCluster
)
else
if
(
inCluster
)
if
(
minCpuNbr
>
0
||
maxCpuNbr
>
0
||
!
userName
.
empty
()
if
(
minCpuNbr
>
0
||
maxCpuNbr
>
0
||
!
userName
.
empty
()
||
!
password
.
empty
()
||
!
remoteDrive
.
empty
()
||
!
remoteDirectory
.
empty
()
||
!
password
.
empty
()
||
!
remoteDrive
.
empty
()
||
!
remoteDirectory
.
empty
()
||
!
programPath
.
empty
()
||
!
matlabOctavePath
.
empty
()
||
!
operatingSystem
.
empty
())
||
!
programPath
.
empty
()
||
!
programConfig
.
empty
()
||
!
matlabOctavePath
.
empty
()
||
!
operatingSystem
.
empty
())
{
{
cerr
<<
"Invalid option passed to [cluster]."
<<
endl
;
cerr
<<
"Invalid option passed to [cluster]."
<<
endl
;
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
...
@@ -730,6 +735,7 @@ ConfigFile::writeCluster(ostream &output) const
...
@@ -730,6 +735,7 @@ ConfigFile::writeCluster(ostream &output) const
<<
"'RemoteDrive', '"
<<
slave_node
.
second
.
remoteDrive
<<
"', "
<<
"'RemoteDrive', '"
<<
slave_node
.
second
.
remoteDrive
<<
"', "
<<
"'RemoteDirectory', '"
<<
slave_node
.
second
.
remoteDirectory
<<
"', "
<<
"'RemoteDirectory', '"
<<
slave_node
.
second
.
remoteDirectory
<<
"', "
<<
"'ProgramPath', '"
<<
slave_node
.
second
.
programPath
<<
"', "
<<
"'ProgramPath', '"
<<
slave_node
.
second
.
programPath
<<
"', "
<<
"'ProgramConfig', '"
<<
slave_node
.
second
.
programConfig
<<
"', "
<<
"'MatlabOctavePath', '"
<<
slave_node
.
second
.
matlabOctavePath
<<
"', "
<<
"'MatlabOctavePath', '"
<<
slave_node
.
second
.
matlabOctavePath
<<
"', "
<<
"'OperatingSystem', '"
<<
slave_node
.
second
.
operatingSystem
<<
"', "
<<
"'OperatingSystem', '"
<<
slave_node
.
second
.
operatingSystem
<<
"', "
<<
"'NodeWeight', '"
<<
(
cluster_it
->
second
.
member_nodes
.
find
(
slave_node
.
first
))
->
second
<<
"', "
<<
"'NodeWeight', '"
<<
(
cluster_it
->
second
.
member_nodes
.
find
(
slave_node
.
first
))
->
second
<<
"', "
...
...
This diff is collapsed.
Click to expand it.
src/ConfigFile.hh
+
7
−
6
View file @
fb8a26f8
...
@@ -63,15 +63,15 @@ class SlaveNode
...
@@ -63,15 +63,15 @@ class SlaveNode
public:
public:
SlaveNode
(
string
computerName_arg
,
string
port_arg
,
int
minCpuNbr_arg
,
int
maxCpuNbr_arg
,
string
userName_arg
,
SlaveNode
(
string
computerName_arg
,
string
port_arg
,
int
minCpuNbr_arg
,
int
maxCpuNbr_arg
,
string
userName_arg
,
string
password_arg
,
string
remoteDrive_arg
,
string
remoteDirectory_arg
,
string
password_arg
,
string
remoteDrive_arg
,
string
remoteDirectory_arg
,
string
programPath_arg
,
string
matlabOctavePath_arg
,
bool
singleCompThread_arg
,
int
numberOfThreadsPerJob_arg
,
string
programPath_arg
,
string
programConfig_arg
,
string
matlabOctavePath_arg
,
bool
singleCompThread_arg
,
string
operatingSystem_arg
);
int
numberOfThreadsPerJob_arg
,
string
operatingSystem_arg
);
protected:
protected:
const
string
computerName
,
port
;
const
string
computerName
,
port
;
int
minCpuNbr
,
maxCpuNbr
;
int
minCpuNbr
,
maxCpuNbr
;
const
string
userName
,
password
;
const
string
userName
,
password
;
const
string
remoteDrive
,
remoteDirectory
;
const
string
remoteDrive
,
remoteDirectory
;
const
string
programPath
,
matlabOctavePath
;
const
string
programPath
,
programConfig
,
matlabOctavePath
;
const
bool
singleCompThread
;
const
bool
singleCompThread
;
const
int
numberOfThreadsPerJob
;
const
int
numberOfThreadsPerJob
;
const
string
operatingSystem
;
const
string
operatingSystem
;
...
@@ -111,9 +111,10 @@ private:
...
@@ -111,9 +111,10 @@ private:
void
addPathsConfFileElement
(
vector
<
string
>
includepath
);
void
addPathsConfFileElement
(
vector
<
string
>
includepath
);
//! Add a SlaveNode or a Cluster object
//! Add a SlaveNode or a Cluster object
void
addParallelConfFileElement
(
bool
inNode
,
bool
inCluster
,
const
member_nodes_t
&
member_nodes
,
const
string
&
name
,
void
addParallelConfFileElement
(
bool
inNode
,
bool
inCluster
,
const
member_nodes_t
&
member_nodes
,
const
string
&
name
,
const
string
&
computerName
,
const
string
&
port
,
int
minCpuNbr
,
int
maxCpuNbr
,
const
string
&
userName
,
const
string
&
computerName
,
const
string
&
port
,
int
minCpuNbr
,
int
maxCpuNbr
,
const
string
&
password
,
const
string
&
remoteDrive
,
const
string
&
remoteDirectory
,
const
string
&
userName
,
const
string
&
password
,
const
string
&
remoteDrive
,
const
string
&
programPath
,
const
string
&
matlabOctavePath
,
bool
singleCompThread
,
int
numberOfThreadsPerJob
,
const
string
&
remoteDirectory
,
const
string
&
programPath
,
const
string
&
programConfig
,
const
string
&
matlabOctavePath
,
bool
singleCompThread
,
int
numberOfThreadsPerJob
,
const
string
&
operatingSystem
);
const
string
&
operatingSystem
);
public:
public:
//! Parse config file
//! Parse config file
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment