feat: cortex engine

.github/workflows/cortex-cpp-quality-gate.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, synchronize, reopened]
     paths:
       [
-        "cortex-cpp/**",
+        "engine/**",
       ]
   workflow_dispatch:
 
@@ -16,33 +16,33 @@ env:
 jobs:
   build-and-test:
     runs-on: ${{ matrix.runs-on }}
-    timeout-minutes: 40
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: "linux"
             name: "amd64"
-            runs-on: "ubuntu-20-04"
-            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}}"
+            runs-on: "ubuntu-20-04-cuda-12-0"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex/cortex/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "mac"
             name: "amd64"
             runs-on: "macos-13"
-            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}}"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_TOOLCHAIN_FILE=/Users/runner/work/cortex/cortex/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "mac"
             name: "arm64"
-            runs-on: "mac-silicon"
-            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DMAC_ARM64=ON"
+            runs-on: "macos-latest"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DMAC_ARM64=ON -DCMAKE_TOOLCHAIN_FILE=/Users/runner/work/cortex/cortex/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "windows"
             name: "amd64"
             runs-on: "windows-cuda-12-0"
-            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=C:/w/cortex/cortex/engine/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             build-deps-cmake-flags: "-DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'          
     steps:
@@ -69,26 +69,31 @@ jobs:
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
           AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
 
+      - name: Configure vcpkg
+        run: |
+          cd engine
+          make configure-vcpkg
+
       - name: Build
         run: |
-          cd cortex-cpp
+          cd engine
           make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
 
       - name: Pre-package
         run: |
-          cd cortex-cpp
+          cd engine
           make pre-package
 
       - name: Package
         run: |
-          cd cortex-cpp
+          cd engine
           make package
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
           name: cortex-cpp-${{ matrix.os }}-${{ matrix.name }}
-          path: ./cortex-cpp/cortex-cpp
+          path: ./engine/cortex-cpp
 
       - name: Upload ccache to s3
         continue-on-error: true

.gitignore

@@ -1,4 +1,5 @@
 # cortex-js
+.DS_Store
 cortex-js/cortex.db
 dist
 *.lock
@@ -18,3 +19,4 @@ cortex-js/package-lock.json
 .vscode
 cortex-js/command
 cortex-js/src/infrastructure/commanders/test/test_data
+**/vcpkg_installed

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "engine/vcpkg"]
+	path = engine/vcpkg
+	url = https://github.com/microsoft/vcpkg.git

cortex-cpp/.gitignore → engine/.gitignore

@@ -563,4 +563,5 @@ build
 build-deps
 .DS_Store
 
-uploads/**
+uploads/**
+CMakePresets.json

cortex-cpp/CMakeLists.txt → engine/CMakeLists.txt

@@ -33,9 +33,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build-deps/_install)
+# set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build-deps/_install)
 # This is the critical line for installing another package
 
+if(MSVC)
+  add_compile_options(
+      $<$<CONFIG:>:/MT> #---------|
+      $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
+      $<$<CONFIG:Release>:/MT> #--|
+  )
+endif()
+
 if(LLAMA_CUDA)
   cmake_minimum_required(VERSION 3.17)
 
@@ -73,7 +81,20 @@ endif()
 
 add_compile_definitions(CORTEX_CPP_VERSION="${CORTEX_CPP_VERSION}")
 
-# add_subdirectory(test)
+option(CMAKE_BUILD_TEST "Enable testing" OFF)
+if(CMAKE_BUILD_TEST)
+  add_subdirectory(test)
+endif()
+
+find_package(jsoncpp CONFIG REQUIRED)
+find_package(Drogon CONFIG REQUIRED)
+find_package(yaml-cpp CONFIG REQUIRED)
+find_package(jinja2cpp CONFIG REQUIRED)
+find_package(httplib CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(CLI11 CONFIG REQUIRED)
+find_package(unofficial-minizip CONFIG REQUIRED)
+find_package(LibArchive REQUIRED)
 
 # Build using CMAKE-JS
 if(DEFINED CMAKE_JS_INC)
@@ -109,8 +130,12 @@ endif()
 #
 # and comment out the following lines
 
-find_package(Drogon CONFIG REQUIRED)
-
+target_link_libraries(${PROJECT_NAME} PRIVATE httplib::httplib)
+target_link_libraries(${PROJECT_NAME} PRIVATE nlohmann_json::nlohmann_json)
+target_link_libraries(${PROJECT_NAME} PRIVATE jinja2cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE CLI11::CLI11)
+target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::minizip::minizip)
+target_link_libraries(${PROJECT_NAME} PRIVATE LibArchive::LibArchive)
 
 # Build using CMAKE-JS
 if(DEFINED CMAKE_JS_INC)
@@ -124,7 +149,7 @@ if(DEFINED CMAKE_JS_INC)
     execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
   endif()
 else()
-  target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon
+  target_link_libraries(${PROJECT_NAME} PRIVATE JsonCpp::JsonCpp Drogon::Drogon OpenSSL::SSL OpenSSL::Crypto yaml-cpp::yaml-cpp
   ${CMAKE_THREAD_LIBS_INIT})
 endif()
 # ##############################################################################
@@ -141,21 +166,13 @@ else()
 endif()
 
 aux_source_directory(controllers CTL_SRC)
+aux_source_directory(services SERVICES_SRC)
 aux_source_directory(common COMMON_SRC)
 aux_source_directory(models MODEL_SRC)
 aux_source_directory(cortex-common CORTEX_COMMON)
-# aux_source_directory(filters FILTER_SRC) aux_source_directory(plugins
-# PLUGIN_SRC) 
-
-# drogon_create_views(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/views
-# ${CMAKE_CURRENT_BINARY_DIR}) use the following line to create views with
-# namespaces. drogon_create_views(${PROJECT_NAME}
-# ${CMAKE_CURRENT_SOURCE_DIR}/views ${CMAKE_CURRENT_BINARY_DIR} TRUE)
+aux_source_directory(config CONFIG_SRC)
+aux_source_directory(commands COMMANDS_SRC)
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
-# ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_sources(${PROJECT_NAME} PRIVATE ${CTL_SRC} ${COMMON_SRC})
-# ${FILTER_SRC} ${PLUGIN_SRC} ${MODEL_SRC})
-# ##############################################################################
-# uncomment the following line for dynamically loading views set_property(TARGET
-# ${PROJECT_NAME} PROPERTY ENABLE_EXPORTS ON)
+
+target_sources(${PROJECT_NAME} PRIVATE ${COMMANDS_SRC} ${CONFIG_SRC} ${CTL_SRC} ${COMMON_SRC} ${SERVICES_SRC})

cortex-cpp/Makefile → engine/Makefile

@@ -18,19 +18,27 @@ DEVELOPER_ID ?= xxxx
 all:
 	@echo "Specify a target to run"
 
+configure-vcpkg:
+ifeq ($(OS),Windows_NT)
+	@cd vcpkg && bootstrap-vcpkg.bat;
+	@cd vcpkg && vcpkg install
+else ifeq ($(shell uname -s),Linux) 
+	@cd vcpkg && ./bootstrap-vcpkg.sh;
+	@cd vcpkg && ./vcpkg install;
+else
+	@cd vcpkg && ./bootstrap-vcpkg.sh;
+	@cd vcpkg && ./vcpkg install;
+endif
+
 # Build the Cortex engine
 build:
 ifeq ($(OS),Windows_NT)
-	@powershell -Command "cmake -S ./cortex-cpp-deps -B ./build-deps/cortex-cpp-deps $(BUILD_DEPS_CMAKE_EXTRA_FLAGS);"
-	@powershell -Command "cmake --build ./build-deps/cortex-cpp-deps --config Release -j4;"
 	@powershell -Command "mkdir -p build; cd build; cmake .. $(CMAKE_EXTRA_FLAGS); cmake --build . --config Release -j4;"
 else ifeq ($(shell uname -s),Linux)
-	@./install_deps.sh;
 	@mkdir -p build && cd build; \
 	cmake .. $(CMAKE_EXTRA_FLAGS); \
 	make -j4;
 else
-	@./install_deps.sh;
 	@mkdir -p build && cd build; \
 	cmake .. $(CMAKE_EXTRA_FLAGS); \
 	make -j4;