Skip to content

CMake fixes found by user #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cliffburdick merged 1 commit into from
May 12, 2023
Merged

CMake fixes found by user #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ add_library(matx INTERFACE)
add_library(matx::matx ALIAS matx)
target_include_directories(matx INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include>")
target_include_directories(matx INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/kernels>"
"$<INSTALL_INTERFACE:include/kernels>")
target_include_directories(matx INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/matx/kernels>"
"$<INSTALL_INTERFACE:include/matx/kernels>")
target_compile_features(matx INTERFACE cxx_std_17 $<BUILD_INTERFACE:cuda_std_17>)
target_compile_options(matx INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:--expt-relaxed-constexpr>)

Expand Down
4 changes: 1 addition & 3 deletions bench/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ set (bench_sources
01_radar/SingleChanSimplePipeline.cu
)

set(target_inc ${CMAKE_SOURCE_DIR}/include/
${CMAKE_SOURCE_DIR}/include/kernels/
${CMAKE_SOURCE_DIR}/test/include
set(target_inc ${CMAKE_SOURCE_DIR}/test/include
${CMAKE_SOURCE_DIR}/examples/)
set(system_inc ${CUTLASS_INC}
${pybind11_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion docs_input/notebooks/exercises/compile_and_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/bin/sh

nvcc --generate-code=arch=compute_70,code=[compute_70,sm_70] --generate-code=arch=compute_80,code=[compute_80,sm_80] --threads 0 -std=c++17 -DINDEX_64_BIT -I/matx_libs/matx-main/examples -I/matx_libs/matx-main/include/kernels -I/matx_libs/matx-main/include -I/usr/include/python3.8 -DMATX_ROOT=\"/repro/matx\" --expt-relaxed-constexpr -DENABLE_CUTLASS=0 -o /tmp/$1 exercises/$1.cu -lcufft -lcublas -lcublasLt /usr/lib/x86_64-linux-gnu/libpython3.8.so &&
nvcc --generate-code=arch=compute_70,code=[compute_70,sm_70] --generate-code=arch=compute_80,code=[compute_80,sm_80] --threads 0 -std=c++17 -DINDEX_64_BIT -I/matx_libs/matx-main/examples -I/matx_libs/matx-main/include/matx/kernels -I/matx_libs/matx-main/include/matx -I/usr/include/python3.8 -DMATX_ROOT=\"/repro/matx\" --expt-relaxed-constexpr -DENABLE_CUTLASS=0 -o /tmp/$1 exercises/$1.cu -lcufft -lcublas -lcublasLt /usr/lib/x86_64-linux-gnu/libpython3.8.so &&
/tmp/$1
4 changes: 0 additions & 4 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ set(examples

add_library(example_lib INTERFACE)
target_include_directories(example_lib SYSTEM INTERFACE ${CUTLASS_INC} ${pybind11_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS})
target_include_directories( example_lib INTERFACE
${CMAKE_SOURCE_DIR}/include/
${CMAKE_SOURCE_DIR}/include/kernels/
${CMAKE_SOURCE_DIR}/include/common)

target_link_libraries(example_lib INTERFACE matx::matx) # Transitive properties

Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ foreach (ptest ${proprietary_sources})
list(APPEND proprietary_inc_list ${incdir}/../examples)
endforeach()

set(target_inc ${CMAKE_SOURCE_DIR}/include/ ${CMAKE_SOURCE_DIR}/include/kernels/ ${CMAKE_SOURCE_DIR}/test/include ${CMAKE_SOURCE_DIR}/examples/ ${proprietary_inc_list})
set(target_inc ${CMAKE_SOURCE_DIR}/test/include ${CMAKE_SOURCE_DIR}/examples/ ${proprietary_inc_list})
set(system_inc ${CUTLASS_INC} ${GTEST_INC_DIRS} ${pybind11_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS})

set(all_test_srcs ${test_sources} ${proprietary_sources})
Expand Down