From 40fb02be36cad4c3db987319e7a44f5e70f3ce1d Mon Sep 17 00:00:00 2001 From: mlanger Date: Mon, 29 May 2023 09:06:01 +0000 Subject: [PATCH] Add deps as submodules to ensure equal env on ARM and x86. --- .gitmodules | 8 +++++++- CMakeLists.txt | 8 ++++++-- {tests => third_party}/googletest | 0 third_party/libcudacxx | 1 + third_party/thrust | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) rename {tests => third_party}/googletest (100%) create mode 160000 third_party/libcudacxx create mode 160000 third_party/thrust diff --git a/.gitmodules b/.gitmodules index 44d6d26f4..72d46f04a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,10 @@ [submodule "tests/googletest"] - path = tests/googletest + path = third_party/googletest url = https://github.com/google/googletest.git ignore = dirty +[submodule "third_party/libcudacxx"] + path = third_party/libcudacxx + url = https://github.com/NVIDIA/libcudacxx +[submodule "third_party/thrust"] + path = third_party/thrust + url = https://github.com/NVIDIA/thrust.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f7ad51300..cb73d7871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,10 +75,14 @@ message(CMAKE_CUDA_FLAGS="${CMAKE_CUDA_FLAGS}") include_directories( ${PROJECT_SOURCE_DIR}/include - ${PROJECT_SOURCE_DIR}/tests/googletest/googletest/include + ${PROJECT_SOURCE_DIR}/third_party/libcudacxx/include + ${PROJECT_SOURCE_DIR}/third_party/thrust/include + ${PROJECT_SOURCE_DIR}/third_party/googletest/googletest/include ) -ADD_SUBDIRECTORY(tests/googletest) +ADD_SUBDIRECTORY(third_party/googletest) +ADD_SUBDIRECTORY(third_party/libcudacxx) +ADD_SUBDIRECTORY(third_party/thrust) link_directories( ) diff --git a/tests/googletest b/third_party/googletest similarity index 100% rename from tests/googletest rename to third_party/googletest diff --git a/third_party/libcudacxx b/third_party/libcudacxx new file mode 160000 index 000000000..88a91da3d --- /dev/null +++ b/third_party/libcudacxx @@ -0,0 +1 @@ +Subproject commit 88a91da3dddf0eccf7c9ffd66214ddd2cad497da diff --git a/third_party/thrust b/third_party/thrust new file mode 160000 index 000000000..cf0fc2129 --- /dev/null +++ b/third_party/thrust @@ -0,0 +1 @@ +Subproject commit cf0fc2129f82cca026b1ef1c53d5facb35d06c4e