Skip to content

Commit b9adbb5

Browse files
malfetfacebook-github-bot
authored andcommittedMar 27, 2020
Fix/relax CMake linter rules (pytorch#35574)
Summary: Ignore mixed upper-case/lower-case style for now Fix space between function and its arguments violation Pull Request resolved: pytorch#35574 Test Plan: CI Differential Revision: D20712969 Pulled By: malfet fbshipit-source-id: 0012d430aed916b4518599a0b535e82d15721f78
1 parent 96eec95 commit b9adbb5

25 files changed

+201
-201
lines changed
 

‎.cmakelintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
filter=-convention/filename,-linelength,-package/consistency,-readability/logic,+readability/mixedcase,-readability/wonkycase,-syntax,-whitespace/eol,+whitespace/extra,-whitespace/indent,-whitespace/mismatch,-whitespace/newline,-whitespace/tabs
1+
filter=-convention/filename,-linelength,-package/consistency,-readability/logic,-readability/mixedcase,-readability/wonkycase,-syntax,-whitespace/eol,+whitespace/extra,-whitespace/indent,-whitespace/mismatch,-whitespace/newline,-whitespace/tabs

‎CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ if(NOT MSVC)
488488
endif()
489489
endif()
490490
if((APPLE AND (NOT ("${CLANG_VERSION_STRING}" VERSION_LESS "9.0")))
491-
OR (CMAKE_COMPILER_IS_GNUCXX
492-
AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0 AND NOT APPLE)))
491+
OR(CMAKE_COMPILER_IS_GNUCXX
492+
AND(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0 AND NOT APPLE)))
493493
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new")
494494
endif()
495495
if(WERROR)
@@ -504,19 +504,19 @@ if(NOT MSVC)
504504
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
505505
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
506506
endif()
507-
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -O0")
508-
set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -O0")
509-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno")
510-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math")
507+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -O0")
508+
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -O0")
509+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno")
510+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math")
511511
check_cxx_compiler_flag("-Werror=format" HAS_WERROR_FORMAT)
512512
if(HAS_WERROR_FORMAT)
513513
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format")
514514
endif()
515515
endif()
516516

517517
if(USE_ASAN)
518-
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
519-
set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS_DEBUG} -fsanitize=address")
518+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
519+
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS_DEBUG} -fsanitize=address")
520520
endif()
521521

522522
if(APPLE)

‎android/pytorch_android/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ endif()
1616

1717
set(pytorch_android_DIR ${CMAKE_CURRENT_LIST_DIR}/src/main/cpp)
1818

19-
if (ANDROID_ABI)
19+
if(ANDROID_ABI)
2020
set(libtorch_include_DIR ${pytorch_android_DIR}/libtorch_include/${ANDROID_ABI})
2121
set(BUILD_SUBDIR ${ANDROID_ABI})
2222
elseif(BUILD_LIBTORCH_WITH_JNI)
2323
# Don't need LIBTORCH_HOME if we're building from within PyTorch.
2424
else()
2525
# Building against a pre-built libtorch.
26-
if (NOT LIBTORCH_HOME)
26+
if(NOT LIBTORCH_HOME)
2727
message(FATAL_ERROR
2828
"pytorch_android requires LIBTORCH_HOME to be defined for non-Android builds.")
2929
endif()
@@ -48,7 +48,7 @@ add_library(pytorch_jni SHARED
4848
${pytorch_android_SOURCES}
4949
)
5050

51-
if (APPLE)
51+
if(APPLE)
5252
# Need to add rpath so dlopen can find dependencies.
5353
add_custom_command(TARGET pytorch_jni
5454
POST_BUILD COMMAND
@@ -69,7 +69,7 @@ set(fbjni_BUILD_DIR ${CMAKE_BINARY_DIR}/fbjni/${BUILD_SUBDIR})
6969

7070
add_subdirectory(${fbjni_DIR} ${fbjni_BUILD_DIR})
7171

72-
if (ANDROID_ABI)
72+
if(ANDROID_ABI)
7373

7474
function(import_static_lib name)
7575
add_library(${name} STATIC IMPORTED)

‎aten/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
if (NOT INTERN_BUILD_ATEN_OPS)
1+
if(NOT INTERN_BUILD_ATEN_OPS)
22
return()
33
endif()
44

55
# Find modules
6-
if (NOT INTERN_BUILD_MOBILE)
6+
if(NOT INTERN_BUILD_MOBILE)
77
list(APPEND CMAKE_MODULE_PATH /usr/lib/x86_64-linux-gnu/)
88
list(APPEND CMAKE_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ /usr/lib/aarch64-linux-gnu/)
99
endif()
@@ -53,7 +53,7 @@ list(APPEND ATen_CPU_INCLUDE ${TH_CPU_INCLUDE})
5353
# Find the HIP package, set the HIP paths, load the HIP CMake.
5454
IF(USE_ROCM)
5555
include(LoadHIP)
56-
if (NOT PYTORCH_FOUND_HIP)
56+
if(NOT PYTORCH_FOUND_HIP)
5757
set(USE_ROCM OFF)
5858
endif()
5959
ENDIF()

‎aten/src/ATen/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENDIF()
1818

1919
# this flag is used in Config but set externally, we must normalize it
2020
# to 0/1 otherwise `#if ON` will be evaluated to false.
21-
if (CAFFE2_STATIC_LINK_CUDA)
21+
if(CAFFE2_STATIC_LINK_CUDA)
2222
set(CAFFE2_STATIC_LINK_CUDA_INT 1)
2323
else()
2424
set(CAFFE2_STATIC_LINK_CUDA_INT 0)
@@ -128,14 +128,14 @@ list(APPEND ATen_CPU_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/..)
128128
# so the build can find the generated header files
129129
list(APPEND ATen_CPU_INCLUDE ${CMAKE_CURRENT_BINARY_DIR})
130130

131-
IF (USE_TBB)
131+
IF(USE_TBB)
132132
message("ATen is compiled with TBB (${TBB_ROOT_DIR})")
133133
list(APPEND ATen_CPU_INCLUDE ${TBB_ROOT_DIR}/include)
134134
list(APPEND ATen_CPU_DEPENDENCY_LIBS tbb)
135135
ENDIF()
136136

137137
IF(BLAS_FOUND)
138-
IF ($ENV{TH_BINARY_BUILD})
138+
IF($ENV{TH_BINARY_BUILD})
139139
MESSAGE(STATUS "TH_BINARY_BUILD detected. Enabling special linkage.")
140140
list(APPEND ATen_CPU_DEPENDENCY_LIBS
141141
"${BLAS_LIBRARIES};${BLAS_LIBRARIES};${BLAS_LIBRARIES}")
@@ -147,15 +147,15 @@ IF(BLAS_FOUND)
147147
list(APPEND ATen_HIP_DEPENDENCY_LIBS
148148
"${BLAS_LIBRARIES};${BLAS_LIBRARIES};${BLAS_LIBRARIES}")
149149
endif()
150-
ELSE ($ENV{TH_BINARY_BUILD})
150+
ELSE($ENV{TH_BINARY_BUILD})
151151
list(APPEND ATen_CPU_DEPENDENCY_LIBS ${BLAS_LIBRARIES})
152152
if(USE_CUDA)
153153
list(APPEND ATen_CUDA_DEPENDENCY_LIBS "${BLAS_LIBRARIES}")
154154
endif()
155155
if(USE_ROCM)
156156
list(APPEND ATen_HIP_DEPENDENCY_LIBS "${BLAS_LIBRARIES}")
157157
endif()
158-
ENDIF ($ENV{TH_BINARY_BUILD})
158+
ENDIF($ENV{TH_BINARY_BUILD})
159159
ENDIF(BLAS_FOUND)
160160

161161
IF(LAPACK_FOUND)
@@ -176,7 +176,7 @@ IF(LAPACK_FOUND)
176176
endif()
177177
ENDIF(LAPACK_FOUND)
178178

179-
IF (UNIX AND NOT APPLE)
179+
IF(UNIX AND NOT APPLE)
180180
INCLUDE(CheckLibraryExists)
181181
# https://github.com/libgit2/libgit2/issues/2128#issuecomment-35649830
182182
CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" NEED_LIBRT)
@@ -275,7 +275,7 @@ if(NOT MSVC AND NOT EMSCRIPTEN AND NOT INTERN_BUILD_MOBILE)
275275
endif()
276276

277277
IF(USE_CUDA AND NOT USE_ROCM)
278-
IF ($ENV{ATEN_STATIC_CUDA})
278+
IF($ENV{ATEN_STATIC_CUDA})
279279
# CuFFT has a complicated static story (especially around CUDA < 9) because it has device callback support
280280
# we first have to build a fake lib that links with no device callbacks,
281281
# and then we link against this object file.
@@ -330,12 +330,12 @@ IF(USE_CUDA AND NOT USE_ROCM)
330330

331331
IF(USE_MAGMA)
332332
list(APPEND ATen_CUDA_DEPENDENCY_LIBS ${MAGMA_LIBRARIES})
333-
IF ($ENV{TH_BINARY_BUILD})
333+
IF($ENV{TH_BINARY_BUILD})
334334
list(APPEND ATen_CUDA_DEPENDENCY_LIBS
335335
"${BLAS_LIBRARIES};${BLAS_LIBRARIES};${BLAS_LIBRARIES}")
336336
ENDIF($ENV{TH_BINARY_BUILD})
337337
ENDIF(USE_MAGMA)
338-
IF ($ENV{ATEN_STATIC_CUDA})
338+
IF($ENV{ATEN_STATIC_CUDA})
339339
list(APPEND ATen_CUDA_DEPENDENCY_LIBS "${CUDA_TOOLKIT_ROOT_DIR}/lib64/libculibos.a")
340340
list(APPEND ATen_CUDA_DEPENDENCY_LIBS "${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcudart_static.a")
341341
ENDIF($ENV{ATEN_STATIC_CUDA})

‎aten/src/ATen/cpu/tbb/CMakeLists.txt

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Based on https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
22
# All credit goes to Wenzel Jakob!
33

4-
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
5-
project (tbb CXX)
4+
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
5+
project(tbb CXX)
66

77
include(CheckCXXCompilerFlag)
88
include(CheckCXXSourceRuns)
@@ -119,25 +119,25 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
119119
endif()
120120

121121
if(UNIX)
122-
add_definitions (-DUSE_PTHREAD)
122+
add_definitions(-DUSE_PTHREAD)
123123

124-
check_cxx_compiler_flag ("-std=c++14" SUPPORTS_STDCXX14)
124+
check_cxx_compiler_flag("-std=c++14" SUPPORTS_STDCXX14)
125125
if(SUPPORTS_STDCXX14)
126-
set (CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
126+
set(CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
127127
endif()
128128

129-
check_cxx_compiler_flag ("-mrtm -Werror" SUPPORTS_MRTM)
129+
check_cxx_compiler_flag("-mrtm -Werror" SUPPORTS_MRTM)
130130
if(SUPPORTS_MRTM)
131-
set (CMAKE_CXX_FLAGS "-mrtm ${CMAKE_CXX_FLAGS}")
131+
set(CMAKE_CXX_FLAGS "-mrtm ${CMAKE_CXX_FLAGS}")
132132
endif()
133133

134134
elseif(WIN32)
135135
if(MSVC)
136-
cmake_minimum_required (VERSION 3.1)
136+
cmake_minimum_required(VERSION 3.1)
137137
enable_language(ASM_MASM)
138138
set(CMAKE_CXX_FLAGS "/GS- /Zc:wchar_t /Zc:forScope /DUSE_WINTHREAD ${CMAKE_CXX_FLAGS}")
139139
set(CMAKE_CXX_FLAGS "/D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0600 ${CMAKE_CXX_FLAGS}")
140-
check_cxx_compiler_flag ("/volatile:iso" SUPPORTS_VOLATILE_FLAG)
140+
check_cxx_compiler_flag("/volatile:iso" SUPPORTS_VOLATILE_FLAG)
141141
if(SUPPORTS_VOLATILE_FLAG)
142142
set(CMAKE_CXX_FLAGS "/volatile:iso ${CMAKE_CXX_FLAGS}")
143143
endif()
@@ -191,19 +191,19 @@ endif()
191191
##-------
192192

193193
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
194-
check_cxx_compiler_flag ("-flifetime-dse=1" SUPPORTS_FLIFETIME)
194+
check_cxx_compiler_flag("-flifetime-dse=1" SUPPORTS_FLIFETIME)
195195
if(SUPPORTS_FLIFETIME)
196196
add_definitions(-flifetime-dse=1)
197197
endif()
198198
endif()
199199

200200
# Linker export definitions
201201
if(APPLE)
202-
set (ARCH_PREFIX "mac")
202+
set(ARCH_PREFIX "mac")
203203
elseif(WIN32)
204-
set (ARCH_PREFIX "win")
204+
set(ARCH_PREFIX "win")
205205
else()
206-
set (ARCH_PREFIX "lin")
206+
set(ARCH_PREFIX "lin")
207207
endif()
208208

209209
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -213,9 +213,9 @@ else()
213213
endif()
214214

215215
if(MINGW)
216-
set (ARCH_PREFIX "${ARCH_PREFIX}-gcc")
216+
set(ARCH_PREFIX "${ARCH_PREFIX}-gcc")
217217
# there's no win32-gcc-tbb-export.def, use lin32-tbb-export.def
218-
execute_process (COMMAND ${CMAKE_COMMAND} -E copy ${TBB_ROOT_DIR}/src/tbb/lin32-tbb-export.def ${TBB_ROOT_DIR}/src/tbb/win32-gcc-tbb-export.def)
218+
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${TBB_ROOT_DIR}/src/tbb/lin32-tbb-export.def ${TBB_ROOT_DIR}/src/tbb/win32-gcc-tbb-export.def)
219219
endif()
220220

221221
if(MSVC)
@@ -377,15 +377,15 @@ install(DIRECTORY "${TBB_ROOT_DIR}/include/tbb" DESTINATION ${TBB_INSTALL_INCLUD
377377

378378
# version_string.ver
379379
if(UNIX)
380-
execute_process (COMMAND date "+%a, %d %b %Y %H:%M:%S %z"
381-
OUTPUT_VARIABLE _configure_date
382-
OUTPUT_STRIP_TRAILING_WHITESPACE)
380+
execute_process(COMMAND date "+%a, %d %b %Y %H:%M:%S %z"
381+
OUTPUT_VARIABLE _configure_date
382+
OUTPUT_STRIP_TRAILING_WHITESPACE)
383383
elseif(WIN32)
384-
execute_process (COMMAND cmd " /C date /T"
385-
OUTPUT_VARIABLE _configure_date
386-
OUTPUT_STRIP_TRAILING_WHITESPACE)
384+
execute_process(COMMAND cmd " /C date /T"
385+
OUTPUT_VARIABLE _configure_date
386+
OUTPUT_STRIP_TRAILING_WHITESPACE)
387387
else()
388-
set (_configure_date "Unknown")
388+
set(_configure_date "Unknown")
389389
endif()
390-
include_directories (${CMAKE_BINARY_DIR})
391-
configure_file (extra/version_string.ver.in version_string.ver @ONLY)
390+
include_directories(${CMAKE_BINARY_DIR})
391+
configure_file(extra/version_string.ver.in version_string.ver @ONLY)

‎aten/src/ATen/test/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
IF (MSVC)
2-
IF (MSVC_VERSION LESS 1911)
1+
IF(MSVC)
2+
IF(MSVC_VERSION LESS 1911)
33
return()
44
ENDIF()
55
ENDIF(MSVC)
@@ -49,7 +49,7 @@ list(APPEND ATen_CUDA_TEST_SRCS
4949
${CMAKE_CURRENT_SOURCE_DIR}/cuda_tensor_interop_test.cpp
5050
${CMAKE_CURRENT_SOURCE_DIR}/cuda_vectorized_test.cu
5151
${CMAKE_CURRENT_SOURCE_DIR}/cuda_generator_test.cu)
52-
if (CAFFE2_USE_CUDNN)
52+
if(CAFFE2_USE_CUDNN)
5353
list(APPEND ATen_CUDA_TEST_SRCS
5454
${CMAKE_CURRENT_SOURCE_DIR}/cuda_cudnn_test.cpp)
5555
endif()

‎aten/src/ATen/test/test_install/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ find_package(ATen REQUIRED)
33
include_directories(${ATEN_INCLUDE_DIR})
44

55
# C++14
6-
if (not MSVC)
6+
if(not MSVC)
77
set(CMAKE_CXX_FLAGS "--std=c++14 ${CMAKE_CXX_FLAGS}")
88
endif()
99
add_executable(main main.cpp)

‎binaries/CMakeLists.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
if (INTERN_BUILD_MOBILE)
2-
if (BUILD_CAFFE2_MOBILE)
1+
if(INTERN_BUILD_MOBILE)
2+
if(BUILD_CAFFE2_MOBILE)
33
caffe2_binary_target("predictor_verifier.cc")
44
caffe2_binary_target("speed_benchmark.cc")
55
else()
@@ -33,36 +33,36 @@ caffe2_binary_target("split_db.cc")
3333

3434
caffe2_binary_target("db_throughput.cc")
3535

36-
if (BUILD_TEST)
36+
if(BUILD_TEST)
3737
# Core overhead benchmark
3838
caffe2_binary_target("core_overhead_benchmark.cc")
3939
target_link_libraries(core_overhead_benchmark benchmark)
4040
endif()
4141

42-
if (USE_CUDA)
42+
if(USE_CUDA)
4343
caffe2_binary_target("inspect_gpu.cc")
4444
target_link_libraries(inspect_gpu ${CUDA_LIBRARIES})
4545
caffe2_binary_target("print_core_object_sizes_gpu.cc")
4646

47-
if (BUILD_TEST)
47+
if(BUILD_TEST)
4848
# Core overhead benchmark
4949
caffe2_binary_target("core_overhead_benchmark_gpu.cc")
5050
target_link_libraries(core_overhead_benchmark_gpu benchmark ${CUDA_curand_LIBRARY})
5151
endif()
5252
endif()
5353

54-
if (USE_ROCM)
54+
if(USE_ROCM)
5555
caffe2_hip_binary_target("hip/inspect_gpu.cc")
5656
caffe2_hip_binary_target("hip/print_core_object_sizes_gpu.cc")
5757

58-
if (BUILD_TEST)
58+
if(BUILD_TEST)
5959
# Core overhead benchmark
6060
caffe2_hip_binary_target("hip/core_overhead_benchmark_gpu.cc")
6161
target_link_libraries(core_overhead_benchmark_gpu benchmark)
6262
endif()
6363
endif()
6464

65-
if (USE_ZMQ)
65+
if(USE_ZMQ)
6666
caffe2_binary_target("zmq_feeder.cc")
6767
target_link_libraries(zmq_feeder ${ZMQ_LIBRARIES})
6868
endif()
@@ -72,25 +72,25 @@ if(USE_MPI)
7272
target_link_libraries(run_plan_mpi ${MPI_CXX_LIBRARIES})
7373
endif()
7474

75-
if (USE_OPENCV AND USE_LEVELDB)
75+
if(USE_OPENCV AND USE_LEVELDB)
7676
caffe2_binary_target("convert_encoded_to_raw_leveldb.cc")
7777
target_link_libraries(
7878
convert_encoded_to_raw_leveldb
7979
${OpenCV_LIBS} ${LevelDB_LIBRARIES} ${Snappy_LIBRARIES})
8080
endif()
8181

82-
if (USE_OPENCV)
82+
if(USE_OPENCV)
8383
caffe2_binary_target("make_image_db.cc")
8484
target_link_libraries(make_image_db ${OpenCV_LIBS})
8585
caffe2_binary_target("convert_image_to_tensor.cc")
8686
target_link_libraries(convert_image_to_tensor ${OpenCV_LIBS})
8787
endif()
8888

89-
if (USE_OBSERVERS)
89+
if(USE_OBSERVERS)
9090
caffe2_binary_target(caffe2_benchmark "caffe2_benchmark.cc" "benchmark_helper.cc")
9191
endif()
9292

93-
if (USE_OBSERVERS AND USE_OPENCV)
93+
if(USE_OBSERVERS AND USE_OPENCV)
9494
caffe2_binary_target("convert_and_benchmark.cc")
9595
target_link_libraries(convert_and_benchmark ${OpenCV_LIBS})
9696
endif()

0 commit comments

Comments
 (0)
Please sign in to comment.