Skip to content

Commit 5c8bf5f

Browse files
q10facebook-github-bot
authored andcommitted
Add nlohmann/json to include/ (pytorch#2829)
Summary: - Add nlohmann/json to include/ now that c10d requires this (see pytorch/pytorch#129505) Pull Request resolved: pytorch#2829 Reviewed By: jianyuh, spcyppt Differential Revision: D59649047 Pulled By: q10 fbshipit-source-id: 9c57c55b59bfd64094b1d73e2b43294c32ec6fd6
1 parent 2bd3222 commit 5c8bf5f

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "external/cutlass"]
1414
path = external/cutlass
1515
url = https://github.com/NVIDIA/cutlass.git
16+
[submodule "external/json"]
17+
path = external/json
18+
url = https://github.com/nlohmann/json.git

external/json

Submodule json added at 9cca280

fbgemm_gpu/FbgemmGpu.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ set(fbgemm_sources_include_directories
3131
${THIRDPARTY}/cpuinfo/include
3232
${THIRDPARTY}/cutlass/include
3333
${THIRDPARTY}/cutlass/tools/util/include
34+
${THIRDPARTY}/json/include
3435
${NCCL_INCLUDE_DIRS})
3536

3637

@@ -41,11 +42,6 @@ set(fbgemm_sources_include_directories
4142
file(GLOB_RECURSE asmjit_sources
4243
"${CMAKE_CURRENT_SOURCE_DIR}/../external/asmjit/src/asmjit/*/*.cpp")
4344

44-
set(third_party_include_directories
45-
${THIRDPARTY}/asmjit/src
46-
${THIRDPARTY}/cpuinfo/include
47-
${THIRDPARTY}/cutlass/include)
48-
4945

5046
################################################################################
5147
# Optimizer Group Definitions

fbgemm_gpu/experimental/example/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ set(fbgemm_sources_include_directories
2424
${THIRDPARTY}/cpuinfo/include
2525
${THIRDPARTY}/cutlass/include
2626
${THIRDPARTY}/cutlass/tools/util/include
27+
${THIRDPARTY}/json/include
2728
${NCCL_INCLUDE_DIRS})
2829

2930
set(experimental_example_cpp_source_files

fbgemm_gpu/experimental/gen_ai/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ set(fbgemm_sources_include_directories
2222
${THIRDPARTY}/cpuinfo/include
2323
${THIRDPARTY}/cutlass/include
2424
${THIRDPARTY}/cutlass/tools/util/include
25+
${THIRDPARTY}/json/include
2526
${NCCL_INCLUDE_DIRS})
2627

2728
set(attention_ops_sources

0 commit comments

Comments
 (0)