Skip to content

Commit aff3d2b

Browse files
committed
Merge branch 'dev' into dev-hardware
2 parents a754504 + d91d89c commit aff3d2b

File tree

115 files changed

+1772
-286
lines changed

Some content is hidden

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

115 files changed

+1772
-286
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919
[submodule "src/09python_ffi/pybind11"]
2020
path = src/09python_ffi/pybind11
2121
url = [email protected]:pybind/pybind11.git
22+
[submodule "3rd-party/cccl"]
23+
path = 3rd-party/cccl
24+
url = [email protected]:NVIDIA/cccl.git

3rd-party/cccl

Submodule cccl added at b7d4228

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ add_subdirectory(src/05computation)
105105
add_subdirectory(src/06frontend)
106106
add_subdirectory(src/07onnx)
107107
add_subdirectory(src/08communication)
108+
add_subdirectory(src/08-01llm)
108109
add_subdirectory(src/09python_ffi)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ executor = compiler.compile("cuda", "default", []) # -------- 编译模型
168168
- [fmt 10.1.1](https://github.com/fmtlib/fmt/releases/tag/10.1.0)
169169
- [fmtlog v2.2.1](https://github.com/MengRao/fmtlog/releases/tag/v2.2.1)
170170
- [googletest v1.14.0](https://github.com/google/googletest/releases/tag/v1.14.0)
171-
- [backward-cpp v1.6](https://github.com/bombela/backward-cpp/releases/tag/v1.6)
171+
- [backward-cpp master](https://github.com/bombela/backward-cpp)
172172
- [result master](https://github.com/willowell/result)
173173
- [abseil-cpp 20230802.1](https://github.com/abseil/abseil-cpp/releases/tag/20230802.1)
174174

src/00common/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ file(GLOB_RECURSE COMMON_TEST test/*.cpp)
1111
if(COMMON_TEST)
1212
add_executable(common_test ${COMMON_TEST})
1313
add_test(common_test common_test)
14-
target_link_libraries(common_test common GTest::gtest_main ${BACKWARD_ENABLE})
15-
add_backward(common_test)
14+
target_link_libraries(common_test common GTest::gtest_main Backward::Object)
1615
endif()

src/00common/include/common/rc.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define RC_HPP
33

44
#include <functional>
5+
#include <utility>
56

67
namespace refactor {
78

@@ -18,7 +19,7 @@ namespace refactor {
1819
T *_value;
1920
struct Counter {
2021
size_t strong, weak;
21-
} * _counter;
22+
} *_counter;
2223

2324
Rc(T *ptr, Counter *counter) noexcept
2425
: _value(ptr), _counter(counter) { inc(); }

src/01graph_topo/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ file(GLOB_RECURSE GRAPH_TOPO_TEST test/*.cpp)
1111
if(GRAPH_TOPO_TEST)
1212
add_executable(graph_topo_test ${GRAPH_TOPO_TEST})
1313
add_test(graph_topo_test graph_topo_test)
14-
target_link_libraries(graph_topo_test graph_topo GTest::gtest_main ${BACKWARD_ENABLE})
15-
add_backward(graph_topo_test)
14+
target_link_libraries(graph_topo_test graph_topo GTest::gtest_main Backward::Object)
1615
endif()

src/02hardware/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ file(GLOB_RECURSE HARDWARE_TEST test/*.cpp)
1515
if(HARDWARE_TEST)
1616
add_executable(hardware_test ${HARDWARE_TEST})
1717
add_test(hardware_test hardware_test)
18-
target_link_libraries(hardware_test hardware GTest::gtest_main ${BACKWARD_ENABLE})
19-
add_backward(hardware_test)
18+
target_link_libraries(hardware_test hardware GTest::gtest_main Backward::Object)
2019
endif()

src/02hardware/src/devices/mlu/memory.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
}
1212

1313
namespace refactor::hardware {
14-
1514
using M = MluMemory;
1615

1716
void *M::malloc(size_t size) {

0 commit comments

Comments
 (0)