Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion docker/sdk-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion knp/backends/cpu/cpu-multi-threaded-backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions knp/backends/cpu/cpu-single-threaded-backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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}"
Expand Down
5 changes: 2 additions & 3 deletions knp/backends/gpu/cuda-backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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}"
Expand Down
5 changes: 3 additions & 2 deletions knp/base-framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
4 changes: 2 additions & 2 deletions knp/python-framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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()
endif()
Loading