Skip to content

Commit c945aa9

Browse files
miaobytepeng.li24
andauthored
deepxcore:deepx框架组织 (#111)
* build:fix * heapmem-cuda:rename * doc:deepx整体设计 * doc:heapmem设计 * doc:统一存算面 架构设计 * doc:统一存算面 架构设计 * doc:统一存算面 架构设计 * deepxcore:deepx核心协议库 --------- Co-authored-by: peng.li24 <peng.li24@nio.com>
1 parent 5f6f8f8 commit c945aa9

120 files changed

Lines changed: 114 additions & 108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Excuter/cppcommon Build
22
on:
33
push:
44
paths:
5-
- 'executor/cpp-common/**'
5+
- 'executor/deepxcore/**'
66
pull_request:
77
paths:
8-
- 'executor/cpp-common/**'
8+
- 'executor/deepxcore/**'
99
env:
1010
HIGHWAY_VERSION: 1.2.0
1111

@@ -48,16 +48,16 @@ jobs:
4848
uses: actions/cache@v3
4949
with:
5050
path: |
51-
executor/cpp-common/build
51+
executor/deepxcore/build
5252
~/.ccache
5353
key: ${{ runner.os }}-build-${{ hashFiles('**/CMakeLists.txt') }}
5454
restore-keys: |
5555
${{ runner.os }}-build-
5656
57-
# 构建 cpp-common
58-
- name: Build Common Library
57+
# 构建 deepxcore
58+
- name: Build deepx core Library
5959
run: |
60-
cd executor/cpp-common
60+
cd executor/deepxcore
6161
mkdir -p build && cd build
6262
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
6363
cmake --build . --config Release -j$(nproc)

.github/workflows/executor-memcuda.yml renamed to .github/workflows/executor-heapmemcuda.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: op/cuda-linux Build
22
on:
33
push:
44
paths:
5-
- 'executor/mem-cuda/**'
5+
- 'executor/heapmem-cuda/**'
66
pull_request:
77
paths:
8-
- 'executor/mem-cuda/**'
8+
- 'executor/heapmem-cuda/**'
99
env:
1010
CUDA_VERSION: "12.9.1"
1111
CUDA_MAJOR_VERSION: "12"
@@ -69,7 +69,7 @@ jobs:
6969
7070
# 构建 CUDA 执行器
7171
apt install -y libhiredis-dev && \
72-
cd ../../mem-cuda && \
72+
cd ../../heapmem-cuda && \
7373
mkdir -p build && cd build && \
7474
cmake -DCMAKE_BUILD_TYPE=Release \
7575
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \

.github/workflows/executor-op-cuda-linux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
cp -r include/* /usr/local/include/ && \
6262
cd /workspace && \
6363
64-
# 构建 common
65-
cd executor/cpp-common && \
64+
# 构建 deepxcore
65+
cd executor/deepxcore && \
6666
mkdir -p build && cd build && \
6767
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -GNinja .. && \
6868
ninja && \
@@ -72,9 +72,7 @@ jobs:
7272
mkdir -p build && cd build && \
7373
cmake -DCMAKE_BUILD_TYPE=Release \
7474
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
75-
-DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
7675
-DCMAKE_CUDA_ARCHITECTURES=\"60;70;75;80;86\" \
77-
-DCUTLASS_DIR=/usr/local \
7876
-GNinja .. && \
7977
ninja
8078
"

.github/workflows/executor-op-ompsimd-linux.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
uses: actions/cache@v3
4949
with:
5050
path: |
51-
executor/op-mem-ompsimd/build
52-
executor/cpp-common/build
51+
executor/op-ompsimd/build
52+
executor/deepxcore/build
5353
~/.ccache
5454
key: ${{ runner.os }}-build-${{ hashFiles('**/CMakeLists.txt') }}
5555
restore-keys: |
@@ -58,9 +58,6 @@ jobs:
5858
# Highway 库安装
5959
- name: Install Highway (Ubuntu)
6060
run: |
61-
# 安装依赖
62-
sudo apt-get install -y libgtest-dev
63-
6461
# 克隆 Highway
6562
git clone --depth 1 --branch ${HIGHWAY_VERSION} https://github.com/google/highway.git
6663
cd highway
@@ -81,18 +78,18 @@ jobs:
8178
# 确保头文件正确安装
8279
sudo cp -r ../hwy /usr/local/include/
8380
84-
# 构建 cpp-common
85-
- name: Build Common Library
81+
# 构建 deepxcore
82+
- name: Build deepxcore Library
8683
run: |
87-
cd executor/cpp-common
84+
cd executor/deepxcore
8885
mkdir -p build && cd build
8986
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
9087
cmake --build . --config Release -j$(nproc)
9188
9289
# 构建执行器
9390
- name: CMake Build
9491
run: |
95-
cd executor/op-mem-ompsimd
92+
cd executor/op-ompsimd
9693
mkdir -p build && cd build
9794
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
9895
cmake --build . --config Release -j$(nproc)

README.md

Lines changed: 42 additions & 59 deletions

executor/cpp-common/test/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.15...3.29)
2-
project(deepx-common LANGUAGES CXX )
2+
project(deepxcore LANGUAGES CXX )
33

44
# 设置 C++ 标准
55
set(CMAKE_CXX_STANDARD 17)
@@ -14,10 +14,10 @@ include_directories(src)
1414

1515
# 源文件
1616

17-
file(GLOB_RECURSE DEEPX_COMMON_SOURCES "src/*.cpp")
17+
file(GLOB_RECURSE DEEPX_CORE_SOURCES "src/*.cpp")
1818

19-
add_library(deepx_common SHARED
20-
${DEEPX_COMMON_SOURCES}
19+
add_library(deepxcore SHARED
20+
${DEEPX_CORE_SOURCES}
2121
)
2222

2323

@@ -30,9 +30,9 @@ else()
3030
set(YAMLCPP_LIB yaml-cpp)
3131
endif()
3232

33-
target_link_libraries(deepx_common PUBLIC ${YAMLCPP_LIB})
33+
target_link_libraries(deepxcore PUBLIC ${YAMLCPP_LIB})
3434

35-
target_include_directories(deepx_common PUBLIC
35+
target_include_directories(deepxcore PUBLIC
3636
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
3737
$<INSTALL_INTERFACE:include>
3838
)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)