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
735e589b
Commit
735e589b
authored
Aug 29, 2018
by
Martin Reinecke
Browse files
Merge remote-tracking branch 'origin/NIFTy_5' into cleanup
parents
1cbaf2d0
8af5299c
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
735e589b
...
...
@@ -36,8 +36,10 @@ build_docker_from_cache:
test_python2_with_coverage
:
stage
:
test
variables
:
OMPI_MCA_btl_vader_single_copy_mechanism
:
none
script
:
-
mpiexec -n 2 --bind-to none pytest -q test
2> /dev/null
-
mpiexec -n 2 --bind-to none pytest -q test
-
pytest -q --cov=nifty5 test
-
>
python -m coverage report --omit "*plotting*,*distributed_do*"
...
...
@@ -46,9 +48,11 @@ test_python2_with_coverage:
test_python3
:
stage
:
test
variables
:
OMPI_MCA_btl_vader_single_copy_mechanism
:
none
script
:
-
pytest-3 -q
-
mpiexec -n 2 --bind-to none pytest-3 -q
2> /dev/null
-
mpiexec -n 2 --bind-to none pytest-3 -q
pages
:
stage
:
release
...
...
nifty5/operators/domain_tuple_field_inserter.py
View file @
735e589b
...
...
@@ -55,6 +55,7 @@ class DomainTupleFieldInserter(LinearOperator):
def
apply
(
self
,
x
,
mode
):
self
.
_check_input
(
x
,
mode
)
# FIXME Make fully MPI compatible without global_data
if
mode
==
self
.
TIMES
:
res
=
np
.
zeros
(
self
.
target
.
shape
,
dtype
=
x
.
dtype
)
res
[
self
.
_slc
]
=
x
.
to_global_data
()
...
...
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