From: Aldian Fazrihady Date: Thu, 6 Dec 2018 06:31:39 +0000 (-0800) Subject: Prevent `profile_observer_test` from being run by CPU test (#14168) X-Git-Tag: accepted/tizen/6.5/unified/20211028.231830~2431 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e27d77815d3dee10fa4d05b03ba1520028157098;p=platform%2Fupstream%2Fpytorch.git Prevent `profile_observer_test` from being run by CPU test (#14168) Summary: Fix CMakeLists.txt, so the test for CPU won't run profile_observer_test.cc, as currently it only supports GPU Pull Request resolved: https://github.com/pytorch/pytorch/pull/14168 Differential Revision: D13356274 Pulled By: ezyang fbshipit-source-id: 7d105f2e18675e5fab129864958148b0f18d582c --- diff --git a/caffe2/observers/CMakeLists.txt b/caffe2/observers/CMakeLists.txt index 9d0b01e..5cb7ff6 100644 --- a/caffe2/observers/CMakeLists.txt +++ b/caffe2/observers/CMakeLists.txt @@ -1,15 +1,26 @@ if(USE_OBSERVERS) message(STATUS "Include Observer library") + set(GLOB profile_observer_files profile_observer_*.cc) set(Caffe2_CONTRIB_OBSERVERS_CPU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/time_observer.cc" "${CMAKE_CURRENT_SOURCE_DIR}/runcnt_observer.cc" ) + set(Caffe2_CONTRIB_OBSERVERS_GPU_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/profile_observer_gpu.cc" + ) set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} ${Caffe2_CONTRIB_OBSERVERS_CPU_SRC}) set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} PARENT_SCOPE) + set(Caffe2_GPU_SRCS ${Caffe2_GPU_SRCS} ${Caffe2_CONTRIB_OBSERVERS_GPU_SRC}) + set(Caffe2_GPU_SRCS ${Caffe2_GPU_SRCS} PARENT_SCOPE) + # ---[ CPU test files file(GLOB tmp *_test.cc) set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${tmp}) set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} PARENT_SCOPE) + exclude(Caffe2_CPU_TEST_SRCS "${Caffe2_CPU_TEST_SRCS}" ${profile_observer_files}) + + # ---[ GPU test files + set(Caffe2_GPU_TEST_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/profile_observer_test.cc") endif()