Skip to content

Commit ff90d78

Browse files
authored
Merge branch 'main' into enh-cpp-20
2 parents ebac87c + 3ad36b9 commit ff90d78

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
matrix_name: conda-cpp-build
105105
matrix_filter: map(select(.ARCH == "amd64"))
106106
go-build:
107-
needs: cpp-build
107+
needs: go-build-matrix
108108
secrets: inherit
109109
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
110110
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
@@ -130,7 +130,7 @@ jobs:
130130
matrix_name: conda-cpp-build
131131
matrix_filter: map(select(.ARCH == "amd64"))
132132
java-build:
133-
needs: cpp-build
133+
needs: java-build-matrix
134134
secrets: inherit
135135
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
136136
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.

python/cuvs/cuvs/common/exceptions.pyx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2024-2026, NVIDIA CORPORATION.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# cython: language_level=3
@@ -14,10 +14,8 @@ class CuvsException(Exception):
1414
def get_last_error_text():
1515
""" returns the last error description from the cuvs c-api """
1616
cdef const char* c_err = cuvsGetLastErrorText()
17-
if c_err is NULL:
18-
return
19-
cdef bytes err = c_err
20-
return err.decode("utf8", "ignore")
17+
if c_err is not NULL:
18+
return c_err.decode("utf8", "ignore")
2119

2220

2321
def check_cuvs(status: cuvsError_t):

0 commit comments

Comments
 (0)