Skip to content

Commit

Permalink
Merge pull request #701 from slayoo/dev
Browse files Browse the repository at this point in the history
bump Thrust dependency; fix empty_particles to avoid creating zero-size vectors on GPU; correct GPU skip condition in test_permutation_global_repeatable
  • Loading branch information
slayoo authored Dec 12, 2021
2 parents f265e2c + b61f940 commit 6910819
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion PySDM/impl/particle_attributes_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ def empty_particles(particles, n_sd) -> ParticleAttributes:
return ParticleAttributes(
particulator=particles, idx=idx,
extensive_attribute_storage=None, extensive_keys={},
cell_start=np.zeros(0, dtype=np.int64), attributes={}
cell_start=np.zeros(2, dtype=np.int64), attributes={}
)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def get_long_description():
use_scm_version=True,
setup_requires=['setuptools_scm'],
install_requires=[
'ThrustRTC==0.3.16',
'ThrustRTC==0.3.17',
'CURandRTC' + ('==0.1.6' if 'CI' in os.environ else '>=0.1.2'),
'numba' + ('==0.54.0' if 'CI' in os.environ else '>=0.51.2'),
'numpy' + ('==1.20.2' if 'CI' in os.environ else ''),
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/impl/test_particle_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def test_permutation_local(backend_class):
@staticmethod
# pylint: disable=redefined-outer-name
def test_permutation_global_repeatable(backend_class):
if isinstance(backend_class, ThrustRTC):
if backend_class is ThrustRTC:
return # TODO #328

n_sd = 800
Expand Down

0 comments on commit 6910819

Please sign in to comment.