Skip to content

Commit 319421f

Browse files
qyh111mag1c-hLijiachen1018lijiachen19
authored
merge Feature_store_next to develop (#518)
* [Feat] Next Store Interface (#510) Define the StoreV1 interface, see issue #490 for details. * [bugfix]add init device (#511) add init device * [bugfix] clean up shm remnants to fix "BufferOut" error in PCStore (#512) PCStore uses shared memory to share data in DRAM. If the service terminates abnormally and residual files of the shared data are not cleaned up, it will cause newly started services to report BufferOut errors. * [Misc] enable CI in feature branch (#513) enable CI in feature branch * [feat]adapt v1 store (#514) * adapt v1 store * code style * set default local_rank_size to 1 (#515) * [feat]threadpool monitor (#500) threadpool monitor Co-authored-by: lijiachen19 <lijiachen19@huawei.com> * modify factory_v1 (#516) * set version to 0.2.0rc1 (#517) * fix code style --------- Co-authored-by: Mag1c.H <hemajun815@163.com> Co-authored-by: Lijiachen1018 <30387633+Lijiachen1018@users.noreply.github.com> Co-authored-by: lijiachen19 <lijiachen19@huawei.com>
1 parent fd32928 commit 319421f

File tree

110 files changed

+2123
-3114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2123
-3114
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BasedOnStyle: LLVM
1+
BasedOnStyle: Google
22
IndentWidth: 4
33
ColumnLimit: 100
44
AccessModifierOffset: -4

.github/workflows/cpp-linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ "*" ]
66
pull_request:
7-
branches: [ "dev*", "main", "*release" ]
7+
branches: [ "dev*", "main", "*release", "feature*" ]
88

99

1010
jobs:
@@ -25,7 +25,7 @@ jobs:
2525
files-changed-only: true
2626
lines-changed-only: diff
2727
format-review: true
28-
thread-comments: ${{ github.event_name == 'pull_request' && 'update' }}
28+
version: 20
2929

3030
- name: Fail fast?!
3131
if: steps.linter.outputs.checks-failed != 0

.github/workflows/ucmstore.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ on:
66
push:
77
branches: [ "*" ]
88
pull_request:
9-
branches: [ "dev*", "main", "*release" ]
9+
branches: [ "dev*", "main", "*release", "feature*" ]
1010

1111
env:
1212
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1313
BUILD_TYPE: Debug
1414

1515
jobs:
16-
ci:
16+
cc_gtest:
1717
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
1818
# You can convert this to a matrix build if you need cross-platform coverage.
1919
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
@@ -24,28 +24,20 @@ jobs:
2424

2525
- name: Install googletest
2626
run: |
27-
git clone https://github.com/google/googletest.git --depth=1 --branch=v1.12.0
27+
git clone https://github.com/google/googletest.git --depth=1 --branch=v1.17.0
2828
cd googletest
2929
mkdir build && cd build
3030
cmake -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_C_FLAGS="-fPIC" -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=True ..
3131
sudo make install -j
3232
33-
- name: Install mockcpp
34-
run: |
35-
git clone https://github.com/sinojelly/mockcpp.git --depth=1
36-
cd mockcpp
37-
mkdir build && cd build
38-
cmake -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_C_FLAGS="-fPIC" -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=True -DMOCKCPP_XUNIT="gtest" -DMOCKCPP_XUNIT_HOME=/usr/local/ ..
39-
sudo make install -j
40-
4133
- name: Configure CMake
4234
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
4335
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
4436
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_UCM_SPARSE=OFF -DBUILD_UNIT_TESTS=ON -DRUNTIME_ENVIRONMENT=simu
4537

4638
- name: Build
4739
# Build your program with the given configuration
48-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
40+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j
4941

5042
- name: Test
5143
working-directory: ${{github.workspace}}/build

.github/workflows/unifiedcache_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- 'main'
77
- 'dev*'
88
- '*release'
9+
- 'feature*'
910
pull_request:
1011
branches:
1112
- 'main'
1213
- 'dev*'
1314
- '*release'
15+
- 'feature*'
1416

1517
jobs:
1618
# gpu-test:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def build_cmake(self, ext: CMakeExtension):
102102

103103
setup(
104104
name="uc-manager",
105-
version="0.1.2",
105+
version="0.2.0rc1",
106106
description="Unified Cache Management",
107107
author="Unified Cache Team",
108108
packages=find_packages(),

0 commit comments

Comments
 (0)