From b4542acf1b19b8a6225fb9222b4547e0ecd507e2 Mon Sep 17 00:00:00 2001 From: bamsumit Date: Tue, 23 Nov 2021 10:41:25 -0800 Subject: [PATCH 1/2] new init clean from main Signed-off-by: bamsumit --- src/lava/__init__.py | 5 ----- src/lava/magma/__init__.py | 5 ----- src/lava/magma/compiler/__init__.py | 5 ----- src/lava/magma/compiler/c/__init__.py | 1 - src/lava/magma/compiler/channels/__init__.py | 5 ----- src/lava/magma/compiler/nc/__init__.py | 1 - src/lava/magma/compiler/py/__init__.py | 1 - src/lava/magma/core/__init__.py | 5 ----- src/lava/magma/core/model/__init__.py | 1 - src/lava/magma/core/model/c/__init__.py | 1 - src/lava/magma/core/model/nc/__init__.py | 1 - src/lava/magma/core/model/py/__init__.py | 1 - src/lava/magma/core/model/sub/__init__.py | 1 - src/lava/magma/core/process/__init__.py | 1 - src/lava/magma/core/process/ports/__init__.py | 1 - src/lava/magma/core/sync/__init__.py | 15 --------------- src/lava/magma/core/sync/protocols/__init__.py | 1 - src/lava/magma/runtime/__init__.py | 5 ----- src/lava/magma/runtime/channels/__init__.py | 1 - .../runtime/message_infrastructure/__init__.py | 5 ----- src/lava/magma/runtime/node/__init__.py | 1 - src/lava/proc/__init__.py | 5 ----- src/lava/proc/dense/__init__.py | 5 ----- src/lava/proc/io/__init__.py | 1 - src/lava/proc/lif/__init__.py | 5 ----- src/lava/proc/sparse/__init__.py | 5 ----- src/lava/tutorials/__init__.py | 1 - src/lava/tutorials/end_to_end/__init__.py | 0 src/lava/tutorials/in_depth/__init__.py | 0 src/lava/utils/__init__.py | 5 ----- src/lava/utils/dataloader/__init__.py | 5 ----- tests/lava/__init__.py | 1 - tests/lava/magma/__init__.py | 1 - tests/lava/magma/compiler/__init__.py | 1 - tests/lava/magma/compiler/channels/__init__.py | 1 - tests/lava/magma/core/__init__.py | 1 - tests/lava/magma/core/model/__init__.py | 1 - tests/lava/magma/core/model/py/__init__.py | 1 - tests/lava/magma/core/process/__init__.py | 1 - tests/lava/magma/runtime/__init__.py | 1 - tests/lava/proc/__init__.py | 5 ----- tests/lava/proc/lif/__init__.py | 5 ----- 42 files changed, 114 deletions(-) delete mode 100644 src/lava/__init__.py delete mode 100644 src/lava/magma/__init__.py delete mode 100644 src/lava/magma/compiler/__init__.py delete mode 100644 src/lava/magma/compiler/c/__init__.py delete mode 100644 src/lava/magma/compiler/channels/__init__.py delete mode 100644 src/lava/magma/compiler/nc/__init__.py delete mode 100644 src/lava/magma/compiler/py/__init__.py delete mode 100644 src/lava/magma/core/__init__.py delete mode 100644 src/lava/magma/core/model/__init__.py delete mode 100644 src/lava/magma/core/model/c/__init__.py delete mode 100644 src/lava/magma/core/model/nc/__init__.py delete mode 100644 src/lava/magma/core/model/py/__init__.py delete mode 100644 src/lava/magma/core/model/sub/__init__.py delete mode 100644 src/lava/magma/core/process/__init__.py delete mode 100644 src/lava/magma/core/process/ports/__init__.py delete mode 100644 src/lava/magma/core/sync/__init__.py delete mode 100644 src/lava/magma/core/sync/protocols/__init__.py delete mode 100644 src/lava/magma/runtime/__init__.py delete mode 100644 src/lava/magma/runtime/channels/__init__.py delete mode 100644 src/lava/magma/runtime/message_infrastructure/__init__.py delete mode 100644 src/lava/magma/runtime/node/__init__.py delete mode 100644 src/lava/proc/__init__.py delete mode 100644 src/lava/proc/dense/__init__.py delete mode 100644 src/lava/proc/io/__init__.py delete mode 100644 src/lava/proc/lif/__init__.py delete mode 100644 src/lava/proc/sparse/__init__.py delete mode 100644 src/lava/tutorials/__init__.py delete mode 100644 src/lava/tutorials/end_to_end/__init__.py delete mode 100644 src/lava/tutorials/in_depth/__init__.py delete mode 100644 src/lava/utils/__init__.py delete mode 100644 src/lava/utils/dataloader/__init__.py diff --git a/src/lava/__init__.py b/src/lava/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/__init__.py b/src/lava/magma/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/magma/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/compiler/__init__.py b/src/lava/magma/compiler/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/magma/compiler/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/compiler/c/__init__.py b/src/lava/magma/compiler/c/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/compiler/c/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/compiler/channels/__init__.py b/src/lava/magma/compiler/channels/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/magma/compiler/channels/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/compiler/nc/__init__.py b/src/lava/magma/compiler/nc/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/compiler/nc/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/compiler/py/__init__.py b/src/lava/magma/compiler/py/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/compiler/py/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/__init__.py b/src/lava/magma/core/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/magma/core/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/model/__init__.py b/src/lava/magma/core/model/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/model/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/model/c/__init__.py b/src/lava/magma/core/model/c/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/model/c/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/model/nc/__init__.py b/src/lava/magma/core/model/nc/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/model/nc/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/model/py/__init__.py b/src/lava/magma/core/model/py/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/model/py/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/model/sub/__init__.py b/src/lava/magma/core/model/sub/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/model/sub/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/process/__init__.py b/src/lava/magma/core/process/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/process/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/process/ports/__init__.py b/src/lava/magma/core/process/ports/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/process/ports/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/sync/__init__.py b/src/lava/magma/core/sync/__init__.py deleted file mode 100644 index 6e4fda8b2..000000000 --- a/src/lava/magma/core/sync/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# INTEL CONFIDENTIAL -# -# Copyright © 2021 Intel Corporation. -# -# This software and the related documents are Intel copyrighted -# materials, and your use of them is governed by the express -# license under which they were provided to you (License). Unless -# the License provides otherwise, you may not use, modify, copy, -# publish, distribute, disclose or transmit this software or the -# related documents without Intel's prior written permission. -# -# This software and the related documents are provided as is, with -# no express or implied warranties, other than those that are -# expressly stated in the License. -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/core/sync/protocols/__init__.py b/src/lava/magma/core/sync/protocols/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/core/sync/protocols/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/runtime/__init__.py b/src/lava/magma/runtime/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/magma/runtime/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/runtime/channels/__init__.py b/src/lava/magma/runtime/channels/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/runtime/channels/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/runtime/message_infrastructure/__init__.py b/src/lava/magma/runtime/message_infrastructure/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/magma/runtime/message_infrastructure/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/magma/runtime/node/__init__.py b/src/lava/magma/runtime/node/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/magma/runtime/node/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/proc/__init__.py b/src/lava/proc/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/proc/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/proc/dense/__init__.py b/src/lava/proc/dense/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/proc/dense/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/proc/io/__init__.py b/src/lava/proc/io/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/proc/io/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/proc/lif/__init__.py b/src/lava/proc/lif/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/proc/lif/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/proc/sparse/__init__.py b/src/lava/proc/sparse/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/proc/sparse/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/tutorials/__init__.py b/src/lava/tutorials/__init__.py deleted file mode 100644 index 5284146eb..000000000 --- a/src/lava/tutorials/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/tutorials/end_to_end/__init__.py b/src/lava/tutorials/end_to_end/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/lava/tutorials/in_depth/__init__.py b/src/lava/tutorials/in_depth/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/lava/utils/__init__.py b/src/lava/utils/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/utils/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/lava/utils/dataloader/__init__.py b/src/lava/utils/dataloader/__init__.py deleted file mode 100644 index fc778f31a..000000000 --- a/src/lava/utils/dataloader/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/__init__.py b/tests/lava/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/__init__.py +++ b/tests/lava/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/__init__.py b/tests/lava/magma/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/__init__.py +++ b/tests/lava/magma/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/compiler/__init__.py b/tests/lava/magma/compiler/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/compiler/__init__.py +++ b/tests/lava/magma/compiler/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/compiler/channels/__init__.py b/tests/lava/magma/compiler/channels/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/compiler/channels/__init__.py +++ b/tests/lava/magma/compiler/channels/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/core/__init__.py b/tests/lava/magma/core/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/core/__init__.py +++ b/tests/lava/magma/core/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/core/model/__init__.py b/tests/lava/magma/core/model/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/core/model/__init__.py +++ b/tests/lava/magma/core/model/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/core/model/py/__init__.py b/tests/lava/magma/core/model/py/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/core/model/py/__init__.py +++ b/tests/lava/magma/core/model/py/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/core/process/__init__.py b/tests/lava/magma/core/process/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/core/process/__init__.py +++ b/tests/lava/magma/core/process/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/magma/runtime/__init__.py b/tests/lava/magma/runtime/__init__.py index 5284146eb..e69de29bb 100644 --- a/tests/lava/magma/runtime/__init__.py +++ b/tests/lava/magma/runtime/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/proc/__init__.py b/tests/lava/proc/__init__.py index fc778f31a..e69de29bb 100644 --- a/tests/lava/proc/__init__.py +++ b/tests/lava/proc/__init__.py @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tests/lava/proc/lif/__init__.py b/tests/lava/proc/lif/__init__.py index fc778f31a..e69de29bb 100644 --- a/tests/lava/proc/lif/__init__.py +++ b/tests/lava/proc/lif/__init__.py @@ -1,5 +0,0 @@ -# Copyright (C) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# See: https://spdx.org/licenses/ - -__import__("pkg_resources").declare_namespace(__name__) From bcff8dfa8f43bd8d3779fe1df1f61a0060612508 Mon Sep 17 00:00:00 2001 From: bamsumit Date: Tue, 23 Nov 2021 10:57:54 -0800 Subject: [PATCH 2/2] fix build and tests/'s initis Signed-off-by: bamsumit --- build.py | 4 ++-- tests/__init__.py | 0 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 tests/__init__.py diff --git a/build.py b/build.py index 2e221e315..25db71927 100644 --- a/build.py +++ b/build.py @@ -22,7 +22,7 @@ @init def set_properties(project): project.set_property("dir_source_main_python", "src") - project.set_property("dir_source_unittest_python", "tests") + project.set_property("dir_source_unittest_python", "tests/lava") project.set_property("dir_source_main_scripts", "scripts") project.set_property("dir_docs", "docs") @@ -63,7 +63,7 @@ def set_properties(project): @init(environments="unit") def set_properties_unit(project): project.set_property("dir_source_main_python", "src") - project.set_property("dir_source_unittest_python", "tests") + project.set_property("dir_source_unittest_python", "tests/lava") project.set_property("dir_source_main_scripts", "scripts") project.set_property("dir_docs", "docs") diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 000000000..e69de29bb