From ab362f7c2699e6589939319c28f24fe235982c72 Mon Sep 17 00:00:00 2001 From: "Jeffery (Zeyu) Zhao" Date: Fri, 4 Mar 2022 12:14:50 +0800 Subject: [PATCH 1/2] Add *_FOUND macros to CMakeLists.txt --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87179c1471e..4205ee55ff0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ if(WITH_CUDA) enable_language(CUDA) add_definitions(-D__CUDA_NO_HALF_OPERATORS__) add_definitions(-DWITH_CUDA) + add_definitions(-DNVJPEG_FOUND) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr") # CUDA-11.x can not be compiled using C++14 standard on Windows string(REGEX MATCH "^[0-9]+" CUDA_MAJOR ${CMAKE_CUDA_COMPILER_VERSION}) @@ -26,6 +27,8 @@ endif() find_package(Torch REQUIRED) find_package(PNG REQUIRED) find_package(JPEG REQUIRED) +add_definitions(-DJPEG_FOUND) +add_definitions(-DPNG_FOUND) function(CUDA_CONVERT_FLAGS EXISTING_TARGET) get_property(old_flags TARGET ${EXISTING_TARGET} PROPERTY INTERFACE_COMPILE_OPTIONS) From 4f30b6e39c35be88015820e185a8f47c2f04bfb2 Mon Sep 17 00:00:00 2001 From: "Jeffery (Zeyu) Zhao" Date: Sat, 30 Apr 2022 20:54:49 +0800 Subject: [PATCH 2/2] Remove NVJPEG as it fails CI --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4205ee55ff0..4e222dbfa0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ if(WITH_CUDA) enable_language(CUDA) add_definitions(-D__CUDA_NO_HALF_OPERATORS__) add_definitions(-DWITH_CUDA) - add_definitions(-DNVJPEG_FOUND) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr") # CUDA-11.x can not be compiled using C++14 standard on Windows string(REGEX MATCH "^[0-9]+" CUDA_MAJOR ${CMAKE_CUDA_COMPILER_VERSION})