Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIFTy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
NIFTy
Commits
564aca36
Commit
564aca36
authored
Dec 05, 2019
by
Gordian Edenhofer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix usage of print to logging
parent
4ca56a07
Pipeline
#65019
passed with stages
in 8 minutes and 58 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
nifty6/library/correlated_fields.py
nifty6/library/correlated_fields.py
+2
-1
nifty6/sugar.py
nifty6/sugar.py
+11
-10
No files found.
nifty6/library/correlated_fields.py
View file @
564aca36
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
import
numpy
as
np
import
numpy
as
np
from
..logger
import
logger
from
..domain_tuple
import
DomainTuple
from
..domain_tuple
import
DomainTuple
from
..domains.power_space
import
PowerSpace
from
..domains.power_space
import
PowerSpace
from
..domains.unstructured_domain
import
UnstructuredDomain
from
..domains.unstructured_domain
import
UnstructuredDomain
...
@@ -501,7 +502,7 @@ class CorrelatedFieldMaker:
...
@@ -501,7 +502,7 @@ class CorrelatedFieldMaker:
mean
=
sc
.
mean
.
to_global_data
()
mean
=
sc
.
mean
.
to_global_data
()
stddev
=
sc
.
var
.
sqrt
().
to_global_data
()
stddev
=
sc
.
var
.
sqrt
().
to_global_data
()
for
m
,
s
in
zip
(
mean
.
flatten
(),
stddev
.
flatten
()):
for
m
,
s
in
zip
(
mean
.
flatten
(),
stddev
.
flatten
()):
print
(
'{}: {:.02E} ± {:.02E}'
.
format
(
kk
,
m
,
s
))
logger
.
info
(
'{}: {:.02E} ± {:.02E}'
.
format
(
kk
,
m
,
s
))
def
moment_slice_to_average
(
self
,
fluctuations_slice_mean
,
nsamples
=
1000
):
def
moment_slice_to_average
(
self
,
fluctuations_slice_mean
,
nsamples
=
1000
):
fluctuations_slice_mean
=
float
(
fluctuations_slice_mean
)
fluctuations_slice_mean
=
float
(
fluctuations_slice_mean
)
...
...
nifty6/sugar.py
View file @
564aca36
...
@@ -20,6 +20,7 @@ from time import time
...
@@ -20,6 +20,7 @@ from time import time
import
numpy
as
np
import
numpy
as
np
from
.logger
import
logger
from
.
import
dobj
,
utilities
from
.
import
dobj
,
utilities
from
.domain_tuple
import
DomainTuple
from
.domain_tuple
import
DomainTuple
from
.domains.power_space
import
PowerSpace
from
.domains.power_space
import
PowerSpace
...
@@ -462,46 +463,46 @@ def exec_time(obj, want_metric=True):
...
@@ -462,46 +463,46 @@ def exec_time(obj, want_metric=True):
if
isinstance
(
obj
,
Energy
):
if
isinstance
(
obj
,
Energy
):
t0
=
time
()
t0
=
time
()
obj
.
at
(
0.99
*
obj
.
position
)
obj
.
at
(
0.99
*
obj
.
position
)
print
(
'Energy.at():'
,
time
()
-
t0
)
logger
.
info
(
'Energy.at(): {}'
.
format
(
time
()
-
t0
)
)
t0
=
time
()
t0
=
time
()
obj
.
value
obj
.
value
print
(
'Energy.value:'
,
time
()
-
t0
)
logger
.
info
(
'Energy.value: {}'
.
format
(
time
()
-
t0
)
)
t0
=
time
()
t0
=
time
()
obj
.
gradient
obj
.
gradient
print
(
'Energy.gradient:'
,
time
()
-
t0
)
logger
.
info
(
'Energy.gradient: {}'
.
format
(
time
()
-
t0
)
)
t0
=
time
()
t0
=
time
()
obj
.
metric
obj
.
metric
print
(
'Energy.metric:'
,
time
()
-
t0
)
logger
.
info
(
'Energy.metric: {}'
.
format
(
time
()
-
t0
)
)
t0
=
time
()
t0
=
time
()
obj
.
apply_metric
(
obj
.
position
)
obj
.
apply_metric
(
obj
.
position
)
print
(
'Energy.apply_metric:'
,
time
()
-
t0
)
logger
.
info
(
'Energy.apply_metric: {}'
.
format
(
time
()
-
t0
)
)
t0
=
time
()
t0
=
time
()
obj
.
metric
(
obj
.
position
)
obj
.
metric
(
obj
.
position
)
print
(
'Energy.metric(position):'
,
time
()
-
t0
)
logger
.
info
(
'Energy.metric(position): {}'
.
format
(
time
()
-
t0
)
)
elif
isinstance
(
obj
,
Operator
):
elif
isinstance
(
obj
,
Operator
):
want_metric
=
bool
(
want_metric
)
want_metric
=
bool
(
want_metric
)
pos
=
from_random
(
'normal'
,
obj
.
domain
)
pos
=
from_random
(
'normal'
,
obj
.
domain
)
t0
=
time
()
t0
=
time
()
obj
(
pos
)
obj
(
pos
)
print
(
'Operator call with field:'
,
time
()
-
t0
)
logger
.
info
(
'Operator call with field: {}'
.
format
(
time
()
-
t0
)
)
lin
=
Linearization
.
make_var
(
pos
,
want_metric
=
want_metric
)
lin
=
Linearization
.
make_var
(
pos
,
want_metric
=
want_metric
)
t0
=
time
()
t0
=
time
()
res
=
obj
(
lin
)
res
=
obj
(
lin
)
print
(
'Operator call with linearization:'
,
time
()
-
t0
)
logger
.
info
(
'Operator call with linearization: {}'
.
format
(
time
()
-
t0
)
)
if
isinstance
(
obj
,
EnergyOperator
):
if
isinstance
(
obj
,
EnergyOperator
):
t0
=
time
()
t0
=
time
()
res
.
gradient
res
.
gradient
print
(
'Gradient evaluation:'
,
time
()
-
t0
)
logger
.
info
(
'Gradient evaluation: {}'
.
format
(
time
()
-
t0
)
)
if
want_metric
:
if
want_metric
:
t0
=
time
()
t0
=
time
()
res
.
metric
(
pos
)
res
.
metric
(
pos
)
print
(
'Metric apply:'
,
time
()
-
t0
)
logger
.
info
(
'Metric apply: {}'
.
format
(
time
()
-
t0
)
)
else
:
else
:
raise
TypeError
raise
TypeError
...
...
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