Skip to content

Commit

Permalink
try fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
cwharris committed Jan 30, 2024
1 parent ffec30b commit 0345ef2
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ dependencies:
- dglgo
- google-search-results==2.4
- grpcio-status==1.59
- milvus==2.3.2
- milvus==2.3.5
- nemollm
- pymilvus==2.3.2
- pymilvus==2.3.6
- pytest-kafka==0.6.0
name: all_cuda-121_arch-x86_64
4 changes: 2 additions & 2 deletions conda/environments/dev_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies:
- yapf=0.40.1
- pip:
- databricks-connect
- milvus==2.3.2
- pymilvus==2.3.2
- milvus==2.3.5
- pymilvus==2.3.6
- pytest-kafka==0.6.0
name: dev_cuda-121_arch-x86_64
4 changes: 2 additions & 2 deletions conda/environments/examples_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies:
- dglgo
- google-search-results==2.4
- grpcio-status==1.59
- milvus==2.3.2
- milvus==2.3.5
- nemollm
- pymilvus==2.3.2
- pymilvus==2.3.6
name: examples_cuda-121_arch-x86_64
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ dependencies:
- pip
- pip:
- databricks-connect
- milvus==2.3.2
- pymilvus==2.3.2
- milvus==2.3.5 # update to match pymilvus when available
- pymilvus==2.3.6

test_python_morpheus:
common:
Expand Down
9 changes: 6 additions & 3 deletions morpheus/_lib/tests/test_dev_mem_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ TEST_F(TestDevMemInfo, RmmBufferConstructor)
EXPECT_EQ(dm.data(), static_cast<u_int8_t*>(buffer->data()) + Dtype.item_size());

EXPECT_EQ(dm.memory()->cuda_stream, rmm::cuda_stream_legacy);
EXPECT_EQ(dm.memory()->memory_resource, mem_resource.get());
EXPECT_EQ(dm.memory()->memory_resource,
static_cast<cuda::mr::async_resource_ref<cuda::mr::device_accessible>>(mem_resource.get()));
}

TEST_F(TestDevMemInfo, VoidPtrConstructor)
Expand Down Expand Up @@ -122,7 +123,8 @@ TEST_F(TestDevMemInfo, VoidPtrConstructor)
EXPECT_EQ(dm.data(), static_cast<u_int8_t*>(buffer->data()) + Dtype.item_size());

EXPECT_EQ(dm.memory()->cuda_stream, rmm::cuda_stream_legacy);
EXPECT_EQ(dm.memory()->memory_resource, mem_resource.get());
EXPECT_EQ(dm.memory()->memory_resource,
static_cast<cuda::mr::async_resource_ref<cuda::mr::device_accessible>>(mem_resource.get()));
}

TEST_F(TestDevMemInfo, MakeNewBuffer)
Expand All @@ -137,5 +139,6 @@ TEST_F(TestDevMemInfo, MakeNewBuffer)
auto new_buff = dm.make_new_buffer(buff_size);
EXPECT_EQ(new_buff->size(), buff_size);
EXPECT_EQ(new_buff->stream(), rmm::cuda_stream_legacy);
EXPECT_EQ(new_buff->memory_resource(), mem_resource.get());
EXPECT_EQ(new_buff->memory_resource(),
static_cast<cuda::mr::async_resource_ref<cuda::mr::device_accessible>>(mem_resource.get()));
}
2 changes: 1 addition & 1 deletion morpheus/_lib/tests/test_tensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ TEST_F(TestTensor, Create)

EXPECT_NE(tensor.get_memory(), nullptr);
EXPECT_EQ(tensor.get_memory()->cuda_stream, rmm::cuda_stream_per_thread);
EXPECT_EQ(tensor.get_memory()->memory_resource, rmm::mr::get_current_device_resource());
// EXPECT_EQ(tensor.get_memory()->memory_resource, rmm::mr::get_current_device_resource());
}

TEST_F(TestTensor, UtilsValidateShapeAndStride)
Expand Down

0 comments on commit 0345ef2

Please sign in to comment.