Merge pull request #34 from artiomn/master

Devices library removed

knp/CMakeLists.txt

@@ -42,7 +42,6 @@ add_subdirectory(meta-library)
 add_subdirectory(neuron-traits-library)
 add_subdirectory(synapse-traits-library)
 add_subdirectory(core-library)
-add_subdirectory(devices-library)
 add_subdirectory(backends)
 add_subdirectory(base-framework)
 add_subdirectory(python-framework)

knp/autodoc/directories.dox

@@ -204,23 +204,23 @@
  */
 
 /**
- * @dir /knp/devices-library
- * @brief Device library directory.
+ * @dir /knp/backends/cpu/cpu-devices
+ * @brief CPU device library directory.
  */
 
 /**
- * @dir /knp/devices-library/include
- * @brief Include directory for devices library.
+ * @dir /knp/backends/cpu/cpu-devices/include
+ * @brief Include directory for CPU devices library.
  */
 
 /**
- * @dir /knp/devices-library/include/knp
- * @brief Include directory for devices library.
+ * @dir /knp/backends/cpu/cpu-devices/include/knp
+ * @brief Include directory for CPU devices library.
  */
 
 /**
- * @dir /knp/devices-library/include/knp/devices
- * @brief Include directory for devices library.
+ * @dir /knp/backends/cpu/cpu-devices/include/knp/devices
+ * @brief Include directory for CPU devices library.
  */
 
 /**

knp/backends/cpu/CMakeLists.txt

@@ -14,20 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ]]
 
-cmake_minimum_required(VERSION 3.25)
-
-add_subdirectory(cpu-library)
-add_subdirectory(thread_pool)
-
-file(GLOB backends LIST_DIRECTORIES true "[a-zA-Z0-9_]*-backend")
-
-if(NOT backends)
-    message(WARNING "No backend was found.")
-    return()
-endif()
-
-foreach(backend ${backends})
-    message(STATUS "Adding backend \"${backend}\"...")
-    get_filename_component(BACKEND_NAME "${backend}" NAME)
-    add_subdirectory("${backend}")
-endforeach()
+cmake_minimum_required(VERSION 3.25)
+
+add_subdirectory(cpu-devices)
+add_subdirectory(cpu-library)
+add_subdirectory(thread_pool)
+
+file(GLOB backends LIST_DIRECTORIES true "[a-zA-Z0-9_]*-backend")
+
+if(NOT backends)
+    message(WARNING "No backend was found.")
+    return()
+endif()
+
+foreach(backend ${backends})
+    message(STATUS "Adding backend \"${backend}\"...")
+    get_filename_component(BACKEND_NAME "${backend}" NAME)
+    add_subdirectory("${backend}")
+endforeach()

knp/devices-library/CMakeLists.txt → knp/backends/cpu/cpu-devices/CMakeLists.txt

@@ -23,7 +23,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # Required for the linters.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-project(knp-devices VERSION "${KNP_VERSION}" LANGUAGES C CXX
+project(knp-cpu-devices VERSION "${KNP_VERSION}" LANGUAGES C CXX
         DESCRIPTION "Kaspersky Neuromorphic Platform device parameters library"
         HOMEPAGE_URL "https://neuro.kaspersky.ru/neyromorfnye-tekhnologii/")
 
@@ -41,7 +41,7 @@ else()
     set(${PROJECT_NAME}_CPU_SOURCE impl/unknown_cpu.cpp)
 endif()
 
-knp_add_library("${PROJECT_NAME}-cpu"
+knp_add_library("${PROJECT_NAME}"
     STATIC
 
     ${${PROJECT_NAME}_CPU_SOURCE}
@@ -54,41 +54,17 @@ knp_add_library("${PROJECT_NAME}-cpu"
 )
 
 set_target_properties(
-        "${PROJECT_NAME}-cpu"
+        "${PROJECT_NAME}"
         PROPERTIES
         VERSION "${CMAKE_PROJECT_VERSION}"
         SOVERSION "${CMAKE_PROJECT_VERSION_MAJOR}")
 
-knp_add_library("${PROJECT_NAME}-altai"
-    STATIC
-    impl/altai.cpp
-
-    include/${${PROJECT_NAME}_PUBLIC_INCLUDE_DIR}/altai.h
-
-    LINK_PRIVATE
-        spdlog::spdlog_header_only
-        KNP::Core
-    ALIAS KNP::Devices::AltAI
-)
-
-set_target_properties(
-    "${PROJECT_NAME}-altai"
-    PROPERTIES
-    VERSION "${CMAKE_PROJECT_VERSION}"
-    SOVERSION "${CMAKE_PROJECT_VERSION_MAJOR}"
-)
 
 if (KNP_INSTALL)
     set(COMPONENT_NAME "cpp-framework")
 
-    install(TARGETS "${PROJECT_NAME}-cpu"
-            EXPORT "${PROJECT_NAME}-cpu"
-            COMPONENT "${COMPONENT_NAME}-dev"
-            ARCHIVE)
-
-    # Install for AltAI
-    install(TARGETS "${PROJECT_NAME}-altai"
-            EXPORT "${PROJECT_NAME}-altai"
+    install(TARGETS "${PROJECT_NAME}"
+            EXPORT "${PROJECT_NAME}"
             COMPONENT "${COMPONENT_NAME}-dev"
             ARCHIVE)
 

knp/devices-library/include/knp/devices/cpu.h → knp/backends/cpu/cpu-devices/include/knp/devices/cpu.h

@@ -4,18 +4,18 @@
  * @kaspersky_support Artiom N.
  * @date 30.01.2023
  * @license Apache 2.0
- * @copyright © 2024 AO Kaspersky Lab
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * @copyright © 2024 AO Kaspersky Lab
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */