#3965: restructure directories of bert and bloom functional models

tenstorrent · Nov 28, 2023 · 69a7314 · 69a7314
1 parent 823c740
commit 69a7314
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 553 deletions.
diff --git a/.../functional_bert/torch_functional_bert.py → ...l_bert/reference/torch_functional_bert.py b/.../functional_bert/torch_functional_bert.py → ...l_bert/reference/torch_functional_bert.py
diff --git a/models/experimental/functional_bert/test_functional_bert.py b/models/experimental/functional_bert/test_functional_bert.py
diff --git a/...l/functional_bert/ttnn_functional_bert.py → ...unctional_bert/tt/ttnn_functional_bert.py b/...l/functional_bert/ttnn_functional_bert.py → ...unctional_bert/tt/ttnn_functional_bert.py
diff --git a/...al_bert/ttnn_optimized_functional_bert.py → ...bert/tt/ttnn_optimized_functional_bert.py b/...al_bert/ttnn_optimized_functional_bert.py → ...bert/tt/ttnn_optimized_functional_bert.py
diff --git a/.../functional_bloom/torch_baseline_bloom.py → ...l_bloom/reference/torch_baseline_bloom.py b/.../functional_bloom/torch_baseline_bloom.py → ...l_bloom/reference/torch_baseline_bloom.py
diff --git a/...ional_bloom/torch_baseline_train_bloom.py → ...m/reference/torch_baseline_train_bloom.py b/...ional_bloom/torch_baseline_train_bloom.py → ...m/reference/torch_baseline_train_bloom.py
diff --git a/...unctional_bloom/torch_functional_bloom.py → ...bloom/reference/torch_functional_bloom.py b/...unctional_bloom/torch_functional_bloom.py → ...bloom/reference/torch_functional_bloom.py
diff --git a/...functional_bloom/ttnn_functional_bloom.py → ...ctional_bloom/tt/ttnn_functional_bloom.py b/...functional_bloom/ttnn_functional_bloom.py → ...ctional_bloom/tt/ttnn_functional_bloom.py
diff --git a/tests/ttnn/integration_tests/bert/test_bert.py b/tests/ttnn/integration_tests/bert/test_bert.py
@@ -14,14 +14,14 @@
 
 import ttnn
 
-from models.experimental.functional_bert.ttnn_functional_bert import (
+from models.experimental.functional_bert.tt.ttnn_functional_bert import (
     ttnn_bert_for_question_answering,
 )
 
-from models.experimental.functional_bert.ttnn_optimized_functional_bert import (
+from models.experimental.functional_bert.tt.ttnn_optimized_functional_bert import (
     ttnn_optimized_bert_for_question_answering,
 )
-from models.experimental.functional_bert.torch_functional_bert import (
+from models.experimental.functional_bert.reference.torch_functional_bert import (
     torch_bert_for_question_answering,
 )
 from ttnn.model_preprocessing import (

diff --git a/tests/ttnn/integration_tests/bert/test_encoder.py b/tests/ttnn/integration_tests/bert/test_encoder.py
@@ -9,8 +9,11 @@
 
 import ttnn
 
-from models.experimental.functional_bert.ttnn_functional_bert import ttnn_multi_head_attention, ttnn_feedforward
-from models.experimental.functional_bert.torch_functional_bert import torch_multi_head_attention, torch_feedforward
+from models.experimental.functional_bert.tt.ttnn_functional_bert import ttnn_multi_head_attention, ttnn_feedforward
+from models.experimental.functional_bert.reference.torch_functional_bert import (
+    torch_multi_head_attention,
+    torch_feedforward,
+)
 from models.utility_functions import torch_random
 
 from tests.ttnn.utils_for_testing import assert_with_pcc, torch_random

diff --git a/tests/ttnn/integration_tests/bert/test_feedforward.py b/tests/ttnn/integration_tests/bert/test_feedforward.py
@@ -9,8 +9,8 @@
 
 import ttnn
 
-from models.experimental.functional_bert.torch_functional_bert import torch_feedforward as torch_model
-from models.experimental.functional_bert.ttnn_functional_bert import ttnn_feedforward as ttnn_model
+from models.experimental.functional_bert.reference.torch_functional_bert import torch_feedforward as torch_model
+from models.experimental.functional_bert.tt.ttnn_functional_bert import ttnn_feedforward as ttnn_model
 from models.utility_functions import torch_random
 
 from tests.ttnn.utils_for_testing import assert_with_pcc

diff --git a/tests/ttnn/integration_tests/bert/test_multi_head_attention.py b/tests/ttnn/integration_tests/bert/test_multi_head_attention.py
@@ -8,8 +8,10 @@
 
 import ttnn
 
-from models.experimental.functional_bert.torch_functional_bert import torch_multi_head_attention as torch_model
-from models.experimental.functional_bert.ttnn_functional_bert import ttnn_multi_head_attention as ttnn_model
+from models.experimental.functional_bert.reference.torch_functional_bert import (
+    torch_multi_head_attention as torch_model,
+)
+from models.experimental.functional_bert.tt.ttnn_functional_bert import ttnn_multi_head_attention as ttnn_model
 from models.utility_functions import torch_random
 
 from tests.ttnn.utils_for_testing import assert_with_pcc

diff --git a/tests/ttnn/integration_tests/bloom/test_functional_bloom.py b/tests/ttnn/integration_tests/bloom/test_functional_bloom.py
@@ -2,7 +2,8 @@
 
 # SPDX-License-Identifier: Apache-2.0
 
-from models.experimental.functional_bloom import torch_functional_bloom, ttnn_functional_bloom
+from models.experimental.functional_bloom.reference import torch_functional_bloom
+from models.experimental.functional_bloom.tt import ttnn_functional_bloom
 from transformers import BloomForCausalLM, BloomTokenizerFast
 import pytest
 import torch