Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
57ef1b82
Commit
57ef1b82
authored
Nov 12, 2017
by
Martin Reinecke
Browse files
fixes
parent
e0b78c13
Pipeline
#21453
passed with stage
in 4 minutes and 16 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty/field.py
View file @
57ef1b82
...
...
@@ -315,7 +315,7 @@ class Field(object):
wgt
=
wgt
.
reshape
(
new_shape
)
# FIXME only temporary
if
ind
==
0
:
wgt
=
dobj
.
local_data
(
dobj
.
from_global_data
(
wgt
,
distaxis
=
0
))
wgt
=
dobj
.
local_data
(
dobj
.
from_global_data
(
wgt
))
out
*=
wgt
**
power
fct
=
fct
**
power
if
fct
!=
1.
:
...
...
nifty/operators/diagonal_operator.py
View file @
57ef1b82
...
...
@@ -154,5 +154,5 @@ class DiagonalOperator(EndomorphicOperator):
reshaped_local_diagonal
=
np
.
reshape
(
dobj
.
to_global_data
(
diag
.
val
),
self
.
_reshaper
)
if
0
in
self
.
_spaces
:
reshaped_local_diagonal
=
dobj
.
local_data
(
dobj
.
from_global_data
(
reshaped_local_diagonal
,
distaxis
=
0
))
reshaped_local_diagonal
=
dobj
.
local_data
(
dobj
.
from_global_data
(
reshaped_local_diagonal
))
return
Field
(
x
.
domain
,
val
=
x
.
val
*
reshaped_local_diagonal
)
nifty/operators/laplace_operator.py
View file @
57ef1b82
...
...
@@ -89,7 +89,6 @@ class LaplaceOperator(EndomorphicOperator):
return
self
.
_logarithmic
def
_times
(
self
,
x
):
val
=
dobj
.
to_global_data
(
x
.
val
)
axes
=
x
.
domain
.
axes
[
self
.
_space
]
axis
=
axes
[
0
]
locval
=
x
.
val
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment