From c012abccde8c382c127842ed7c66fc103defbf0b Mon Sep 17 00:00:00 2001
From: thibault allenet <thibault.allenet@cea.fr>
Date: Fri, 13 Dec 2024 15:58:33 +0000
Subject: [PATCH] solve conflict
---
aidge_export_arm_cortexm/export.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/aidge_export_arm_cortexm/export.py b/aidge_export_arm_cortexm/export.py
index b0ef71e..fe7884e 100644
--- a/aidge_export_arm_cortexm/export.py
+++ b/aidge_export_arm_cortexm/export.py
@@ -38,12 +38,8 @@ def supported_boards() -> list[str]:
def gen_board_files(path:str, board:str)->None:
if board not in supported_boards():
-<<<<<<< HEAD
- raise ValueError(f"Board {board} is not supported, supported board are:{supported_boards()}")
-=======
joint_board_str = "\n\t-".join(supported_boards())
raise ValueError(f"Board {board} is not supported, supported board are:\n\t-{joint_board_str}")
->>>>>>> dev
if isinstance(path, str): path = Path(path)
# Create dnn directory is not exist
@@ -55,9 +51,3 @@ def gen_board_files(path:str, board:str)->None:
# Copy all static files in the export
shutil.copytree(BOARDS_MAP[board], str(path), dirs_exist_ok=True)
-<<<<<<< HEAD
- # For N2D2 library, copy static folder to export/include
- dnn_include_folder = dnn_folder / "include"
- os.makedirs(str(dnn_include_folder), exist_ok=True)
-=======
->>>>>>> dev
--
GitLab