From 80bd6ef57d52231fed1bcde0bcb0c9a7f54b5c14 Mon Sep 17 00:00:00 2001 From: "Artiom N." Date: Tue, 26 May 2026 15:26:27 +0300 Subject: [PATCH] SDK image buid fixed: #21 --- docker/sdk-image/Dockerfile | 9 ++++++++- examples/CMakeLists.txt | 2 +- .../cpu/cpu-multi-threaded-backend/CMakeLists.txt | 2 +- .../cpu/cpu-single-threaded-backend/CMakeLists.txt | 4 ++-- knp/backends/gpu/cuda-backend/CMakeLists.txt | 5 ++--- knp/base-framework/CMakeLists.txt | 5 +++-- knp/python-framework/CMakeLists.txt | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/docker/sdk-image/Dockerfile b/docker/sdk-image/Dockerfile index d34bd90c0..aaf71e8e2 100644 --- a/docker/sdk-image/Dockerfile +++ b/docker/sdk-image/Dockerfile @@ -15,6 +15,7 @@ # limitations under the License. ARG KNP_IMAGE_VERSION=2.0.0 +ARG KNP_VERSION=2.0.0 ARG TARGETPLATFORM FROM kasperskydh/knp-base-image:${KNP_IMAGE_VERSION} @@ -39,4 +40,10 @@ RUN \ COPY NOTICE.txt . COPY *.deb /knp -RUN DEBIAN_FRONTEND=noninteractive dpkg -i /knp/*.deb +RUN DEBIAN_FRONTEND=noninteractive dpkg -i \ + /knp/knp-cpp-framework_${KNP_VERSION}_amd64.deb /knp/knp-cpp-framework-dev_${KNP_VERSION}_amd64.deb \ + /knp/knp-documentation_${KNP_VERSION}_all.deb knp-examples_${KNP_VERSION}_amd64.deb \ + /knp/knp-cpu-single-threaded-backend_${KNP_VERSION}_amd64.deb /knp/knp-cpu-single-threaded-backend-dev_${KNP_VERSION}_amd64.deb \ + /knp/knp-cpu-multi-threaded-backend_${KNP_VERSION}_amd64.deb /knp/knp-cpu-multi-threaded-backend-dev_${KNP_VERSION}_amd64.deb \ + /knp/knp-examples_${KNP_VERSION}_amd64.deb /knp/knp-examples-dev_${KNP_VERSION}_amd64.deb \ + /knp/knp-python3-framework_${KNP_VERSION}_amd64.deb diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 4cd4d5965..8d421df42 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -49,5 +49,5 @@ if (KNP_INSTALL) knp_packaging_set_parameters(examples examples DESCRIPTION "Kaspersky Neuromorphic Platform examples" - DEPENDS cpp-framework-dev) + INTERNAL_DEPENDS cpp-framework-dev) endif() diff --git a/knp/backends/cpu/cpu-multi-threaded-backend/CMakeLists.txt b/knp/backends/cpu/cpu-multi-threaded-backend/CMakeLists.txt index 91ad2c3bc..ad5549a43 100644 --- a/knp/backends/cpu/cpu-multi-threaded-backend/CMakeLists.txt +++ b/knp/backends/cpu/cpu-multi-threaded-backend/CMakeLists.txt @@ -85,7 +85,7 @@ if (KNP_INSTALL) knp_packaging_set_parameters("${COMPONENT_NAME}" "${PROJECT_NAME}" DESCRIPTION "${PROJECT_DESCRIPTION}" - DEPENDS "libboost-all-dev (>= ${Boost_VERSION})" "libzmq5" + DEPENDS "libzmq5" PROVIDES "knp-backend") knp_packaging_set_parameters("${COMPONENT_NAME}-dev" "${PROJECT_NAME}" diff --git a/knp/backends/cpu/cpu-single-threaded-backend/CMakeLists.txt b/knp/backends/cpu/cpu-single-threaded-backend/CMakeLists.txt index 431476b31..6585eaf3c 100644 --- a/knp/backends/cpu/cpu-single-threaded-backend/CMakeLists.txt +++ b/knp/backends/cpu/cpu-single-threaded-backend/CMakeLists.txt @@ -51,7 +51,7 @@ knp_add_library("${PROJECT_NAME}" ${${PROJECT_NAME}_headers} ALIAS KNP::Backends::CPUSingleThreaded LINK_PRIVATE - Boost::headers ${Boost_LIBRARIES} spdlog::spdlog_header_only KNP::Backends::CPU::Library + Boost::headers spdlog::spdlog_header_only KNP::Backends::CPU::Library LINK_PUBLIC KNP::Core KNP::Devices::CPU ) @@ -84,7 +84,7 @@ if (KNP_INSTALL) knp_packaging_set_parameters("${COMPONENT_NAME}" "${PROJECT_NAME}" DESCRIPTION "${PROJECT_DESCRIPTION}" - DEPENDS "libboost-all-dev (>= ${Boost_VERSION})" "libzmq5" + DEPENDS "libzmq5" PROVIDES "knp-backend") knp_packaging_set_parameters("${COMPONENT_NAME}-dev" "${PROJECT_NAME}" diff --git a/knp/backends/gpu/cuda-backend/CMakeLists.txt b/knp/backends/gpu/cuda-backend/CMakeLists.txt index 5a3511b7c..3e2dae278 100644 --- a/knp/backends/gpu/cuda-backend/CMakeLists.txt +++ b/knp/backends/gpu/cuda-backend/CMakeLists.txt @@ -71,7 +71,7 @@ knp_add_library("${PROJECT_NAME}" ${${PROJECT_NAME}_cuda_headers} ALIAS KNP::Backends::CUDA LINK_PRIVATE - Boost::headers ${Boost_LIBRARIES} spdlog::spdlog_header_only CUDA::cudart CUDA::cuda_driver CUDA::nvml + Boost::headers spdlog::spdlog_header_only CUDA::cudart CUDA::cuda_driver CUDA::nvml LINK_PUBLIC KNP::Core ) @@ -111,9 +111,8 @@ if (KNP_INSTALL) knp_packaging_set_parameters("${COMPONENT_NAME}" "${PROJECT_NAME}" DESCRIPTION "${PROJECT_DESCRIPTION}" - DEPENDS "libboost-all-dev (>= ${Boost_VERSION})" DEPENDS "libzmq5" - DEPENDS "nvidia-cuda-toolkit-12-8 | cuda-toolkit-12-8" + DEPENDS "cuda-cudart-12-9 | cuda-runtime-12-9" PROVIDES "knp-backend") knp_packaging_set_parameters("${COMPONENT_NAME}-dev" "${PROJECT_NAME}" diff --git a/knp/base-framework/CMakeLists.txt b/knp/base-framework/CMakeLists.txt index 5fede91ea..f6f9cebab 100644 --- a/knp/base-framework/CMakeLists.txt +++ b/knp/base-framework/CMakeLists.txt @@ -144,12 +144,13 @@ if (KNP_INSTALL) knp_packaging_set_parameters(${COMPONENT_NAME} "${PROJECT_NAME}" DESCRIPTION "${PROJECT_DESCRIPTION}" - # DEPENDS "backend" "libboost-all-dev (= ${Boost_VERSION})" "libhdf5" "libzmq5" ) + string(REGEX REPLACE "\.[0-9]*$" "" BOOST_PKG_VERSION "${Boost_VERSION}") + knp_packaging_set_parameters(${COMPONENT_NAME}-dev "${PROJECT_NAME}" DESCRIPTION "${PROJECT_DESCRIPTION} development files: C++ headers, CMake modules, static libraries" - DEPENDS "libboost-all-dev (>= ${Boost_VERSION})" + DEPENDS "libboost-filesystem${BOOST_PKG_VERSION}-dev" INTERNAL_DEPENDS "${COMPONENT_NAME}" RECOMMENDS "cppzmq-dev (>= 4.9.0-1)" "cppzmq (= 4.9.0-1)") endif() diff --git a/knp/python-framework/CMakeLists.txt b/knp/python-framework/CMakeLists.txt index 5948d0901..5ed7c7824 100644 --- a/knp/python-framework/CMakeLists.txt +++ b/knp/python-framework/CMakeLists.txt @@ -129,7 +129,7 @@ if (KNP_INSTALL) knp_packaging_set_parameters("${COMPONENT_NAME}" "${PROJECT_NAME}" DESCRIPTION "${PROJECT_DESCRIPTION}" - DEPENDS "python3 (>= 3.10)" + DEPENDS "python3 (>= 3.11)" INTERNAL_DEPENDS "cpp-framework") endif() @@ -158,4 +158,4 @@ if(KNP_PYTHON_BUILD_WHEEL) "${PROJECT_NAME}-copy-common-project-files" "${KNP_PYTHON_OUTPUT_DIRECTORY}/dist/knp-${PROJECT_VERSION}-py3-none-any.whl" ) -endif() \ No newline at end of file +endif()