Skip to content

Fix ccache configuration issue because it was configured before CUDA #3241

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
umar456 merged 3 commits into from
Apr 11, 2022
Merged

Fix ccache configuration issue because it was configured before CUDA #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
951152f
Fix ccache configuration issue because it was configured before CUDA
umar456 Apr 9, 2022
009704d
Fix issue with CMAKE_MODULE_PATH when it has multiple values
umar456 Apr 9, 2022
ebe5867
Do not add cuda_unified test.
umar456 Apr 11, 2022
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
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ project(ArrayFire VERSION 3.9.0 LANGUAGES C CXX)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")

include(AFconfigure_deps_vars)
include(config_ccache)
include(AFBuildConfigurations)
include(AFInstallDirs)
include(CMakeDependentOption)
Expand Down Expand Up @@ -58,6 +57,7 @@ find_package(MKL)
find_package(spdlog 1.8.5 QUIET)

include(boost_package)
include(config_ccache)

option(AF_BUILD_CPU "Build ArrayFire with a CPU backend" ON)
option(AF_BUILD_CUDA "Build ArrayFire with a CUDA backend" ${CUDA_FOUND})
Expand Down Expand Up @@ -430,7 +430,7 @@ write_basic_package_version_file(
set(INCLUDE_DIRS include)
set(CMAKE_DIR ${AF_INSTALL_CMAKE_DIR})
configure_package_config_file(
${CMAKE_MODULE_PATH}/ArrayFireConfig.cmake.in
${ArrayFire_SOURCE_DIR}/CMakeModules/ArrayFireConfig.cmake.in
cmake/install/ArrayFireConfig.cmake
INSTALL_DESTINATION "${AF_INSTALL_CMAKE_DIR}"
PATH_VARS INCLUDE_DIRS CMAKE_DIR
Expand Down Expand Up @@ -488,7 +488,7 @@ endif()
set(INCLUDE_DIRS "${ArrayFire_SOURCE_DIR}/include" "${ArrayFire_BINARY_DIR}/include")
set(CMAKE_DIR "${ArrayFire_BINARY_DIR}/cmake")
configure_package_config_file(
${CMAKE_MODULE_PATH}/ArrayFireConfig.cmake.in
${ArrayFire_SOURCE_DIR}/CMakeModules/ArrayFireConfig.cmake.in
ArrayFireConfig.cmake
INSTALL_DESTINATION "${ArrayFire_BINARY_DIR}"
PATH_VARS INCLUDE_DIRS CMAKE_DIR
Expand All @@ -506,7 +506,7 @@ configure_package_config_file(
unset(CMAKE_CXX_VISIBILITY_PRESET)

configure_file(
${CMAKE_MODULE_PATH}/CTestCustom.cmake
${ArrayFire_SOURCE_DIR}/CMakeModules/CTestCustom.cmake
${ArrayFire_BINARY_DIR}/CTestCustom.cmake)

include(CTest)
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/InternalUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ macro(arrayfire_set_cmake_default_variables)
# EPILOG ${compiler_header_epilogue}
# )
configure_file(
${CMAKE_MODULE_PATH}/compilers.h
${ArrayFire_SOURCE_DIR}/CMakeModules/compilers.h
${ArrayFire_BINARY_DIR}/include/af/compilers.h)
endmacro()

Expand Down
4 changes: 3 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,9 @@ if(CUDA_FOUND)
FOLDER "Tests"
OUTPUT_NAME "cuda_${backend}")

add_test(NAME ${target} COMMAND ${target})
if(NOT ${backend} STREQUAL "unified")
add_test(NAME ${target} COMMAND ${target})
endif()
endif()
endforeach()
endif()
Expand Down