Skip to content

Commit 6910819

Browse files
authored
Merge pull request #701 from slayoo/dev
bump Thrust dependency; fix empty_particles to avoid creating zero-size vectors on GPU; correct GPU skip condition in test_permutation_global_repeatable
2 parents f265e2c + b61f940 commit 6910819

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

PySDM/impl/particle_attributes_factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ def empty_particles(particles, n_sd) -> ParticleAttributes:
9393
return ParticleAttributes(
9494
particulator=particles, idx=idx,
9595
extensive_attribute_storage=None, extensive_keys={},
96-
cell_start=np.zeros(0, dtype=np.int64), attributes={}
96+
cell_start=np.zeros(2, dtype=np.int64), attributes={}
9797
)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def get_long_description():
1616
use_scm_version=True,
1717
setup_requires=['setuptools_scm'],
1818
install_requires=[
19-
'ThrustRTC==0.3.16',
19+
'ThrustRTC==0.3.17',
2020
'CURandRTC' + ('==0.1.6' if 'CI' in os.environ else '>=0.1.2'),
2121
'numba' + ('==0.54.0' if 'CI' in os.environ else '>=0.51.2'),
2222
'numpy' + ('==1.20.2' if 'CI' in os.environ else ''),

tests/unit_tests/impl/test_particle_attributes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def test_permutation_local(backend_class):
203203
@staticmethod
204204
# pylint: disable=redefined-outer-name
205205
def test_permutation_global_repeatable(backend_class):
206-
if isinstance(backend_class, ThrustRTC):
206+
if backend_class is ThrustRTC:
207207
return # TODO #328
208208

209209
n_sd = 800

0 commit comments

Comments
 (0)