Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Routhleck/taichi
Browse files Browse the repository at this point in the history
  • Loading branch information
Routhleck committed Aug 9, 2024
2 parents b93ceef + e410953 commit 86a1f00
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion c_api/tests/c_api_interop_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ TEST_F(CapiTest, TestCUDAImport) {
#ifdef TI_WITH_CUDA
TEST_F(CapiTest, TestCUDAStreamSet) {
EXPECT_EQ(ti_get_cuda_stream(), nullptr);

void *stream1 = reinterpret_cast<void *>(0x12345678);
void *stream2 = reinterpret_cast<void *>(0x87654321);

Expand Down
4 changes: 3 additions & 1 deletion taichi/rhi/cuda/cuda_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
namespace taichi::lang {

CUDAContext::CUDAContext()
: profiler_(nullptr), driver_(CUDADriver::get_instance_without_context()), stream_(nullptr) {
: profiler_(nullptr),
driver_(CUDADriver::get_instance_without_context()),
stream_(nullptr) {
// CUDA initialization
dev_count_ = 0;
driver_.init(0);
Expand Down

0 comments on commit 86a1f00

Please sign in to comment.