Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
L
load_leveller
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lukas Weber
load_leveller
Commits
5651eb93
Commit
5651eb93
authored
Jun 16, 2020
by
Lukas Weber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nicer merge output
parent
b0bbba73
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
src/evalable.cpp
src/evalable.cpp
+1
-5
src/loadleveller.h
src/loadleveller.h
+11
-3
No files found.
src/evalable.cpp
View file @
5651eb93
#include "evalable.h"
#include "measurements.h"
#include <fmt/format.h>
#include <iostream>
#include <map>
namespace
loadl
{
...
...
@@ -43,10 +42,7 @@ observable_result evaluator::jackknife(const std::string &name,
size_t
bin_count
=
-
1
;
// maximal value
for
(
const
auto
&
obs_name
:
used_observables
)
{
if
(
res_
.
observables
.
count
(
obs_name
)
<=
0
)
{
std
::
cerr
<<
fmt
::
format
(
"Warning: evalable '{}': used observable '{}' not found in Monte Carlo results. "
"Skipping...
\n
"
,
name
,
obs_name
);
// skip evalable if ingredients are missing from the measurements
return
obs_res
;
}
const
auto
&
obs
=
res_
.
observables
.
at
(
obs_name
);
...
...
src/loadleveller.h
View file @
5651eb93
...
...
@@ -4,15 +4,23 @@
#include "merger.h"
#include "runner.h"
#include "runner_single.h"
namespace
loadl
{
inline
int
merge_only
(
jobinfo
job
,
const
mc_factory
&
,
int
,
char
**
)
{
int
ntasks
=
job
.
task_names
.
size
();
int
len
=
log
(
ntasks
)
/
log
(
10
)
+
1
;
size_t
max_tasklen
=
0
;
for
(
size_t
task_id
=
0
;
task_id
<
job
.
task_names
.
size
();
task_id
++
)
{
job
.
merge_task
(
task_id
);
std
::
string
taskdir
=
job
.
taskdir
(
task_id
);
max_tasklen
=
std
::
max
(
max_tasklen
,
taskdir
.
size
());
std
::
cout
<<
fmt
::
format
(
"-- {} merged
\n
"
,
job
.
taskdir
(
task_id
).
string
());
std
::
cout
<<
fmt
::
format
(
"
\r
Merging task {0: >{3}}/{1: >{3}}... {2: <{4}}"
,
task_id
+
1
,
job
.
task_names
.
size
(),
taskdir
,
len
,
max_tasklen
);
std
::
cout
.
flush
();
job
.
merge_task
(
task_id
);
}
std
::
cout
<<
fmt
::
format
(
"
\r
Merged {0} tasks.{1: >{2}}
\n
"
,
job
.
task_names
.
size
(),
""
,
2
*
len
+
5
+
max_tasklen
);
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment