Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#0: Add gmock to tt_metal test infra #15890

Merged
merged 2 commits into from
Dec 11, 2024
+22 −15
Merged

#0: Add gmock to tt_metal test infra #15890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5f076
Add gmock to cmake dependenciesOC
omilyutin-tt Dec 11, 2024
ea22481
Feedback from review, included tt-train
omilyutin-tt Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ target_link_libraries(
test_common_libs
INTERFACE
pthread
gtest
gtest_main
gmock_main
magic_enum
fmt::fmt-header-only
span
Expand Down
2 changes: 1 addition & 1 deletion tests/ttnn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function(setup_ttnn_test_target target_name)
test_common_libs
ttnn
Metalium::Metal
GTest::gtest_main
GTest::gmock_main
)
target_include_directories(
${target_name}
Expand Down
14 changes: 8 additions & 6 deletions tests/ttnn/unit_tests/gtests/tensor/test_create_tensor_multi_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "buffers/buffer_constants.hpp"
#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "ttnn/cpp/ttnn/operations/creation.hpp"
#include "ttnn/cpp/ttnn/tensor/types.hpp"
#include "ttnn/distributed/api.hpp"
Expand All @@ -17,6 +18,7 @@
namespace ttnn::distributed::test {
namespace {

using ::testing::SizeIs;
using ::tt::tt_metal::BufferType;
using ::tt::tt_metal::Layout;
using ::tt::tt_metal::MemoryConfig;
Expand Down Expand Up @@ -57,7 +59,7 @@ TEST_P(MultiDeviceTensorCreationTest, EmptyLike) {
MemoryConfig{TensorMemoryLayout::INTERLEAVED, BufferType::DRAM, std::nullopt});

EXPECT_EQ(tensor.storage_type(), StorageType::DEVICE);
EXPECT_EQ(tensor.get_workers().size(), 1);
EXPECT_THAT(tensor.get_workers(), SizeIs(1));

const Tensor mesh_replicated_tensor = ttnn::empty_like(
tensor,
Expand All @@ -67,7 +69,7 @@ TEST_P(MultiDeviceTensorCreationTest, EmptyLike) {
MemoryConfig{TensorMemoryLayout::INTERLEAVED, BufferType::DRAM, std::nullopt});

EXPECT_EQ(mesh_replicated_tensor.storage_type(), StorageType::MULTI_DEVICE);
EXPECT_EQ(mesh_replicated_tensor.get_workers().size(), mesh_device->num_devices());
EXPECT_THAT(mesh_replicated_tensor.get_workers(), SizeIs(mesh_device->num_devices()));

const auto distributed_tensor_config = get_distributed_tensor_config_from_tensor(mesh_replicated_tensor);
EXPECT_TRUE(std::holds_alternative<ReplicateTensor>(distributed_tensor_config));
Expand All @@ -86,7 +88,7 @@ TEST_P(MultiDeviceTensorCreationTest, Full) {
MemoryConfig{TensorMemoryLayout::INTERLEAVED, BufferType::DRAM, std::nullopt});

EXPECT_EQ(mesh_replicated_tensor.storage_type(), StorageType::MULTI_DEVICE);
EXPECT_EQ(mesh_replicated_tensor.get_workers().size(), mesh_device->num_devices());
EXPECT_THAT(mesh_replicated_tensor.get_workers(), SizeIs(mesh_device->num_devices()));
EXPECT_EQ(mesh_replicated_tensor.shape(), ttnn::SimpleShape({32, 32}));
EXPECT_EQ(mesh_replicated_tensor.dtype(), DataType::BFLOAT16);
EXPECT_EQ(mesh_replicated_tensor.layout(), Layout::ROW_MAJOR);
Expand All @@ -109,7 +111,7 @@ TEST_P(MultiDeviceTensorCreationTest, FullLike) {
MemoryConfig{TensorMemoryLayout::INTERLEAVED, BufferType::DRAM, std::nullopt});

EXPECT_EQ(tensor.storage_type(), StorageType::DEVICE);
EXPECT_EQ(tensor.get_workers().size(), 1);
EXPECT_THAT(tensor.get_workers(), SizeIs(1));

Tensor mesh_replicated_tensor = ttnn::full_like(
tensor,
Expand All @@ -119,7 +121,7 @@ TEST_P(MultiDeviceTensorCreationTest, FullLike) {
std::ref(*mesh_device));

EXPECT_EQ(mesh_replicated_tensor.storage_type(), StorageType::MULTI_DEVICE);
EXPECT_EQ(mesh_replicated_tensor.get_workers().size(), mesh_device->num_devices());
EXPECT_THAT(mesh_replicated_tensor.get_workers(), SizeIs(mesh_device->num_devices()));
EXPECT_EQ(mesh_replicated_tensor.shape(), tensor.shape());
EXPECT_EQ(mesh_replicated_tensor.dtype(), tensor.dtype());
EXPECT_EQ(mesh_replicated_tensor.layout(), tensor.layout());
Expand Down Expand Up @@ -161,7 +163,7 @@ TEST_P(MultiDeviceTensorCreationTest, FullLikeWithOptTensor) {
opt_output);

EXPECT_EQ(mesh_replicated_tensor.storage_type(), StorageType::MULTI_DEVICE);
EXPECT_EQ(mesh_replicated_tensor.get_workers().size(), mesh_device->num_devices());
EXPECT_THAT(mesh_replicated_tensor.get_workers(), SizeIs(mesh_device->num_devices()));
EXPECT_EQ(mesh_replicated_tensor.shape(), tensor.shape());
EXPECT_EQ(mesh_replicated_tensor.dtype(), tensor.dtype());
EXPECT_EQ(mesh_replicated_tensor.layout(), tensor.layout());
Expand Down
2 changes: 1 addition & 1 deletion tt-train/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ file(
add_executable(ttml_tests ${SOURCES})
target_link_libraries(
ttml_tests
GTest::gtest_main
GTest::gmock_main
ttml
)
add_definitions(-DTEST_DATA_DIR="${CMAKE_SOURCE_DIR}/data")
Expand Down
16 changes: 11 additions & 5 deletions tt-train/tests/core/distributed_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
//
// SPDX-License-Identifier: Apache-2.0

#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include <core/xtensor_all_includes.hpp>

#include "core/distributed_mapping.hpp"

namespace {

using ::testing::SizeIs;

template <typename T>
class MeshOpsTest : public ::testing::Test {
protected:
Expand All @@ -25,7 +30,7 @@ TYPED_TEST(MeshOpsTest, ChunkBasicNonDivisible3) {
// Chunk into 3 parts along dimension 0
auto chunks = ttml::core::chunk(tensor, 3, 0);

ASSERT_EQ(chunks.size(), 3u);
ASSERT_THAT(chunks, SizeIs(3));
EXPECT_EQ(chunks[0].shape()[0], 4u); // first chunk size 4
EXPECT_EQ(chunks[1].shape()[0], 4u); // next chunk size 4
EXPECT_EQ(chunks[2].shape()[0], 2u); // last chunk size 2
Expand All @@ -38,7 +43,7 @@ TYPED_TEST(MeshOpsTest, ChunkBasicLessChunksThanProvided) {
// Chunk into 6 parts along dimension 0
auto chunks = ttml::core::chunk(tensor, 6, 0);

ASSERT_EQ(chunks.size(), 5u);
ASSERT_THAT(chunks, SizeIs(5));
EXPECT_EQ(chunks[0].shape()[0], 3u); // first chunk size 3
EXPECT_EQ(chunks[1].shape()[0], 3u); // next chunk size 3
EXPECT_EQ(chunks[2].shape()[0], 3u); // next chunk size 3
Expand All @@ -56,7 +61,7 @@ TYPED_TEST(MeshOpsTest, ShardXTensorToMeshBasicShard) {
auto shards = sharder.map(tensor);

// With 4 shards, each shard should have size 2
ASSERT_EQ(shards.size(), 4u);
ASSERT_THAT(shards, SizeIs(4));
for (auto& s : shards) {
EXPECT_EQ(s.size(), 2u);
}
Expand All @@ -73,7 +78,7 @@ TYPED_TEST(MeshOpsTest, ShardTensor2dMeshTwoDimSharding) {
ttml::core::ShardTensor2dMesh<TypeParam> sharder(mesh_shape, {0, 1});
auto shards = sharder.map(tensor);

ASSERT_EQ(shards.size(), 4u);
ASSERT_THAT(shards, SizeIs(4));
// Check shapes of shards
for (auto& shard : shards) {
EXPECT_EQ(shard.shape()[0], 2u);
Expand All @@ -90,7 +95,7 @@ TYPED_TEST(MeshOpsTest, ReplicateXTensorToMeshReplication) {
ttml::core::ReplicateXTensorToMesh<TypeParam> replicator(mesh_shape);
auto replicas = replicator.map(tensor);

ASSERT_EQ(static_cast<int>(replicas.size()), num_devices);
ASSERT_THAT(replicas, SizeIs(num_devices));
for (const auto& t : replicas) {
EXPECT_TRUE(xt::allclose(t, tensor));
}
Expand Down Expand Up @@ -243,3 +248,4 @@ TYPED_TEST(MeshOpsTest, ConcatenateSameParametersAsCompose) {
TypeParam(0), TypeParam(1), TypeParam(2), TypeParam(3), TypeParam(4), TypeParam(5)};
EXPECT_TRUE(xt::allclose(composed, expected));
}
} // namespace
Loading