Skip to content

Commit

Permalink
Merge branch 'feature/numba-cuda-contact-point' into test/auto-unit-test
Browse files Browse the repository at this point in the history
  • Loading branch information
qbp758 committed Oct 2, 2023
2 parents 443550e + 3e56b52 commit 5c24ee6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion python/rainbow/cuda/geometry/grid3.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ def get_gradient_device(p: float64[:], min_coord: float64[:], spacing: float64[:
def is_inside_device(p: float64[:], min_coord: float64[:], max_coord: float64[:], boundary: float64) -> boolean:
""" This function test if the given spatial 3D point is inside the given grid and the boundary value.
Args:
p (float64[:]): The 3D spatial point.
min_coord (float64[:]): The minimum corner of the grid.
Expand Down
1 change: 1 addition & 0 deletions python/rainbow/cuda/unit_tests/test_math_matrix_kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def mat33_dot_vec3_kernel(M: float64[:, :, :], V3: float64[:, :], result: float6
tid = cuda.threadIdx.x
Matrix.mat33_dot_vec3(M[tid, :, :], V3[tid, :], result[tid, :])


@cuda.jit
def mat43_T_kernel(M: float64[:, :, :], result: float64[:, :, :]):
""" Unit test kernel function for mat43_T_device
Expand Down
2 changes: 1 addition & 1 deletion python/unit_tests/test_cuda_geometry_grid3.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import rainbow.cuda.unit_tests.test_geometry_grid3_kernel as TEST_GRID3K



def simpelfunc(coord):
_, _, z = coord[0], coord[1], coord[2]
return z


@unittest.skipIf(not cuda.is_available(), "CUDA not available")
class TestGrid3Cuda(unittest.TestCase):

Expand Down

0 comments on commit 5c24ee6

Please sign in to comment.