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
D
D2O
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
D2O
Commits
23df6732
Commit
23df6732
authored
May 26, 2016
by
theos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix in _slicing_distributor: contraction_helper was caught in a deadlock.
parent
4db365d1
Pipeline
#3849
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
d2o/distributor_factory.py
d2o/distributor_factory.py
+3
-1
test/test_distributed_data_object.py
test/test_distributed_data_object.py
+1
-3
No files found.
d2o/distributor_factory.py
View file @
23df6732
...
...
@@ -619,7 +619,9 @@ class _slicing_distributor(distributor):
# Contracting (4, 4) to (4,).
# (4, 4) was distributed (1, 4)...(1, 4)
# (4, ) is not distributed like (1,)...(1,) but like (2,)(2,)()()!
if
result
.
local_shape
!=
contracted_global_data
.
shape
:
equalQ
=
(
result
.
local_shape
==
contracted_global_data
.
shape
)
all_equalQ
=
np
.
all
(
self
.
_allgather
(
equalQ
))
if
not
all_equalQ
:
result
=
parent
.
copy_empty
(
local_shape
=
contracted_global_data
.
shape
,
dtype
=
new_dtype
,
...
...
test/test_distributed_data_object.py
View file @
23df6732
...
...
@@ -1783,8 +1783,6 @@ class Test_axis(unittest.TestCase):
def
test_axis_with_operations
(
self
,
function
,
dtype
,
global_shape
,
distribution_strategy
,
axis
):
import
d2o
print
d2o
.
config
.
dependency_injector
.
registry
(
a
,
obj
)
=
generate_data
(
global_shape
,
dtype
,
distribution_strategy
,
strictly_positive
=
True
)
...
...
@@ -1807,7 +1805,7 @@ class Test_axis(unittest.TestCase):
'min'
,
'amin'
,
'nanmin'
,
'argmin'
,
'max'
,
'amax'
,
'nanmax'
,
'argmax'
],
all_datatypes
[
1
:],
[(
3
,
2
,
3
)],
[(
3
,
2
,
2
)],
all_distribution_strategies
,
[(
0
,
1
),
(
1
,
2
),
(
0
,
1
,
2
)]),
testcase_func_name
=
custom_name_func
)
...
...
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